Skip to content

Commit 02da785

Browse files
committed
move to latest scala, sbt & plugins versions
- scala 2.11.11, 2.12.2 (no 2.13.0-M1 yet) - latest `scala-sbt-module`, with `scalaVersionByJvm` - latest sbt - latest scala-js
1 parent eb5bc9a commit 02da785

File tree

3 files changed

+20
-26
lines changed

3 files changed

+20
-26
lines changed

build.sbt

+17-23
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,24 @@
1-
scalaVersion in ThisBuild := crossScalaVersions.value.head
2-
3-
crossScalaVersions in ThisBuild := {
4-
val v211 = List("2.11.8")
5-
val v212 = List("2.12.1")
6-
7-
val javaVersion = System.getProperty("java.version")
8-
val isTravisPublishing = !util.Properties.envOrElse("TRAVIS_TAG", "").trim.isEmpty
9-
10-
if (isTravisPublishing) {
11-
if (javaVersion.startsWith("1.6.")) v211
12-
else if (javaVersion.startsWith("1.8.")) v212
13-
else Nil
14-
} else if (javaVersion.startsWith("1.6.") || javaVersion.startsWith("1.7.")) {
15-
v211
16-
} else if (javaVersion.startsWith("1.8.") || javaVersion.startsWith("9")) {
17-
v211 ++ v212
18-
} else {
19-
sys.error(s"Unsupported java version: $javaVersion.")
20-
}
21-
}
1+
lazy val root = project.in(file("."))
2+
.aggregate(`scala-parser-combinatorsJVM`, `scala-parser-combinatorsJS`)
3+
.settings(publish := {}, publishLocal := {},
4+
crossScalaVersions := (crossScalaVersions in LocalProject("scala-parser-combinatorsJVM")).value,
5+
scalaVersion := crossScalaVersions.value.head)
226

237
lazy val `scala-parser-combinators` = crossProject.in(file(".")).
248
settings(scalaModuleSettings: _*).
259
settings(
2610
name := "scala-parser-combinators-root",
11+
scalaVersionsByJvm := {
12+
val v212 = "2.12.2"
13+
val v211 = "2.11.11"
14+
15+
Map(
16+
6 -> List(v211 -> true),
17+
7 -> List(v211 -> false),
18+
8 -> List(v212 -> true, v211 -> false),
19+
9 -> List(v212 -> false, v211 -> false)
20+
)
21+
},
2722
apiMappings += (scalaInstance.value.libraryJar ->
2823
url(s"https://www.scala-lang.org/api/${scalaVersion.value}/")),
2924
scalacOptions in (Compile, doc) ++= Seq(
@@ -44,8 +39,7 @@ lazy val `scala-parser-combinators` = crossProject.in(file(".")).
4439
name := "scala-parser-combinators"
4540
).
4641
jsSettings(
47-
name := "scala-parser-combinators-js",
48-
scalaJSUseRhino := true
42+
name := "scala-parser-combinators-js"
4943
).
5044
settings(
5145
moduleName := "scala-parser-combinators",

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.13
1+
sbt.version=0.13.15

project/plugins.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.4")
1+
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.6")
22

3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.15")

0 commit comments

Comments
 (0)