Merge pull request #246 from SethTisue/allow-building-on-jdk14

allow JDK 13/14 build (on 1.0.x branch)
scala · Oct 23, 2019 · c4c97ba · c4c97ba
2 parents 23a8cba + d99be7e
commit c4c97ba
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,14 +23,9 @@ env:
 
 script: admin/build.sh
 
-addons:
-  apt:
-    packages:
-      - openjdk-6-jdk
-
 jdk:
   - openjdk6
-  - oraclejdk8
+  - openjdk8
 
 notifications:
   email:

diff --git a/build.sbt b/build.sbt
@@ -12,7 +12,9 @@ scalaVersionsByJvm in ThisBuild := {
     9 -> List(v212 -> false, v213 -> false, v211 -> false),
     10 -> List(v212 -> false, v213 -> false, v211 -> false),
     11 -> List(v212 -> false, v213 -> false, v211 -> false),
-    12 -> List(v212 -> false, v213 -> false, v211 -> false)
+    12 -> List(v212 -> false, v213 -> false, v211 -> false),
+    13 -> List(v212 -> false, v213 -> false, v211 -> false),
+    14 -> List(v212 -> false, v213 -> false, v211 -> false)
   )
 }
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.17
+sbt.version=0.13.18
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.13")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")
 
 addSbtPlugin("org.scala-js"     % "sbt-scalajs"              % "0.6.22")