Skip to content

Commit 9583acb

Browse files
committed
bump scala, sbt and scala-module-plugin versions
Also restrict 2.12 to jdk8 builds.
1 parent 845d5ab commit 9583acb

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ script: admin/build.sh
2121
jdk:
2222
- openjdk6
2323
- openjdk7
24+
- oraclejdk8
2425

2526
notifications:
2627
email:

build.sbt

+9-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,15 @@ version := "1.0.5-SNAPSHOT"
88

99
scalaVersion := crossScalaVersions.value.head
1010

11-
crossScalaVersions := Seq("2.11.6", "2.12.0-M1")
11+
crossScalaVersions in ThisBuild := {
12+
val javaVersion = System.getProperty("java.version")
13+
val isJDK6Or7 =
14+
javaVersion.startsWith("1.6.") || javaVersion.startsWith("1.7.")
15+
if (isJDK6Or7)
16+
Seq("2.11.7")
17+
else
18+
Seq("2.11.7", "2.12.0-M3")
19+
}
1220

1321
// important!! must come here (why?)
1422
scalaModuleOsgiSettings

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.8
1+
sbt.version=0.13.9

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.3")
1+
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.4")

0 commit comments

Comments
 (0)