From 8d9d2e3234b2cfd9c9adb01a49d5168dc6b3267b Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 6 Apr 2020 20:45:11 -0700 Subject: [PATCH 1/2] move to Scala 2.12.11 (was 2.12.10) --- .travis.yml | 8 ++++---- README.md | 2 +- build.sbt | 2 +- project/MultiScalaProject.scala | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index f26584e1..0992ba74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ language: scala scala: - 2.11.12 - - 2.12.10 + - 2.12.11 - 2.13.1 env: @@ -22,15 +22,15 @@ matrix: include: # run migration test - - scala: 2.12.10 + - scala: 2.12.11 env: TEST_SCALAFIX=true ADOPTOPENJDK=8 # run binary compatibility test - - scala: 2.12.10 + - scala: 2.12.11 env: TEST_BINARY_COMPAT=true ADOPTOPENJDK=8 # run scalafmt - - scala: 2.12.10 + - scala: 2.12.11 env: TEST_SCALAFMT=true ADOPTOPENJDK=8 # Scala Native includes diff --git a/README.md b/README.md index d5711e40..1ad6498d 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,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.10). +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.11). ```scala // project/plugins.sbt diff --git a/build.sbt b/build.sbt index ebd16e6c..82fffbbe 100644 --- a/build.sbt +++ b/build.sbt @@ -47,7 +47,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.10" +lazy val scala212 = "2.12.11" lazy val scala213 = "2.13.1" /** Create an OSGi version range for standard Scala versioning diff --git a/project/MultiScalaProject.scala b/project/MultiScalaProject.scala index ade93e50..085d6980 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.10" , _.settings(...)) + * lazy val myProject212 = myProject("2.12.11" , _.settings(...)) * // ... * }}} */ From 5e24001c925c5169f5f8b94e6796ca8767fe5bdf Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 6 Apr 2020 20:45:25 -0700 Subject: [PATCH 2/2] Scala.js 1.0.1 (was 1.0.0) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0992ba74..f4c49714 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,10 +12,10 @@ scala: env: - SCALAJS_VERSION= ADOPTOPENJDK=8 - SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8 - - SCALAJS_VERSION=1.0.0 ADOPTOPENJDK=8 + - SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8 - SCALAJS_VERSION= ADOPTOPENJDK=11 - SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=11 - - SCALAJS_VERSION=1.0.0 ADOPTOPENJDK=11 + - SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=11 matrix: