From af9cae4c1a562bd5c75ac0ca88e6978bfcde60f5 Mon Sep 17 00:00:00 2001 From: "Frank S. Thomas" Date: Sat, 25 May 2019 20:10:16 +0200 Subject: [PATCH 1/2] Update to Scala 2.13.0-RC2 --- .travis.yml | 2 +- build.sbt | 10 +++++----- project/plugins.sbt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59d4430bf..98d853cf1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ jobs: after_success: - codecov - - scala: 2.13.0-RC1 # Remember to update this in build.sbt, too. + - scala: 2.13.0-RC2 # Remember to update this in build.sbt, too. script: - sbt ++$TRAVIS_SCALA_VERSION coreJVM/test scalacheckJVM/test scalazJVM/test shapelessJVM/test && sbt ++$TRAVIS_SCALA_VERSION coreJS/test scalacheckJS/test scalazJS/test shapelessJS/test diff --git a/build.sbt b/build.sbt index 28e8ba8b5..1f35d33cc 100644 --- a/build.sbt +++ b/build.sbt @@ -11,6 +11,11 @@ val gitHubOwner = "fthomas" val gitPubUrl = s"https://github.com/$gitHubOwner/$projectName.git" val gitDevUrl = s"git@github.com:$gitHubOwner/$projectName.git" +// Remember to update these in .travis.yml, too. +val Scala211 = "2.11.12" +val Scala212 = "2.12.8" +val Scala213 = "2.13.0-RC2" + val catsVersion = "1.6.0" val jsonpathVersion = "2.4.0" val macroParadiseVersion = "2.1.1" @@ -63,11 +68,6 @@ val allSubprojectsJVM = allSubprojectsOf(JVMPlatform) val allSubprojectsJS = allSubprojectsOf(JSPlatform) val allSubprojectsNative = allSubprojectsOf(NativePlatform) -// Remember to update these in .travis.yml, too. -val Scala211 = "2.11.12" -val Scala212 = "2.12.8" -val Scala213 = "2.13.0-RC1" - val moduleCrossScalaVersionsMatrix: (String, Platform) => List[String] = { case (_, NativePlatform) => List(Scala211) diff --git a/project/plugins.sbt b/project/plugins.sbt index 62412dd95..4cee5d17b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -12,7 +12,7 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.9") From 431831d220d9c19d7654b3992cbaf509228baa4f Mon Sep 17 00:00:00 2001 From: "Frank S. Thomas" Date: Sat, 25 May 2019 20:40:26 +0200 Subject: [PATCH 2/2] Add release notes --- notes/0.9.6.markdown | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 notes/0.9.6.markdown diff --git a/notes/0.9.6.markdown b/notes/0.9.6.markdown new file mode 100644 index 000000000..d11109b70 --- /dev/null +++ b/notes/0.9.6.markdown @@ -0,0 +1,11 @@ +### Updates + +* Update Scala Native to 0.3.9. ([#631][#631] by [@scala-steward][@scala-steward]) +* Update Scala 2.13 to 2.13.0-RC2 and Scala.js to 0.6.28. + ([#637][#637] by [@fthomas][@fthomas]) + +[#631]: https://github.com/fthomas/refined/pull/631 +[#637]: https://github.com/fthomas/refined/pull/637 + +[@fthomas]: https://github.com/fthomas +[@scala-steward]: https://github.com/scala-steward