Skip to content

Commit 28fb1b3

Browse files
authored
Merge pull request #29 from SethTisue/add-coc
add CoC, clean up build
2 parents 51db7e6 + 7befe59 commit 28fb1b3

File tree

3 files changed

+18
-23
lines changed

3 files changed

+18
-23
lines changed

CODE_OF_CONDUCT.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
all repositories in these organizations:
2+
3+
* [scala](https://github.com/scala)
4+
* [scalacenter](https://github.com/scalacenter)
5+
* [lampepfl](https://github.com/lampepfl)
6+
7+
are covered by the Scala Code of Conduct: https://scala-lang.org/conduct/

build.sbt

+9-20
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,29 @@
1-
// TODO Make it a cross project including Scala.js
21
import ScalaModulePlugin._
32

43
scalaModuleSettings
54

65
name := "scala-collection-contrib"
7-
86
version := "0.1.0-SNAPSHOT"
97

108
scalaVersionsByJvm in ThisBuild := {
11-
val v213 = "2.13.0"
12-
Map(
13-
8 -> List(v213 -> true),
14-
11 -> List(v213 -> false),
15-
12 -> List(v213 -> false))
9+
val v213 = "2.13.0"
10+
Map(
11+
8 -> List(v213 -> true),
12+
11 -> List(v213 -> false),
13+
12 -> List(v213 -> false))
1614
}
1715

18-
scalacOptions ++= Seq("-opt-warnings", "-language:higherKinds")
19-
16+
scalacOptions ++= Seq("-opt-warnings", "-language:higherKinds", "-deprecation", "-feature", "-Xfatal-warnings")
2017
scalacOptions in (Compile, doc) ++= Seq("-implicits", "-groups")
2118

2219
testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a")
23-
24-
parallelExecution in Test := false
20+
parallelExecution in Test := false // why?
2521

2622
homepage := Some(url("https://github.com/scala/scala-collection-contrib"))
27-
2823
licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0"))
2924

30-
pomExtra :=
31-
<developers>
32-
<developer><id>julienrf</id><name>Julien Richard-Foy</name></developer>
33-
<developer><id>szeiger</id><name>Stefan Zeiger</name></developer>
34-
</developers>
35-
3625
libraryDependencies ++= Seq(
37-
"junit" % "junit" % "4.12",
26+
"junit" % "junit" % "4.12" % Test,
3827
"com.novocode" % "junit-interface" % "0.11" % Test,
39-
"org.openjdk.jol" % "jol-core" % "0.9"
28+
"org.openjdk.jol" % "jol-core" % "0.9" % Test
4029
)

project/plugins.sbt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
1+
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")
22

3+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
34
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
4-
55
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")
6-

0 commit comments

Comments
 (0)