diff --git a/internal/compiler-bridge-test/src/test/scala/sbt/internal/inc/CompilingSpecification.scala b/internal/compiler-bridge-test/src/test/scala/sbt/internal/inc/CompilingSpecification.scala index cf93ae51a..fa420b77a 100644 --- a/internal/compiler-bridge-test/src/test/scala/sbt/internal/inc/CompilingSpecification.scala +++ b/internal/compiler-bridge-test/src/test/scala/sbt/internal/inc/CompilingSpecification.scala @@ -35,7 +35,7 @@ trait CompilingSpecification extends AbstractBridgeProviderTestkit { .get("zinc.build.compilerbridge.scalaVersion") .getOrElse(sys.error("zinc.build.compilerbridge.scalaVersion property not found")) def maxErrors = 100 - def scala213 = "2.13.11" + def scala213 = "2.13.12" def scalaCompiler(instance: xsbti.compile.ScalaInstance, bridgeJar: Path): AnalyzingCompiler = { val bridgeProvider = ZincUtil.constantBridgeProvider(instance, bridgeJar) diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala index 7b2df1ea3..bcec367d2 100644 --- a/internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala +++ b/internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala @@ -106,7 +106,7 @@ private[xsbt] class ZincBenchmark(toCompile: BenchmarkProject, zincEnabled: Bool private[xsbt] object ZincBenchmark { // This is the Scala version used to compile the benchmark project // do not use `scala.util.Properties.versionNumberString`. - val scalaVersion = "2.13.11" + val scalaVersion = "2.13.12" /* ************************************************************* */ /* Utils to programmatically instantiate Compiler from sbt setup */ diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 55b0f418a..c718e3003 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,7 +8,7 @@ object Dependencies { val scala210 = "2.10.7" val scala211 = "2.11.12" val scala212 = "2.12.18" - val scala213 = "2.13.11" + val scala213 = "2.13.12" val defaultScalaVersion = scala212 val allScalaVersions = Seq(defaultScalaVersion, scala210, scala211, scala213) val scala212_213 = Seq(defaultScalaVersion, scala213) diff --git a/zinc/src/sbt-test/macros/macro-arg-dep-nested/build.json b/zinc/src/sbt-test/macros/macro-arg-dep-nested/build.json index f7c4caec5..117fe9789 100644 --- a/zinc/src/sbt-test/macros/macro-arg-dep-nested/build.json +++ b/zinc/src/sbt-test/macros/macro-arg-dep-nested/build.json @@ -5,11 +5,11 @@ "dependsOn": [ "macro-provider" ], - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" }, { "name": "macro-provider", - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" } ] } \ No newline at end of file diff --git a/zinc/src/sbt-test/macros/macro-arg-dep-stackoverflow/build.json b/zinc/src/sbt-test/macros/macro-arg-dep-stackoverflow/build.json index f7c4caec5..117fe9789 100644 --- a/zinc/src/sbt-test/macros/macro-arg-dep-stackoverflow/build.json +++ b/zinc/src/sbt-test/macros/macro-arg-dep-stackoverflow/build.json @@ -5,11 +5,11 @@ "dependsOn": [ "macro-provider" ], - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" }, { "name": "macro-provider", - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" } ] } \ No newline at end of file diff --git a/zinc/src/sbt-test/macros/macro-arg-dep/build.json b/zinc/src/sbt-test/macros/macro-arg-dep/build.json index f7c4caec5..117fe9789 100644 --- a/zinc/src/sbt-test/macros/macro-arg-dep/build.json +++ b/zinc/src/sbt-test/macros/macro-arg-dep/build.json @@ -5,11 +5,11 @@ "dependsOn": [ "macro-provider" ], - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" }, { "name": "macro-provider", - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" } ] } \ No newline at end of file diff --git a/zinc/src/sbt-test/macros/macro/build.json b/zinc/src/sbt-test/macros/macro/build.json index f7c4caec5..117fe9789 100644 --- a/zinc/src/sbt-test/macros/macro/build.json +++ b/zinc/src/sbt-test/macros/macro/build.json @@ -5,11 +5,11 @@ "dependsOn": [ "macro-provider" ], - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" }, { "name": "macro-provider", - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" } ] } \ No newline at end of file diff --git a/zinc/src/sbt-test/source-dependencies/java-class-invs/build.json b/zinc/src/sbt-test/source-dependencies/java-class-invs/build.json index c100349a8..0ec200258 100644 --- a/zinc/src/sbt-test/source-dependencies/java-class-invs/build.json +++ b/zinc/src/sbt-test/source-dependencies/java-class-invs/build.json @@ -6,18 +6,18 @@ "std", "lib" ], - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" }, { "name": "lib", "dependsOn": [ "std" ], - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" }, { "name": "std", - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" } ] } \ No newline at end of file diff --git a/zinc/src/sbt-test/source-dependencies/subproject-api-update/build.json b/zinc/src/sbt-test/source-dependencies/subproject-api-update/build.json index a91bb5739..d84eda166 100644 --- a/zinc/src/sbt-test/source-dependencies/subproject-api-update/build.json +++ b/zinc/src/sbt-test/source-dependencies/subproject-api-update/build.json @@ -5,11 +5,11 @@ "dependsOn": [ "core" ], - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" }, { "name": "core", - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" } ] } \ No newline at end of file diff --git a/zinc/src/sbt-test/source-dependencies/subproject-java/build.json b/zinc/src/sbt-test/source-dependencies/subproject-java/build.json index 34231e212..241afe32b 100644 --- a/zinc/src/sbt-test/source-dependencies/subproject-java/build.json +++ b/zinc/src/sbt-test/source-dependencies/subproject-java/build.json @@ -5,11 +5,11 @@ "dependsOn": [ "dep" ], - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" }, { "name": "dep", - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" } ] } \ No newline at end of file diff --git a/zinc/src/sbt-test/source-dependencies/subproject-pipelining-mixed/build.json b/zinc/src/sbt-test/source-dependencies/subproject-pipelining-mixed/build.json index 34231e212..241afe32b 100644 --- a/zinc/src/sbt-test/source-dependencies/subproject-pipelining-mixed/build.json +++ b/zinc/src/sbt-test/source-dependencies/subproject-pipelining-mixed/build.json @@ -5,11 +5,11 @@ "dependsOn": [ "dep" ], - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" }, { "name": "dep", - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" } ] } \ No newline at end of file diff --git a/zinc/src/sbt-test/source-dependencies/subproject-pipelining-noclobber/build.json b/zinc/src/sbt-test/source-dependencies/subproject-pipelining-noclobber/build.json index 34231e212..241afe32b 100644 --- a/zinc/src/sbt-test/source-dependencies/subproject-pipelining-noclobber/build.json +++ b/zinc/src/sbt-test/source-dependencies/subproject-pipelining-noclobber/build.json @@ -5,11 +5,11 @@ "dependsOn": [ "dep" ], - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" }, { "name": "dep", - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" } ] } \ No newline at end of file diff --git a/zinc/src/sbt-test/source-dependencies/subproject-pipelining-optout/build.json b/zinc/src/sbt-test/source-dependencies/subproject-pipelining-optout/build.json index 34231e212..241afe32b 100644 --- a/zinc/src/sbt-test/source-dependencies/subproject-pipelining-optout/build.json +++ b/zinc/src/sbt-test/source-dependencies/subproject-pipelining-optout/build.json @@ -5,11 +5,11 @@ "dependsOn": [ "dep" ], - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" }, { "name": "dep", - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" } ] } \ No newline at end of file diff --git a/zinc/src/sbt-test/source-dependencies/subproject-pipelining/build.json b/zinc/src/sbt-test/source-dependencies/subproject-pipelining/build.json index 34231e212..241afe32b 100644 --- a/zinc/src/sbt-test/source-dependencies/subproject-pipelining/build.json +++ b/zinc/src/sbt-test/source-dependencies/subproject-pipelining/build.json @@ -5,11 +5,11 @@ "dependsOn": [ "dep" ], - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" }, { "name": "dep", - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" } ] } \ No newline at end of file diff --git a/zinc/src/sbt-test/source-dependencies/trait-local-change/build.json b/zinc/src/sbt-test/source-dependencies/trait-local-change/build.json index f7aa92ff5..7e7fd9a4c 100644 --- a/zinc/src/sbt-test/source-dependencies/trait-local-change/build.json +++ b/zinc/src/sbt-test/source-dependencies/trait-local-change/build.json @@ -2,7 +2,7 @@ "projects": [ { "name": "pro", - "scalaVersion": "2.13.11" + "scalaVersion": "2.13.12" } ] }