From f8537cb5b73d192c23b62165d62fe8b2a2250d6d Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 30 Jan 2019 16:59:45 -0800 Subject: [PATCH 1/5] Scala 2.12.8 (was 2.12.6) --- .travis.yml | 8 ++++---- README.md | 2 +- admin/README.md | 2 +- build.sbt | 2 +- project/MultiScalaProject.scala | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 57f6582a..c9e2b342 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: scala scala: - 2.11.12 - - 2.12.6 + - 2.12.8 - 2.13.0-M5 jdk: - oraclejdk8 @@ -33,17 +33,17 @@ matrix: # 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: diff --git a/README.md b/README.md index 9ee44c09..9813e5b9 100644 --- a/README.md +++ b/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 diff --git a/admin/README.md b/admin/README.md index 3e9d1bfa..d5df76e4 100644 --- a/admin/README.md +++ b/admin/README.md @@ -28,7 +28,7 @@ jdk: scala: - 2.11.12 - - 2.12.6 + - 2.12.8 env: global: diff --git a/build.sbt b/build.sbt index 937fc762..0211681d 100644 --- a/build.sbt +++ b/build.sbt @@ -30,7 +30,7 @@ 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 scala212 = "2.12.8" lazy val scalaJs213 = "2.13.0-M5" // Scala.js does no have -pre lazy val scala213 = "2.13.0-M5" diff --git a/project/MultiScalaProject.scala b/project/MultiScalaProject.scala index ccccd7f6..f0170a63 100644 --- a/project/MultiScalaProject.scala +++ b/project/MultiScalaProject.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(...)) * // ... * }}} */ From 64a473f2a6cd39d67ff5f6f12f3e37cffa7ed639 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 30 Jan 2019 17:00:01 -0800 Subject: [PATCH 2/5] sbt 0.13.18 (was 0.13.17) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 133a8f19..8e682c52 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.17 +sbt.version=0.13.18 From 4dc497f87c4110a091dd661b2688050d568e4596 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 30 Jan 2019 17:08:41 -0800 Subject: [PATCH 3/5] bump Scala.js version (0.6.26, 1.0.0-M6) --- .travis.yml | 8 ++++---- project/plugins.sbt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c9e2b342..c4807986 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,8 @@ 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: @@ -26,9 +26,9 @@ matrix: - jdk: oraclejdk8 scala: 2.11.12 - # 2.13.0-M5 is not available in Scala.js 1.0.0-M3 + # 2.13.0-M5 is not available in Scala.js 1.0.0-M6 - scala: 2.13.0-M5 - env: SCALAJS_VERSION=1.0.0-M3 + env: SCALAJS_VERSION=1.0.0-M6 include: # run migration test diff --git a/project/plugins.sbt b/project/plugins.sbt index 83390fdf..904c83b4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") From 080d33afed8514ac2fc19049d8e24c2417e16d55 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 30 Jan 2019 17:43:57 -0800 Subject: [PATCH 4/5] rip out latest-Scala-2.13 stuff it would be cool if this became available as an sbt plugin, maybe. but with RC1 close now I don't think we need it --- build.sbt | 23 ++++--------------- project/LatestScala213.scala | 44 ------------------------------------ 2 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 project/LatestScala213.scala diff --git a/build.sbt b/build.sbt index 0211681d..83f95963 100644 --- a/build.sbt +++ b/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.8" -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 diff --git a/project/LatestScala213.scala b/project/LatestScala213.scala deleted file mode 100644 index 79727898..00000000 --- a/project/LatestScala213.scala +++ /dev/null @@ -1,44 +0,0 @@ -import org.jsoup.Jsoup -import com.github.nscala_time.time.Imports._ - -import java.nio.file._ -import java.net.URL - -// Fetch the latest Scala 2.13 by scraping the artifactory web directory -// We just search the latest version by date -// run the command: latest-213 in sbt -// NB. maven-metadata.xml does not point to the latest version -object LatestScala { - - def printLatestScala213(): Unit = { - val url = - "https://scala-ci.typesafe.com/artifactory/scala-integration/org/scala-lang/scala-library/" - val index = new URL(url).openStream() - val html = scala.io.Source.fromInputStream(index).mkString - index.close - - val doc = Jsoup.parse(html, url) - val pre = doc.select("pre").get(1).text - val versionsAndDateRaw = pre.split("\n").drop(1).dropRight(1) - val dateFormat = DateTimeFormat.forPattern("dd-MMM-yyyy HH:mm") - val versionsAndDate = - versionsAndDateRaw.map { line => - val Array(version, dateRaw) = line.split("/") - val dateClean = dateRaw.dropRight(1).trim - val date = DateTime.parse(dateClean, dateFormat) - (version, date) - } - - def Descending[T: Ordering] = implicitly[Ordering[T]].reverse - - val (version, date) = versionsAndDate.sortBy(_._2)(Descending).head - val latestVersion = version - val lastestDate = dateFormat.print(date) - - println() - println(latestVersion) - println() - println(lastestDate) - println() - } -} From ef343174987dab3dcc88f594206117838086331a Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 30 Jan 2019 21:19:05 -0800 Subject: [PATCH 5/5] remove outdated CI matrix exclusion as noticed by Ol' Eagle Eye (whose initials are S.D.) --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4807986..f56b55fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,9 +26,6 @@ matrix: - jdk: oraclejdk8 scala: 2.11.12 - # 2.13.0-M5 is not available in Scala.js 1.0.0-M6 - - scala: 2.13.0-M5 - env: SCALAJS_VERSION=1.0.0-M6 include: # run migration test