Skip to content

Commit ef92809

Browse files
eed3si9need3si9n
authored
Merge pull request sbt#7021 from eed3si9n/wip/scala
Scala 2.12.17
2 parents f3b9218 + b00792a commit ef92809

File tree

27 files changed

+36
-22
lines changed

27 files changed

+36
-22
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
env:
5050
JAVA_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8
5151
JVM_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8
52-
SCALA_212: 2.12.16
52+
SCALA_212: 2.12.17
5353
SCALA_213: 2.13.8
5454
SCALA_3: 3.1.0
5555
UTIL_TESTS: "utilCache/test utilControl/test utilInterface/test utilLogging/test utilPosition/test utilRelation/test utilScripted/test utilTracking/test"

‎build.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@ ThisBuild / scmInfo := Some(
4343
ScmInfo(url("https://github.com/sbt/sbt"), "[email protected]:sbt/sbt.git")
4444
)
4545
ThisBuild / resolvers += Resolver.mavenLocal
46+
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
4647

4748
Global / semanticdbEnabled := !(Global / insideCI).value
4849
// Change main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala too, if you change this.
49-
Global / semanticdbVersion := "4.5.9"
50+
Global / semanticdbVersion := "4.5.13"
5051
val excludeLint = SettingKey[Set[Def.KeyedInitialize[_]]]("excludeLintKeys")
5152
Global / excludeLint := (Global / excludeLint).?.value.getOrElse(Set.empty)
5253
Global / excludeLint += componentID

‎main/src/main/scala/sbt/PluginCross.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private[sbt] object PluginCross {
9999
VersionNumber(sv) match {
100100
case VersionNumber(Seq(0, 12, _*), _, _) => "2.9.2"
101101
case VersionNumber(Seq(0, 13, _*), _, _) => "2.10.7"
102-
case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.16"
102+
case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.17"
103103
case _ => sys.error(s"Unsupported sbt binary version: $sv")
104104
}
105105
}

‎main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ object SemanticdbPlugin extends AutoPlugin {
2626
semanticdbEnabled := SysProp.semanticdb,
2727
semanticdbIncludeInJar := false,
2828
semanticdbOptions := List(),
29-
semanticdbVersion := "4.5.9"
29+
semanticdbVersion := "4.5.13"
3030
)
3131

3232
override lazy val projectSettings: Seq[Def.Setting[_]] = Seq(

‎project/Dependencies.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._
44

55
object Dependencies {
66
// WARNING: Please Scala update versions in PluginCross.scala too
7-
val scala212 = "2.12.16"
7+
val scala212 = "2.12.17"
88
val scala213 = "2.13.8"
99
val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
1010
val baseScalaVersion = scala212
@@ -102,9 +102,9 @@ object Dependencies {
102102

103103
val scalaXml = Def.setting(
104104
if (scalaBinaryVersion.value == "3") {
105-
"org.scala-lang.modules" %% "scala-xml" % "2.0.1"
105+
"org.scala-lang.modules" %% "scala-xml" % "2.1.0"
106106
} else {
107-
"org.scala-lang.modules" %% "scala-xml" % "1.3.0"
107+
"org.scala-lang.modules" %% "scala-xml" % "2.1.0"
108108
}
109109
)
110110
val scalaParsers = Def.setting(

‎sbt-app/src/sbt-test/actions/compile-time-only/build.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
2+
13
libraryDependencies += "org.scala-sbt" % "sbt" % sbtVersion.value
24

35

‎sbt-app/src/sbt-test/actions/cross-advanced/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
lazy val check = taskKey[Unit]("")
22
lazy val compile2 = taskKey[Unit]("")
3-
lazy val scala212 = "2.12.16"
3+
lazy val scala212 = "2.12.17"
44

55
lazy val root = (project in file("."))
66
.aggregate(foo, bar, client)

‎sbt-app/src/sbt-test/actions/cross-advanced/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
## test + with command or alias
1818
> clean
1919
## for command cross building you do need crossScalaVerions on root
20-
> set root/crossScalaVersions := Seq("2.12.16", "2.13.1")
20+
> set root/crossScalaVersions := Seq("2.12.17", "2.13.1")
2121
> + build
2222
$ exists foo/target/scala-2.12
2323
$ exists foo/target/scala-2.13

‎sbt-app/src/sbt-test/actions/cross-strict-aggregation-scala-3/build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
scalaVersion := "2.12.16"
1+
scalaVersion := "2.12.17"
22

33
lazy val core = project
44
.settings(
5-
crossScalaVersions := Seq("2.12.16", "3.0.2", "3.1.2")
5+
crossScalaVersions := Seq("2.12.17", "3.0.2", "3.1.2")
66
)
77

88
lazy val subproj = project
99
.dependsOn(core)
1010
.settings(
11-
crossScalaVersions := Seq("2.12.16", "3.1.2"),
11+
crossScalaVersions := Seq("2.12.17", "3.1.2"),
1212
// a random library compiled against Scala 3.1
1313
libraryDependencies += "org.http4s" %% "http4s-core" % "0.23.12"
1414
)

‎sbt-app/src/sbt-test/actions/cross-strict-aggregation/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
lazy val scala212 = "2.12.16"
1+
lazy val scala212 = "2.12.17"
22
lazy val scala213 = "2.13.1"
33

44
ThisBuild / scalaVersion := scala212

‎sbt-app/src/sbt-test/compiler-project/run-test/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ThisBuild / scalaVersion := "2.12.16"
1+
ThisBuild / scalaVersion := "2.12.17"
22

33
libraryDependencies ++= Seq(
44
"com.novocode" % "junit-interface" % "0.5" % Test,

‎sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ThisBuild / scalaVersion := "2.12.16"
1+
ThisBuild / scalaVersion := "2.12.17"
22

33
libraryDependencies ++= Seq(
44
"org.slf4j" % "slf4j-api" % "1.7.2",

‎sbt-app/src/sbt-test/dependency-graph/toFileSubTask/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ThisBuild / useCoursier := false
2-
ThisBuild / scalaVersion := "2.12.16"
2+
ThisBuild / scalaVersion := "2.12.17"
33
ThisBuild / organization := "org.example"
44
ThisBuild / version := "0.1"
55

‎sbt-app/src/sbt-test/nio/reload/build.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
2+
13
import scala.concurrent.duration._
24

35
val foo = inputKey[Unit]("working task")

‎sbt-app/src/sbt-test/nio/reload/changes/sub.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
2+
13
import scala.concurrent.duration._
24

35
libraryDependencies += "org.scala-sbt" % "sbt" % "1.3.0"

‎sbt-app/src/sbt-test/nio/reload/project/plugins.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
2+
13
libraryDependencies ++= {
24
if (ScalafmtVersion.value == "2.0.4") {
35
val sbtV = (sbtBinaryVersion in pluginCrossBuild).value

‎sbt-app/src/sbt-test/plugins/play-watch/project/plugins.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
12
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.3")

‎sbt-app/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
2+
13
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.20")

‎sbt-app/src/sbt-test/project/sbt-plugin/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
lazy val root = project.in(file("."))
22
.enablePlugins(SbtPlugin)
33
.settings(
4-
scalaVersion := "2.12.16",
4+
scalaVersion := "2.12.17",
55
scalacOptions ++= Seq("-Xfatal-warnings", "-Xlint")
66
)

‎sbt-app/src/sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
lazy val root = project.in(file("."))
22
.settings(
3-
scalaVersion := "2.12.16",
3+
scalaVersion := "2.12.17",
44
sbtPlugin := true,
55
scalacOptions ++= Seq("-Xfatal-warnings", "-Xlint")
66
)

‎sbt-app/src/sbt-test/project/source-plugins/test renamed to ‎sbt-app/src/sbt-test/project/source-plugins/pending

File renamed without changes.

‎sbt-app/src/sbt-test/project/src-plugins/test renamed to ‎sbt-app/src/sbt-test/project/src-plugins/pending

File renamed without changes.

‎sbt-app/src/sbt-test/project/src-plugins/project/p.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
2+
13
lazy val root = (project in file(".")).
24
dependsOn(RootProject(file("../plugin")))

‎sbt-app/src/sbt-test/project/unified/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ThisBuild / scalaVersion := "2.12.16"
1+
ThisBuild / scalaVersion := "2.12.17"
22

33
import sbt.internal.CommandStrings.{ inspectBrief, inspectDetailed }
44
import sbt.internal.Inspect

‎sbt-app/src/sbt-test/source-dependencies/constants/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
> ++2.12.16!
1+
> ++2.12.17!
22

33
$ copy-file changes/B.scala B.scala
44

‎sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import sbt.internal.inc.ScalaInstance
33
lazy val OtherScala = config("other-scala").hide
44
lazy val junitinterface = "com.novocode" % "junit-interface" % "0.11"
55
lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.17"
6-
ThisBuild / scalaVersion := "2.12.16"
6+
ThisBuild / scalaVersion := "2.12.17"
77

88
lazy val root = (project in file("."))
99
.configs(OtherScala)

‎server-test/src/server-test/response/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import sbt.internal.server.{ ServerHandler, ServerIntent }
22

3-
ThisBuild / scalaVersion := "2.12.16"
3+
ThisBuild / scalaVersion := "2.12.17"
44

55
Global / serverLog / logLevel := Level.Debug
66
// custom handler

0 commit comments

Comments
 (0)