Merge pull request #174 from SethTisue/version-bumps

version bumps

Author: SethTisue

.travis.yml

@@ -2,7 +2,7 @@ language: scala
 
 scala:
   - 2.11.12
-  - 2.12.6
+  - 2.12.8
   - 2.13.0-M5
 jdk:
   - oraclejdk8
@@ -17,33 +17,30 @@ env:
     - secure: "m0Fw/eH7RXJJoBTfqV6CMd7kaIN2pRPnQPNXJGb546UjqYAlYTkfjvVrWpsgpisRBptI1FEHn24yGbgAHjIes/4un/O62K66I0BffL8PbdeHeNcDjSrTesKEqage2mQfGOiqccVsmkgiKeXNYL8tPZRmPQQ3XZ97mS1SXWlqAJSMW6HfNnvqW14Gdb/snR6I8lQ2o5tRnLerWPnI96pp+xjZca2lD4XDvH2wLJXXLmYY61e23ZYzZMepxBxhGa7js3YTYzCWNrOfBLjFJ5nwRxbjR0WMuz5z5Gdy715WtguKS4Fffd/GJHycLROBU9LCAQDMTxMFvqzFqVFpfq0BuTmmkXFXj+a7dO+ABG0RfoDfoMjn7pHwyHNCZyMMuR1HCjMkbGFwC+Zme2UAYNivtcsuWWeMuypwjyqjfFfNns4FHJ0SXFtC/6+OJkAuUdbEJKReYWKWEsP5SnCH/8PLlc+uUl3tjQkFLc1sOAyx9cTWyBErwuJXhgTrjT9AWvO+fvhcm8z/p5+aaF/U9GIrzPqziX4hGjzc/WC+rsFJSiBDlFQl7br+m8WWs7/wuXqPGXmhf0BNQViDi7fZndDHcY3p3T0An05d/IMKjCUrgLDlJi6VYs9XN7S8ay6MH+XTwIsJGSxtGjfEO4rHGIjtR2GRr8TqdNfnpsI3ucbia1Y="
   matrix:
     - SCALAJS_VERSION=
-    - SCALAJS_VERSION=0.6.25
-    - SCALAJS_VERSION=1.0.0-M3
+    - SCALAJS_VERSION=0.6.26
+    - SCALAJS_VERSION=1.0.0-M6
 
 matrix:
   exclude:
     # ?
     - jdk: oraclejdk8
       scala: 2.11.12
 
-    # 2.13.0-M5 is not available in Scala.js 1.0.0-M3
-    - scala: 2.13.0-M5
-      env: SCALAJS_VERSION=1.0.0-M3
   include:
 
     # run migration test
     - jdk: oraclejdk8
-      scala: 2.12.6
+      scala: 2.12.8
       env: TEST_SCALAFIX=true
 
     # run binary compatibility test
     - jdk: oraclejdk8
-      scala: 2.12.6
+      scala: 2.12.8
       env: TEST_BINARY_COMPAT=true
 
     # run scalafmt
     - jdk: oraclejdk8
-      scala: 2.12.6
+      scala: 2.12.8
       env: TEST_SCALAFMT=true
 
 before_script:

README.md

@@ -38,7 +38,7 @@ The library also adds backported versions of new collection types, currently `sc
 
 ## Migration Tool
 
-The migration rules use scalafix. Please see the [official installation instruction](https://scalacenter.github.io/scalafix/docs/users/installation.html) and, in particular, check that your full Scala version is supported (ex 2.12.6).
+The migration rules use scalafix. Please see the [official installation instruction](https://scalacenter.github.io/scalafix/docs/users/installation.html) and, in particular, check that your full Scala version is supported (ex 2.12.8).
 
 ```scala
 // project/plugins.sbt

admin/README.md

@@ -28,7 +28,7 @@ jdk:
 
 scala:
   - 2.11.12
-  - 2.12.6
+  - 2.12.8
 
 env:
   global:

build.sbt

@@ -29,17 +29,9 @@ lazy val root = project
 
 lazy val junit = libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test
 
-lazy val scala211   = "2.11.12"
-lazy val scala212   = "2.12.6"
-lazy val scalaJs213 = "2.13.0-M5" // Scala.js does no have -pre
-
+lazy val scala211 = "2.11.12"
+lazy val scala212 = "2.12.8"
 lazy val scala213 = "2.13.0-M5"
-// lazy val scala213 = "2.13.0-pre-3ae6282" // use the sbt command `latest-213` to fetch the latest version
-
-lazy val scala213Settings = Seq(
-  resolvers += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-integration/",
-  scalaVersion := scala213
-)
 
 lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform)(
   "compat",
@@ -77,7 +69,7 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform)(
 
 val compat211 = compat(scala211)
 val compat212 = compat(scala212)
-val compat213 = compat(scala213, scalaJs213, _.jvmSettings(scala213Settings))
+val compat213 = compat(scala213)
 
 lazy val compat211JVM = compat211.jvm
 lazy val compat211JS  = compat211.js
@@ -150,8 +142,7 @@ lazy val `scalafix-data` = MultiScalaProject(
 
 val `scalafix-data211` = `scalafix-data`(scala211, _.dependsOn(compat211JVM))
 val `scalafix-data212` = `scalafix-data`(scalafixScala212, _.dependsOn(compat212JVM))
-val `scalafix-data213` =
-  `scalafix-data`(scala213, _.settings(scala213Settings).dependsOn(compat213JVM))
+val `scalafix-data213` = `scalafix-data`(scala213, _.dependsOn(compat213JVM))
 
 lazy val `scalafix-input` = project
   .in(file("scalafix/input"))
@@ -204,14 +195,12 @@ lazy val `scalafix-output213` = `scalafix-output`(
   scala213,
   _.settings(addOutput213)
     .settings(addOutput212Plus)
-    .settings(scala213Settings)
     .dependsOn(`scalafix-data213`)
 )
 
 lazy val `scalafix-output213-failure` = project
   .in(file("scalafix/output213-failure"))
   .settings(sharedScalafixSettings)
-  .settings(scala213Settings)
   .settings(dontPublish)
 
 lazy val `scalafix-tests` = project
@@ -270,10 +259,6 @@ inThisBuild(releaseCredentials)
 inThisBuild(
   Seq(
     crossScalaVersions := Seq(scala211, scala212, scala213),
-    commands += Command.command("latest-213") { state =>
-      LatestScala.printLatestScala213()
-      state
-    },
     commands += Command.command(preRelease) { state =>
       // Show Compat version, Scala version, and Java Version
       val jvmVersion = Version.parse(sys.props("java.specification.version")).get.minor

project/LatestScala213.scala

@@ -22,7 +22,7 @@ import java.io.File
  *
  * // instanciate a sbt project
  * lazy val myProject211 = myProject("2.11.12", _.settings(...) /* scala version dependent configurations */)
- * lazy val myProject212 = myProject("2.12.6" , _.settings(...))
+ * lazy val myProject212 = myProject("2.12.8" , _.settings(...))
  * // ...
  * }}}
  */

project/MultiScalaProject.scala

@@ -1 +1 @@
-sbt.version=0.13.17
+sbt.version=0.13.18

project/build.properties

@@ -5,7 +5,7 @@ else
   // see https://github.com/scala/sbt-scala-module/issues/35
   Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3"))
 
-val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.25")
+val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.26")
 
 addSbtPlugin("org.scala-js"           % "sbt-scalajs"              % scalaJSVersion)
 addSbtPlugin("org.portable-scala"     % "sbt-scalajs-crossproject" % "0.6.0")