From fbfc272171cd080e2f8267b54b188c4b487ce33d Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 28 May 2021 17:36:55 +0200 Subject: [PATCH 1/3] Scala 2.12.14 / 2.13.6 --- .github/workflows/ci.yml | 4 ++-- launcher-package/build.sbt | 4 ++-- main/src/main/scala/sbt/PluginCross.scala | 2 +- project/Dependencies.scala | 4 ++-- .../src/sbt-test/actions/cross-advanced/build.sbt | 12 ++++++------ sbt-app/src/sbt-test/actions/cross-advanced/test | 2 +- sbt-app/src/sbt-test/project/sbt-plugin/build.sbt | 2 +- .../project/sbt-plugin/changes/oldSbtPlugin.sbt | 2 +- .../sbt-test/project/semanticdb-version/build.sbt | 2 +- .../tests/scala-instance-classloader/build.sbt | 2 +- server-test/src/server-test/response/build.sbt | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0e53c8b3..6a06cfc2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,8 +40,8 @@ jobs: env: JAVA_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8 JVM_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8 - SCALA_212: 2.12.13 - SCALA_213: 2.13.3 + SCALA_212: 2.12.14 + SCALA_213: 2.13.6 UTIL_TESTS: "utilCache/test utilControl/test utilInterface/test utilLogging/test utilPosition/test utilRelation/test utilScripted/test utilTracking/test" SBT_LOCAL: false TEST_SBT_VER: 1.5.0 diff --git a/launcher-package/build.sbt b/launcher-package/build.sbt index f4289c4a4..fd12e98cb 100755 --- a/launcher-package/build.sbt +++ b/launcher-package/build.sbt @@ -26,7 +26,7 @@ lazy val sbtVersionToRelease = sys.props.getOrElse("sbt.build.version", sys.env. })) lazy val scala210 = "2.10.7" -lazy val scala212 = "2.12.10" +lazy val scala212 = "2.12.14" lazy val scala210Jline = "org.scala-lang" % "jline" % scala210 lazy val jansi = { if (sbtVersionToRelease startsWith "1.") "org.fusesource.jansi" % "jansi" % "1.12" @@ -34,7 +34,7 @@ lazy val jansi = { } lazy val scala212Compiler = "org.scala-lang" % "scala-compiler" % scala212 lazy val scala212Jline = "jline" % "jline" % "2.14.6" -// use the scala-xml version used by the compiler not the latest: https://github.com/scala/scala/blob/v2.12.10/versions.properties#L22 +// use the scala-xml version used by the compiler not the latest: https://github.com/scala/scala/blob/v2.12.14/versions.properties#L21 lazy val scala212Xml = "org.scala-lang.modules" % "scala-xml_2.12" % "1.0.6" lazy val sbtActual = "org.scala-sbt" % "sbt" % sbtVersionToRelease diff --git a/main/src/main/scala/sbt/PluginCross.scala b/main/src/main/scala/sbt/PluginCross.scala index 679a344dc..39dc0a071 100644 --- a/main/src/main/scala/sbt/PluginCross.scala +++ b/main/src/main/scala/sbt/PluginCross.scala @@ -99,7 +99,7 @@ private[sbt] object PluginCross { VersionNumber(sv) match { case VersionNumber(Seq(0, 12, _*), _, _) => "2.9.2" case VersionNumber(Seq(0, 13, _*), _, _) => "2.10.7" - case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.13" + case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.14" case _ => sys.error(s"Unsupported sbt binary version: $sv") } } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 7b2a83151..3f0f05a60 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,8 +4,8 @@ import sbt.contraband.ContrabandPlugin.autoImport._ object Dependencies { // WARNING: Please Scala update versions in PluginCross.scala too - val scala212 = "2.12.13" - val scala213 = "2.13.5" + val scala212 = "2.12.14" + val scala213 = "2.13.6" val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up") val baseScalaVersion = scala212 def nightlyVersion: Option[String] = diff --git a/sbt-app/src/sbt-test/actions/cross-advanced/build.sbt b/sbt-app/src/sbt-test/actions/cross-advanced/build.sbt index 0076195d7..c4e16f6ef 100644 --- a/sbt-app/src/sbt-test/actions/cross-advanced/build.sbt +++ b/sbt-app/src/sbt-test/actions/cross-advanced/build.sbt @@ -10,19 +10,19 @@ lazy val root = (project in file(".")) lazy val foo = project .settings( - crossScalaVersions := Seq("2.12.13", "2.13.1"), + crossScalaVersions := Seq("2.12.14", "2.13.1"), libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0", check := { // This tests that +check will respect bar's crossScalaVersions and not switch val x = (LocalProject("bar") / scalaVersion).value - assert(x == "2.12.13", s"$x == 2.12.12") + assert(x == "2.12.14", s"$x == 2.12.12") (Compile / compile).value }, (Test / testOnly) := { // This tests that +testOnly will respect bar's crossScalaVersions and not switch val x = (LocalProject("bar") / scalaVersion).value - assert(x == "2.12.13", s"$x == 2.12.12") + assert(x == "2.12.14", s"$x == 2.12.12") val _ = (Test / testOnly).evaluated }, compile2 := { @@ -35,7 +35,7 @@ lazy val foo = project lazy val bar = project .settings( - crossScalaVersions := Seq("2.12.13"), + crossScalaVersions := Seq("2.12.14"), check := (Compile / compile).value, compile2 := (Compile / compile).value, ) @@ -46,14 +46,14 @@ lazy val baz = project check := { // This tests that +baz/check will respect bar's crossScalaVersions and not switch val x = (LocalProject("bar") / scalaVersion).value - assert(x == "2.12.13", s"$x == 2.12.13") + assert(x == "2.12.14", s"$x == 2.12.14") (Compile / compile).value }, ) lazy val client = project .settings( - crossScalaVersions := Seq("2.12.13", "2.13.1"), + crossScalaVersions := Seq("2.12.14", "2.13.1"), check := (Compile / compile).value, compile2 := (Compile / compile).value, ) diff --git a/sbt-app/src/sbt-test/actions/cross-advanced/test b/sbt-app/src/sbt-test/actions/cross-advanced/test index 9aabd48d6..6f606cd4a 100644 --- a/sbt-app/src/sbt-test/actions/cross-advanced/test +++ b/sbt-app/src/sbt-test/actions/cross-advanced/test @@ -17,7 +17,7 @@ ## test + with command or alias > clean ## for command cross building you do need crossScalaVerions on root -> set root/crossScalaVersions := Seq("2.12.13", "2.13.1") +> set root/crossScalaVersions := Seq("2.12.14", "2.13.1") > + build $ exists foo/target/scala-2.12 $ exists foo/target/scala-2.13 diff --git a/sbt-app/src/sbt-test/project/sbt-plugin/build.sbt b/sbt-app/src/sbt-test/project/sbt-plugin/build.sbt index 072e6af4a..ae7ce14e9 100644 --- a/sbt-app/src/sbt-test/project/sbt-plugin/build.sbt +++ b/sbt-app/src/sbt-test/project/sbt-plugin/build.sbt @@ -1,6 +1,6 @@ lazy val root = project.in(file(".")) .enablePlugins(SbtPlugin) .settings( - scalaVersion := "2.12.13", + scalaVersion := "2.12.14", scalacOptions ++= Seq("-Xfatal-warnings", "-Xlint") ) diff --git a/sbt-app/src/sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt b/sbt-app/src/sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt index 18e6bc334..063ee25e5 100644 --- a/sbt-app/src/sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt +++ b/sbt-app/src/sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt @@ -1,6 +1,6 @@ lazy val root = project.in(file(".")) .settings( - scalaVersion := "2.12.13", + scalaVersion := "2.12.14", sbtPlugin := true, scalacOptions ++= Seq("-Xfatal-warnings", "-Xlint") ) diff --git a/sbt-app/src/sbt-test/project/semanticdb-version/build.sbt b/sbt-app/src/sbt-test/project/semanticdb-version/build.sbt index 8b5c69c23..c1eee78dd 100644 --- a/sbt-app/src/sbt-test/project/semanticdb-version/build.sbt +++ b/sbt-app/src/sbt-test/project/semanticdb-version/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.13" +ThisBuild / scalaVersion := "2.12.14" ThisBuild / semanticdbEnabled := true ThisBuild / semanticdbVersion := "4.4.10" ThisBuild / semanticdbIncludeInJar := false diff --git a/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt b/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt index 3e73d9178..3ed61dad2 100644 --- a/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt +++ b/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt @@ -3,7 +3,7 @@ import sbt.internal.inc.ScalaInstance lazy val OtherScala = config("other-scala").hide lazy val junitinterface = "com.novocode" % "junit-interface" % "0.11" lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.17" -ThisBuild / scalaVersion := "2.12.13" +ThisBuild / scalaVersion := "2.12.14" lazy val root = (project in file(".")) .configs(OtherScala) diff --git a/server-test/src/server-test/response/build.sbt b/server-test/src/server-test/response/build.sbt index f75670640..105e64e77 100644 --- a/server-test/src/server-test/response/build.sbt +++ b/server-test/src/server-test/response/build.sbt @@ -1,6 +1,6 @@ import sbt.internal.server.{ ServerHandler, ServerIntent } -ThisBuild / scalaVersion := "2.12.13" +ThisBuild / scalaVersion := "2.12.14" Global / serverLog / logLevel := Level.Debug // custom handler From 3f7193f91a727059627f4911cf714a00968e4d1c Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 28 May 2021 17:41:34 +0200 Subject: [PATCH 2/3] Update kind-projector --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3f0f05a60..da43fc797 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -116,5 +116,5 @@ object Dependencies { val hedgehog = "qa.hedgehog" %% "hedgehog-sbt" % "0.6.1" val disruptor = "com.lmax" % "disruptor" % "3.4.2" - val kindProjector = ("org.typelevel" % "kind-projector" % "0.11.3").cross(CrossVersion.full) + val kindProjector = ("org.typelevel" % "kind-projector" % "0.13.0").cross(CrossVersion.full) } From ee460e0043634edb6a2c83e0c00fcc017f14d1f9 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 28 May 2021 21:44:10 +0200 Subject: [PATCH 3/3] Upgrade semanticdb to newest version which supports Scala 2.12.14 --- build.sbt | 2 +- main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala | 2 +- sbt-app/src/sbt-test/project/semanticdb-version/build.sbt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index b0beac8ea..358900c03 100644 --- a/build.sbt +++ b/build.sbt @@ -45,7 +45,7 @@ ThisBuild / scmInfo := Some( ThisBuild / resolvers += Resolver.mavenLocal Global / semanticdbEnabled := !(Global / insideCI).value -Global / semanticdbVersion := "4.4.10" +Global / semanticdbVersion := "4.4.20" val excludeLint = SettingKey[Set[Def.KeyedInitialize[_]]]("excludeLintKeys") Global / excludeLint := (Global / excludeLint).?.value.getOrElse(Set.empty) Global / excludeLint += componentID diff --git a/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala b/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala index ee0df6f42..a10f49725 100644 --- a/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala +++ b/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala @@ -26,7 +26,7 @@ object SemanticdbPlugin extends AutoPlugin { semanticdbEnabled := SysProp.semanticdb, semanticdbIncludeInJar := false, semanticdbOptions := List(), - semanticdbVersion := "4.4.10" + semanticdbVersion := "4.4.20" ) override lazy val projectSettings: Seq[Def.Setting[_]] = Seq( diff --git a/sbt-app/src/sbt-test/project/semanticdb-version/build.sbt b/sbt-app/src/sbt-test/project/semanticdb-version/build.sbt index c1eee78dd..0600aa8dd 100644 --- a/sbt-app/src/sbt-test/project/semanticdb-version/build.sbt +++ b/sbt-app/src/sbt-test/project/semanticdb-version/build.sbt @@ -1,6 +1,6 @@ ThisBuild / scalaVersion := "2.12.14" ThisBuild / semanticdbEnabled := true -ThisBuild / semanticdbVersion := "4.4.10" +ThisBuild / semanticdbVersion := "4.4.20" ThisBuild / semanticdbIncludeInJar := false lazy val root = (project in file(".")) @@ -8,7 +8,7 @@ lazy val root = (project in file(".")) lazy val check = taskKey[Unit]("Checks the configured semanticdbVersion") check := { - val expected = Some("4.4.10") + val expected = Some("4.4.20") val actual = allDependencies .value .find(_.name == "semanticdb-scalac")