Merge pull request #6917 from eed3si9n/wip/bump-scala

[1.7.x] Bump to Scala 2.12.16

.github/workflows/ci.yml

@@ -49,8 +49,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.15
-      SCALA_213: 2.13.6
+      SCALA_212: 2.12.16
+      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"
       SBT_LOCAL: false

build.sbt

@@ -46,7 +46,7 @@ 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.5.4"
+Global / semanticdbVersion := "4.5.9"
 val excludeLint = SettingKey[Set[Def.KeyedInitialize[_]]]("excludeLintKeys")
 Global / excludeLint := (Global / excludeLint).?.value.getOrElse(Set.empty)
 Global / excludeLint += componentID

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.15"
+      case VersionNumber(Seq(1, 0, _*), _, _)  => "2.12.16"
       case _                                   => sys.error(s"Unsupported sbt binary version: $sv")
     }
 }

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.4"
+    semanticdbVersion := "4.5.9"
   )
 
   override lazy val projectSettings: Seq[Def.Setting[_]] = Seq(

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.15"
-  val scala213 = "2.13.6"
+  val scala212 = "2.12.16"
+  val scala213 = "2.13.8"
   val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
   val baseScalaVersion = scala212
   def nightlyVersion: Option[String] =

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.4
+sbt.version=1.6.2

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.15"
+lazy val scala212 = "2.12.16"
 
 lazy val root = (project in file("."))
   .aggregate(foo, bar, client)

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.15", "2.13.1")
+> set root/crossScalaVersions := Seq("2.12.16", "2.13.1")
 > + build
 $ exists foo/target/scala-2.12
 $ exists foo/target/scala-2.13

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

@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / scalaVersion := "2.12.16"
 
 libraryDependencies ++= Seq(
 	"com.novocode" % "junit-interface" % "0.5" % Test,

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

@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / scalaVersion := "2.12.16"
 
 libraryDependencies ++= Seq(
   "org.slf4j" % "slf4j-api" % "1.7.2",

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

@@ -1,5 +1,5 @@
 // ThisBuild / useCoursier := false
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / scalaVersion := "2.12.16"
 ThisBuild / organization := "org.example"
 ThisBuild / version := "0.1"
 

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.15",
+    scalaVersion := "2.12.16",
     scalacOptions ++= Seq("-Xfatal-warnings", "-Xlint")
   )

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.15",
+    scalaVersion := "2.12.16",
     sbtPlugin := true,
     scalacOptions ++= Seq("-Xfatal-warnings", "-Xlint")
   )

sbt-app/src/sbt-test/project/semanticdb/build.sbt

@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / scalaVersion := "2.12.16"
 ThisBuild / semanticdbEnabled := true
 ThisBuild / semanticdbIncludeInJar := true
 

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

@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / scalaVersion := "2.12.16"
 
 import sbt.internal.CommandStrings.{ inspectBrief, inspectDetailed }
 import sbt.internal.Inspect

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

@@ -1,4 +1,4 @@
-> ++2.12.15!
+> ++2.12.16!
 
 $ copy-file changes/B.scala B.scala
 

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.15"
+ThisBuild / scalaVersion := "2.12.16"
 
 lazy val root = (project in file("."))
   .configs(OtherScala)

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

@@ -1,6 +1,6 @@
 import sbt.internal.server.{ ServerHandler, ServerIntent }
 
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / scalaVersion := "2.12.16"
 
 Global / serverLog / logLevel := Level.Debug
 // custom handler