Merge pull request #92 from SethTisue/version-bumps

SethTisue · web-flow · commit a0f8e18addf2 · 2019-02-14T14:57:15.000-08:00
version bumps (sbt, JDK)
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,9 @@ env:
 
 script: admin/build.sh
 
-jdk: oraclejdk8
+jdk:
+- oraclejdk8
+- openjdk11
 
 notifications:
   email:
diff --git a/build.sbt b/build.sbt
@@ -13,7 +13,8 @@ scalaVersionsByJvm in ThisBuild := Map(
    8 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> true),
    9 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false),
   10 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false),
-  11 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false)
+  11 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false),
+  12 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false)
 )
 
 scalaVersion in ThisBuild := "2.13.0-M5"  // for testing
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.17
+sbt.version=0.13.18

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ scalaVersionsByJvm in ThisBuild := Map(`
`13`	`13`	`8 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> true),`
`14`	`14`	`9 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false),`
`15`	`15`	`10 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false),`
`16`		`- 11 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false)`
	`16`	`+ 11 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false),`
	`17`	`+ 12 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false)`
`17`	`18`	`)`
`18`	`19`
`19`	`20`	`scalaVersion in ThisBuild := "2.13.0-M5" // for testing`