Skip to content

Commit

Permalink
Scala 2.12.17
Browse files Browse the repository at this point in the history
This bumps up scala-xml to 2.x.
  • Loading branch information
eed3si9n committed Sep 17, 2022
1 parent f3b9218 commit 88e3a0a
Show file tree
Hide file tree
Showing 23 changed files with 32 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion main/src/main/scala/sbt/PluginCross.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
2 changes: 1 addition & 1 deletion main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 2 additions & 0 deletions sbt-app/src/sbt-test/actions/compile-time-only/build.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always

libraryDependencies += "org.scala-sbt" % "sbt" % sbtVersion.value


Expand Down
2 changes: 1 addition & 1 deletion sbt-app/src/sbt-test/actions/cross-advanced/build.sbt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion sbt-app/src/sbt-test/actions/cross-advanced/test
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
)
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sbt-app/src/sbt-test/compiler-project/run-test/build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.16"
ThisBuild / scalaVersion := "2.12.17"

libraryDependencies ++= Seq(
"com.novocode" % "junit-interface" % "0.5" % Test,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.16"
ThisBuild / scalaVersion := "2.12.17"

libraryDependencies ++= Seq(
"org.slf4j" % "slf4j-api" % "1.7.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 2 additions & 0 deletions sbt-app/src/sbt-test/nio/reload/build.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always

import scala.concurrent.duration._

val foo = inputKey[Unit]("working task")
Expand Down
2 changes: 2 additions & 0 deletions sbt-app/src/sbt-test/nio/reload/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.3")
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always

addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.20")
2 changes: 1 addition & 1 deletion sbt-app/src/sbt-test/project/sbt-plugin/build.sbt
Original file line number Diff line number Diff line change
@@ -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")
)
Original file line number Diff line number Diff line change
@@ -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")
)
2 changes: 1 addition & 1 deletion sbt-app/src/sbt-test/project/unified/build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.16"
ThisBuild / scalaVersion := "2.12.17"

import sbt.internal.CommandStrings.{ inspectBrief, inspectDetailed }
import sbt.internal.Inspect
Expand Down
2 changes: 1 addition & 1 deletion sbt-app/src/sbt-test/source-dependencies/constants/test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
> ++2.12.16!
> ++2.12.17!

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion server-test/src/server-test/response/build.sbt
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 88e3a0a

Please sign in to comment.