Merge pull request #271 from ennru/ennru_openjdk11

Replace Oracle JDK 10 with Open JDK 11; Scala 2.12.7; sbt 1.2.6
lightbend · Nov 5, 2018 · 812a1f4 · 812a1f4
2 parents 9cd11dc + 18b51aa
commit 812a1f4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ jobs:
       jdk: oraclejdk8
 
     - script: sbt verify
-      jdk: oraclejdk10
+      jdk: openjdk11
 
     - stage: publish
       script: sbt ci-release

diff --git a/build.sbt b/build.sbt
@@ -20,8 +20,8 @@ import java.lang.management.ManagementFactory
 inThisBuild(List(
   organization := "com.lightbend.paradox",
   licenses += "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.html"),
-  scalaVersion := "2.12.6",
-  crossScalaVersions := Seq("2.10.7", "2.12.6"),
+  scalaVersion := "2.12.7",
+  crossScalaVersions := Seq("2.10.7", "2.12.7"),
   organizationName := "lightbend",
   organizationHomepage := Some(url("https://lightbend.com/")),
   homepage := Some(url("https://github.com/lightbend/paradox")),

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.1
+sbt.version=1.2.6