From b00792a3a74d7cc87d417426689f397798eae403 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 17 Sep 2022 02:23:56 -0400 Subject: [PATCH] Scala 2.12.17 This bumps up scala-xml to 2.x. --- .github/workflows/ci.yml | 2 +- build.sbt | 3 ++- main/src/main/scala/sbt/PluginCross.scala | 2 +- main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala | 2 +- project/Dependencies.scala | 6 +++--- sbt-app/src/sbt-test/actions/compile-time-only/build.sbt | 2 ++ sbt-app/src/sbt-test/actions/cross-advanced/build.sbt | 2 +- sbt-app/src/sbt-test/actions/cross-advanced/test | 2 +- .../actions/cross-strict-aggregation-scala-3/build.sbt | 6 +++--- .../src/sbt-test/actions/cross-strict-aggregation/build.sbt | 2 +- sbt-app/src/sbt-test/compiler-project/run-test/build.sbt | 2 +- .../sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt | 2 +- .../src/sbt-test/dependency-graph/toFileSubTask/build.sbt | 2 +- sbt-app/src/sbt-test/nio/reload/build.sbt | 2 ++ sbt-app/src/sbt-test/nio/reload/changes/sub.sbt | 2 ++ sbt-app/src/sbt-test/nio/reload/project/plugins.sbt | 2 ++ sbt-app/src/sbt-test/plugins/play-watch/project/plugins.sbt | 1 + .../plugins/sbt-native-packager/project/plugins.sbt | 2 ++ sbt-app/src/sbt-test/project/sbt-plugin/build.sbt | 2 +- .../sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt | 2 +- .../src/sbt-test/project/source-plugins/{test => pending} | 0 sbt-app/src/sbt-test/project/src-plugins/{test => pending} | 0 sbt-app/src/sbt-test/project/src-plugins/project/p.sbt | 2 ++ sbt-app/src/sbt-test/project/unified/build.sbt | 2 +- sbt-app/src/sbt-test/source-dependencies/constants/test | 2 +- .../src/sbt-test/tests/scala-instance-classloader/build.sbt | 2 +- server-test/src/server-test/response/build.sbt | 2 +- 27 files changed, 36 insertions(+), 22 deletions(-) rename sbt-app/src/sbt-test/project/source-plugins/{test => pending} (100%) rename sbt-app/src/sbt-test/project/src-plugins/{test => pending} (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cbd26b8c2..d717c8d25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,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.16 + SCALA_212: 2.12.17 SCALA_213: 2.13.8 SCALA_3: 3.1.0 UTIL_TESTS: "utilCache/test utilControl/test utilInterface/test utilLogging/test utilPosition/test utilRelation/test utilScripted/test utilTracking/test" diff --git a/build.sbt b/build.sbt index 8ffea7edc..791ea39ae 100644 --- a/build.sbt +++ b/build.sbt @@ -43,10 +43,11 @@ ThisBuild / scmInfo := Some( ScmInfo(url("https://github.com/sbt/sbt"), "git@github.com:sbt/sbt.git") ) ThisBuild / resolvers += Resolver.mavenLocal +ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always Global / semanticdbEnabled := !(Global / insideCI).value // Change main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala too, if you change this. -Global / semanticdbVersion := "4.5.9" +Global / semanticdbVersion := "4.5.13" 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/PluginCross.scala b/main/src/main/scala/sbt/PluginCross.scala index 740709b98..dbadb542a 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.16" + case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.17" case _ => sys.error(s"Unsupported sbt binary version: $sv") } } diff --git a/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala b/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala index c1563c60d..b7a558d6d 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.5.9" + semanticdbVersion := "4.5.13" ) override lazy val projectSettings: Seq[Def.Setting[_]] = Seq( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 86df2e8ef..de4c5e44c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._ object Dependencies { // WARNING: Please Scala update versions in PluginCross.scala too - val scala212 = "2.12.16" + val scala212 = "2.12.17" val scala213 = "2.13.8" val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up") val baseScalaVersion = scala212 @@ -102,9 +102,9 @@ object Dependencies { val scalaXml = Def.setting( if (scalaBinaryVersion.value == "3") { - "org.scala-lang.modules" %% "scala-xml" % "2.0.1" + "org.scala-lang.modules" %% "scala-xml" % "2.1.0" } else { - "org.scala-lang.modules" %% "scala-xml" % "1.3.0" + "org.scala-lang.modules" %% "scala-xml" % "2.1.0" } ) val scalaParsers = Def.setting( diff --git a/sbt-app/src/sbt-test/actions/compile-time-only/build.sbt b/sbt-app/src/sbt-test/actions/compile-time-only/build.sbt index 5baf27554..f8d308a29 100644 --- a/sbt-app/src/sbt-test/actions/compile-time-only/build.sbt +++ b/sbt-app/src/sbt-test/actions/compile-time-only/build.sbt @@ -1,3 +1,5 @@ +ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always + libraryDependencies += "org.scala-sbt" % "sbt" % sbtVersion.value 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 91460f0e3..1a8fa296a 100644 --- a/sbt-app/src/sbt-test/actions/cross-advanced/build.sbt +++ b/sbt-app/src/sbt-test/actions/cross-advanced/build.sbt @@ -1,6 +1,6 @@ lazy val check = taskKey[Unit]("") lazy val compile2 = taskKey[Unit]("") -lazy val scala212 = "2.12.16" +lazy val scala212 = "2.12.17" lazy val root = (project in file(".")) .aggregate(foo, bar, client) diff --git a/sbt-app/src/sbt-test/actions/cross-advanced/test b/sbt-app/src/sbt-test/actions/cross-advanced/test index 5ee486310..3b074490d 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.16", "2.13.1") +> set root/crossScalaVersions := Seq("2.12.17", "2.13.1") > + build $ exists foo/target/scala-2.12 $ exists foo/target/scala-2.13 diff --git a/sbt-app/src/sbt-test/actions/cross-strict-aggregation-scala-3/build.sbt b/sbt-app/src/sbt-test/actions/cross-strict-aggregation-scala-3/build.sbt index d5cf2f898..aca345c51 100644 --- a/sbt-app/src/sbt-test/actions/cross-strict-aggregation-scala-3/build.sbt +++ b/sbt-app/src/sbt-test/actions/cross-strict-aggregation-scala-3/build.sbt @@ -1,14 +1,14 @@ -scalaVersion := "2.12.16" +scalaVersion := "2.12.17" lazy val core = project .settings( - crossScalaVersions := Seq("2.12.16", "3.0.2", "3.1.2") + crossScalaVersions := Seq("2.12.17", "3.0.2", "3.1.2") ) lazy val subproj = project .dependsOn(core) .settings( - crossScalaVersions := Seq("2.12.16", "3.1.2"), + crossScalaVersions := Seq("2.12.17", "3.1.2"), // a random library compiled against Scala 3.1 libraryDependencies += "org.http4s" %% "http4s-core" % "0.23.12" ) diff --git a/sbt-app/src/sbt-test/actions/cross-strict-aggregation/build.sbt b/sbt-app/src/sbt-test/actions/cross-strict-aggregation/build.sbt index 1ffbc3b59..f65bc2364 100644 --- a/sbt-app/src/sbt-test/actions/cross-strict-aggregation/build.sbt +++ b/sbt-app/src/sbt-test/actions/cross-strict-aggregation/build.sbt @@ -1,4 +1,4 @@ -lazy val scala212 = "2.12.16" +lazy val scala212 = "2.12.17" lazy val scala213 = "2.13.1" ThisBuild / scalaVersion := scala212 diff --git a/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt b/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt index f424c2d91..1019be51a 100644 --- a/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt +++ b/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.16" +ThisBuild / scalaVersion := "2.12.17" libraryDependencies ++= Seq( "com.novocode" % "junit-interface" % "0.5" % Test, diff --git a/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt b/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt index f67a2c7ee..5ba1d09ce 100644 --- a/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt +++ b/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.16" +ThisBuild / scalaVersion := "2.12.17" libraryDependencies ++= Seq( "org.slf4j" % "slf4j-api" % "1.7.2", diff --git a/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/build.sbt b/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/build.sbt index b8c0e1620..85fd38f7f 100644 --- a/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/build.sbt +++ b/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/build.sbt @@ -1,5 +1,5 @@ // ThisBuild / useCoursier := false -ThisBuild / scalaVersion := "2.12.16" +ThisBuild / scalaVersion := "2.12.17" ThisBuild / organization := "org.example" ThisBuild / version := "0.1" diff --git a/sbt-app/src/sbt-test/nio/reload/build.sbt b/sbt-app/src/sbt-test/nio/reload/build.sbt index 910bfa622..509d4f3f8 100644 --- a/sbt-app/src/sbt-test/nio/reload/build.sbt +++ b/sbt-app/src/sbt-test/nio/reload/build.sbt @@ -1,3 +1,5 @@ +ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always + import scala.concurrent.duration._ val foo = inputKey[Unit]("working task") diff --git a/sbt-app/src/sbt-test/nio/reload/changes/sub.sbt b/sbt-app/src/sbt-test/nio/reload/changes/sub.sbt index 4797974c4..2a374e9b3 100644 --- a/sbt-app/src/sbt-test/nio/reload/changes/sub.sbt +++ b/sbt-app/src/sbt-test/nio/reload/changes/sub.sbt @@ -1,3 +1,5 @@ +ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always + import scala.concurrent.duration._ libraryDependencies += "org.scala-sbt" % "sbt" % "1.3.0" diff --git a/sbt-app/src/sbt-test/nio/reload/project/plugins.sbt b/sbt-app/src/sbt-test/nio/reload/project/plugins.sbt index 99c853f12..1ed25683c 100644 --- a/sbt-app/src/sbt-test/nio/reload/project/plugins.sbt +++ b/sbt-app/src/sbt-test/nio/reload/project/plugins.sbt @@ -1,3 +1,5 @@ +ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always + libraryDependencies ++= { if (ScalafmtVersion.value == "2.0.4") { val sbtV = (sbtBinaryVersion in pluginCrossBuild).value diff --git a/sbt-app/src/sbt-test/plugins/play-watch/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/play-watch/project/plugins.sbt index 05e01d6e5..c8882f94b 100644 --- a/sbt-app/src/sbt-test/plugins/play-watch/project/plugins.sbt +++ b/sbt-app/src/sbt-test/plugins/play-watch/project/plugins.sbt @@ -1 +1,2 @@ +ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.3") \ No newline at end of file diff --git a/sbt-app/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt index 414d83d34..c3e04c903 100644 --- a/sbt-app/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt +++ b/sbt-app/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt @@ -1 +1,3 @@ +ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always + addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.20") 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 1831f255c..d0943ff9d 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.16", + scalaVersion := "2.12.17", 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 03437f9da..61199e931 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.16", + scalaVersion := "2.12.17", sbtPlugin := true, scalacOptions ++= Seq("-Xfatal-warnings", "-Xlint") ) diff --git a/sbt-app/src/sbt-test/project/source-plugins/test b/sbt-app/src/sbt-test/project/source-plugins/pending similarity index 100% rename from sbt-app/src/sbt-test/project/source-plugins/test rename to sbt-app/src/sbt-test/project/source-plugins/pending diff --git a/sbt-app/src/sbt-test/project/src-plugins/test b/sbt-app/src/sbt-test/project/src-plugins/pending similarity index 100% rename from sbt-app/src/sbt-test/project/src-plugins/test rename to sbt-app/src/sbt-test/project/src-plugins/pending diff --git a/sbt-app/src/sbt-test/project/src-plugins/project/p.sbt b/sbt-app/src/sbt-test/project/src-plugins/project/p.sbt index 8d6251248..84a62c711 100644 --- a/sbt-app/src/sbt-test/project/src-plugins/project/p.sbt +++ b/sbt-app/src/sbt-test/project/src-plugins/project/p.sbt @@ -1,2 +1,4 @@ +ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always + lazy val root = (project in file(".")). dependsOn(RootProject(file("../plugin"))) diff --git a/sbt-app/src/sbt-test/project/unified/build.sbt b/sbt-app/src/sbt-test/project/unified/build.sbt index 8210ad038..fe6b1a94a 100644 --- a/sbt-app/src/sbt-test/project/unified/build.sbt +++ b/sbt-app/src/sbt-test/project/unified/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.16" +ThisBuild / scalaVersion := "2.12.17" import sbt.internal.CommandStrings.{ inspectBrief, inspectDetailed } import sbt.internal.Inspect diff --git a/sbt-app/src/sbt-test/source-dependencies/constants/test b/sbt-app/src/sbt-test/source-dependencies/constants/test index b1e725f26..eeebe3599 100644 --- a/sbt-app/src/sbt-test/source-dependencies/constants/test +++ b/sbt-app/src/sbt-test/source-dependencies/constants/test @@ -1,4 +1,4 @@ -> ++2.12.16! +> ++2.12.17! $ copy-file changes/B.scala B.scala 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 1f8431d46..7dcf87b1e 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.16" +ThisBuild / scalaVersion := "2.12.17" 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 90f7f9f8d..9bf691e56 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.16" +ThisBuild / scalaVersion := "2.12.17" Global / serverLog / logLevel := Level.Debug // custom handler