Merge pull request #980 from mkurz/scala_upgrades

Scala 2.12.14 / 2.13.6
sbt · May 31, 2021 · 4250dd7 · 4250dd7
2 parents bff96c7 + c0fb493
commit 4250dd7
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 27 deletions.
diff --git 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.5"
+  val scalaVersion = "2.13.6"
 
   /* ************************************************************* */
   /* Utils to programmatically instantiate Compiler from sbt setup  */

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -7,8 +7,8 @@ object Dependencies {
 
   val scala210 = "2.10.7"
   val scala211 = "2.11.12"
-  val scala212 = "2.12.13"
-  val scala213 = "2.13.5"
+  val scala212 = "2.12.14"
+  val scala213 = "2.13.6"
   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
@@ -5,11 +5,11 @@
       "dependsOn": [
         "macro-provider"
       ],
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "macro-provider",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
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
@@ -5,11 +5,11 @@
       "dependsOn": [
         "macro-provider"
       ],
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "macro-provider",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
diff --git 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.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "macro-provider",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
diff --git 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.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "macro-provider",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
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
@@ -6,18 +6,18 @@
         "std",
         "lib"
       ],
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "lib",
       "dependsOn": [
         "std"
       ],
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "std",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
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
@@ -5,11 +5,11 @@
       "dependsOn": [
         "core"
       ],
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "core",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
diff --git 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.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "dep",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
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
@@ -5,11 +5,11 @@
       "dependsOn": [
         "dep"
       ],
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "dep",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
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
@@ -5,11 +5,11 @@
       "dependsOn": [
         "dep"
       ],
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "dep",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
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
@@ -5,11 +5,11 @@
       "dependsOn": [
         "dep"
       ],
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "dep",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
diff --git 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.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "dep",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
diff --git a/zinc/src/sbt-test/source-dependencies/trait-trait-212/build.json b/zinc/src/sbt-test/source-dependencies/trait-trait-212/build.json
@@ -2,7 +2,7 @@
   "projects": [
     {
       "name": "mirtest",
-      "scalaVersion": "2.12.13"
+      "scalaVersion": "2.12.14"
     }
   ]
 }