Skip to content

Commit d99be7e

Browse files
committed
allow JDK 13/14 build
note that the Travis-CI changes don't make the JDK 6 build work, but they do allow the JDK 8 one to run
1 parent 23a8cba commit d99be7e

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

.travis.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,9 @@ env:
2323

2424
script: admin/build.sh
2525

26-
addons:
27-
apt:
28-
packages:
29-
- openjdk-6-jdk
30-
3126
jdk:
3227
- openjdk6
33-
- oraclejdk8
28+
- openjdk8
3429

3530
notifications:
3631
email:

build.sbt

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ scalaVersionsByJvm in ThisBuild := {
1212
9 -> List(v212 -> false, v213 -> false, v211 -> false),
1313
10 -> List(v212 -> false, v213 -> false, v211 -> false),
1414
11 -> List(v212 -> false, v213 -> false, v211 -> false),
15-
12 -> List(v212 -> false, v213 -> false, v211 -> false)
15+
12 -> List(v212 -> false, v213 -> false, v211 -> false),
16+
13 -> List(v212 -> false, v213 -> false, v211 -> false),
17+
14 -> List(v212 -> false, v213 -> false, v211 -> false)
1618
)
1719
}
1820

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.17
1+
sbt.version=0.13.18

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.13")
1+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")
22

33
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")

0 commit comments

Comments
 (0)