Merge pull request #203 from SethTisue/version-bumps

bump versions of Scala, sbt, plugins, ScalaTest
lightbend-labs · Feb 27, 2018 · 6f2f44b · 6f2f44b
2 parents 9d5899e + 42bde22
commit 6f2f44b
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ cache:
 language: scala
 
 scala:
-  - 2.10.6
+  - 2.10.7
 
 jdk:
   - oraclejdk8
@@ -19,19 +19,22 @@ env:
     - TEST_COMMAND="test"
     - TEST_COMMAND="scripted"
     - TEST_COMMAND="testFunctional"
-    - TEST_COMMAND="-Dmima.testScalaVersion=2.11.11 testFunctional"
-    - TEST_COMMAND="-Dmima.testScalaVersion=2.12.3 testFunctional"
+    - TEST_COMMAND="-Dmima.testScalaVersion=2.11.12 testFunctional"
+    - TEST_COMMAND="-Dmima.testScalaVersion=2.12.4 testFunctional"
     - TEST_COMMAND="it:test"
     - TEST_COMMAND="mimaReportBinaryIssues"
-    - TEST_COMMAND="-Dmima.buildScalaVersion=2.12.3 ^^1.0.0-RC3 test"
-    - TEST_COMMAND="-Dmima.buildScalaVersion=2.12.3 ^^1.0.0-RC3 scripted"
-    - TEST_COMMAND="-Dmima.buildScalaVersion=2.12.3 testFunctional"
-    - TEST_COMMAND="-Dmima.buildScalaVersion=2.12.3 it:test"
-    - TEST_COMMAND="-Dmima.buildScalaVersion=2.12.3 ^^1.0.0-RC3 mimaReportBinaryIssues"
+    - TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 ^^1.0.0 test"
+    - TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 ^^1.0.0 scripted"
+    - TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 ^^1.1.1 test"
+    - TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 ^^1.1.1 scripted"
+    - TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 testFunctional"
+    - TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 it:test"
+    - TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 ^^1.0.0 mimaReportBinaryIssues"
+    - TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 ^^1.1.1 mimaReportBinaryIssues"
 
 script:
   - sbt $TEST_COMMAND
 
-  # Tricks to avoid unnecessary cache updates
+before_cache:
   - find $HOME/.sbt -name "*.lock" | xargs rm
   - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm
diff --git a/project/Build.scala b/project/Build.scala
@@ -28,8 +28,8 @@ object BuildSettings {
       organization := buildOrganization,
       scalaVersion := sys.props.getOrElse("mima.buildScalaVersion",
         (CrossVersion partialVersion (sbtVersion in pluginCrossBuild).value match {
-          case Some((0, 13)) => "2.10.6"
-          case Some((1, _))  => "2.12.3"
+          case Some((0, 13)) => "2.10.7"
+          case Some((1, _))  => "2.12.4"
           case _             => sys error s"Unhandled sbt version ${(sbtVersion in pluginCrossBuild).value}"
         })
       ),
@@ -97,7 +97,7 @@ object Dependencies {
   import BuildSettings._
 
   val typesafeConfig = "com.typesafe" % "config" % "1.0.0"
-  val scalatest = "org.scalatest" %% "scalatest" % "3.0.1" % Test
+  val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" % Test
 
 }
 
@@ -113,7 +113,7 @@ object MimaBuild {
              publishLocal := (),
              publishSigned := (),
              sbtVersion in Global := "0.13.13", // Should be ThisBuild, but ^^ uses Global (incorrectly)
-             crossSbtVersions := List("0.13.13", "1.0.0-RC3"), // Should be ThisBuild, but Defaults defines it at project level..
+             crossSbtVersions := List("0.13.13", "1.0.0"), // Should be ThisBuild, but Defaults defines it at project level..
              testScalaVersion in Global :=  sys.props.getOrElse("mima.testScalaVersion", scalaVersion.value)
     )
     enablePlugins(GitVersioning)

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=0.13.17
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,7 +2,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.9.1")
 
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.2.5")
 
-addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
+addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.3")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")
 
@@ -17,4 +17,4 @@ libraryDependencies += "com.typesafe" % "config" % "1.3.0"
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
 
-addSbtPlugin("com.typesafe"  % "sbt-mima-plugin" % "0.1.17")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18")
diff --git a/reporter/functional-tests/src/it/scala-library-2-10/test.conf b/reporter/functional-tests/src/it/scala-library-2-10/test.conf
@@ -1,4 +1,4 @@
 groupId = "org.scala-lang"
 artifactId = "scala-library"
 v1 = "2.10.0"
-v2 = "2.10.6"
+v2 = "2.10.7"
diff --git a/reporter/functional-tests/src/it/scala-library-2-11/test.conf b/reporter/functional-tests/src/it/scala-library-2-11/test.conf
@@ -1,4 +1,4 @@
 groupId = "org.scala-lang"
 artifactId = "scala-library"
 v1 = "2.11.0"
-v2 = "2.11.8"
+v2 = "2.11.12"
diff --git a/reporter/functional-tests/src/it/scala-reflect-2-10/test.conf b/reporter/functional-tests/src/it/scala-reflect-2-10/test.conf
@@ -1,7 +1,7 @@
 groupId = "org.scala-lang"
 artifactId = "scala-reflect"
 v1 = "2.10.0"
-v2 = "2.10.6"
+v2 = "2.10.7"
 
 filter {
   problems=[

diff --git a/reporter/functional-tests/src/it/scala-reflect-2-11/test.conf b/reporter/functional-tests/src/it/scala-reflect-2-11/test.conf
@@ -1,7 +1,7 @@
 groupId = "org.scala-lang"
 artifactId = "scala-reflect"
 v1 = "2.11.0"
-v2 = "2.11.8"
+v2 = "2.11.12"
 
 filter {
   problems=[