From 8b9cbb331174cd2759dcc46b37af9c481592f788 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 18 Sep 2021 17:37:41 -0400 Subject: [PATCH] Follow up on Scala 2.12.15 bump --- .github/workflows/ci.yml | 2 +- DEVELOPING.md | 4 ++++ build.sbt | 1 + launcher-package/build.sbt | 2 +- .../main/scala/sbt/plugins/SemanticdbPlugin.scala | 2 +- .../src/sbt-test/actions/cross-advanced/build.sbt | 13 +++++++------ 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 | 1 + sbt-app/src/sbt-test/project/semanticdb/build.sbt | 2 +- .../tests/scala-instance-classloader/build.sbt | 2 +- server-test/src/server-test/response/build.sbt | 2 +- 13 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ab7e9362..6dfe3956f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ 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.14 + SCALA_212: 2.12.15 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 diff --git a/DEVELOPING.md b/DEVELOPING.md index 020f81992..8b1db7b09 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -131,6 +131,10 @@ Listening for transport dt_socket at address: 5005 Please note that this alternative launcher does _not_ have feature parity with sbt/launcher. (Meta) contributions welcome! :-D +### Updating Scala version + +See https://github.com/sbt/sbt/pull/6522 for the list of files to change for Scala version upgrade. + ### Diagnosing build failures Globally included plugins can interfere building `sbt`; if you are getting errors building sbt, try disabling all globally included plugins and try again. diff --git a/build.sbt b/build.sbt index 0e6137e5c..399dcd045 100644 --- a/build.sbt +++ b/build.sbt @@ -45,6 +45,7 @@ ThisBuild / scmInfo := Some( ThisBuild / resolvers += Resolver.mavenLocal Global / semanticdbEnabled := !(Global / insideCI).value +// Change main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala too, if you change this. Global / semanticdbVersion := "4.4.28" val excludeLint = SettingKey[Set[Def.KeyedInitialize[_]]]("excludeLintKeys") Global / excludeLint := (Global / excludeLint).?.value.getOrElse(Set.empty) diff --git a/launcher-package/build.sbt b/launcher-package/build.sbt index fd12e98cb..dd9e2558c 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.14" +lazy val scala212 = "2.12.15" lazy val scala210Jline = "org.scala-lang" % "jline" % scala210 lazy val jansi = { if (sbtVersionToRelease startsWith "1.") "org.fusesource.jansi" % "jansi" % "1.12" diff --git a/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala b/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala index a10f49725..76b9c8f1b 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.20" + semanticdbVersion := "4.4.28" ) override lazy val projectSettings: Seq[Def.Setting[_]] = Seq( 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 c4e16f6ef..a77d7c0dd 100644 --- a/sbt-app/src/sbt-test/actions/cross-advanced/build.sbt +++ b/sbt-app/src/sbt-test/actions/cross-advanced/build.sbt @@ -1,5 +1,6 @@ lazy val check = taskKey[Unit]("") lazy val compile2 = taskKey[Unit]("") +lazy val scala212 = "2.12.15" lazy val root = (project in file(".")) .aggregate(foo, bar, client) @@ -10,19 +11,19 @@ lazy val root = (project in file(".")) lazy val foo = project .settings( - crossScalaVersions := Seq("2.12.14", "2.13.1"), + crossScalaVersions := Seq(scala212, "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.14", s"$x == 2.12.12") + assert(x == scala212, s"$x == $scala212") (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.14", s"$x == 2.12.12") + assert(x == scala212, s"$x == $scala212") val _ = (Test / testOnly).evaluated }, compile2 := { @@ -35,7 +36,7 @@ lazy val foo = project lazy val bar = project .settings( - crossScalaVersions := Seq("2.12.14"), + crossScalaVersions := Seq(scala212), check := (Compile / compile).value, compile2 := (Compile / compile).value, ) @@ -46,14 +47,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.14", s"$x == 2.12.14") + assert(x == scala212, s"$x == $scala212") (Compile / compile).value }, ) lazy val client = project .settings( - crossScalaVersions := Seq("2.12.14", "2.13.1"), + crossScalaVersions := Seq(scala212, "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 6f606cd4a..5b3ab9f3b 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.14", "2.13.1") +> set root/crossScalaVersions := Seq("2.12.15", "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 ae7ce14e9..bb26b40e0 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.14", + scalaVersion := "2.12.15", 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 063ee25e5..ce0acfbe0 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.14", + scalaVersion := "2.12.15", 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 0600aa8dd..fa2845eb9 100644 --- a/sbt-app/src/sbt-test/project/semanticdb-version/build.sbt +++ b/sbt-app/src/sbt-test/project/semanticdb-version/build.sbt @@ -1,3 +1,4 @@ +// Don't have to upgrade this while updating 2.12 ThisBuild / scalaVersion := "2.12.14" ThisBuild / semanticdbEnabled := true ThisBuild / semanticdbVersion := "4.4.20" diff --git a/sbt-app/src/sbt-test/project/semanticdb/build.sbt b/sbt-app/src/sbt-test/project/semanticdb/build.sbt index fc07b3748..3a76b7064 100644 --- a/sbt-app/src/sbt-test/project/semanticdb/build.sbt +++ b/sbt-app/src/sbt-test/project/semanticdb/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.12" +ThisBuild / scalaVersion := "2.12.15" ThisBuild / semanticdbEnabled := true ThisBuild / semanticdbIncludeInJar := true 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 3ed61dad2..b099f2338 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.14" +ThisBuild / scalaVersion := "2.12.15" 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 105e64e77..1f18c7ab3 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.14" +ThisBuild / scalaVersion := "2.12.15" Global / serverLog / logLevel := Level.Debug // custom handler