From c0fb493ba9a5ec6f5a62dc1d662a1eb249967304 Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Fri, 28 May 2021 17:48:58 +0200
Subject: [PATCH] Scala 2.12.14 / 2.13.6

---
 .../zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala | 2 +-
 project/Dependencies.scala                                  | 4 ++--
 zinc/src/sbt-test/macros/macro-arg-dep-nested/build.json    | 4 ++--
 .../sbt-test/macros/macro-arg-dep-stackoverflow/build.json  | 4 ++--
 zinc/src/sbt-test/macros/macro-arg-dep/build.json           | 4 ++--
 zinc/src/sbt-test/macros/macro/build.json                   | 4 ++--
 .../sbt-test/source-dependencies/java-class-invs/build.json | 6 +++---
 .../source-dependencies/subproject-api-update/build.json    | 4 ++--
 .../sbt-test/source-dependencies/subproject-java/build.json | 4 ++--
 .../subproject-pipelining-mixed/build.json                  | 4 ++--
 .../subproject-pipelining-noclobber/build.json              | 4 ++--
 .../subproject-pipelining-optout/build.json                 | 4 ++--
 .../source-dependencies/subproject-pipelining/build.json    | 4 ++--
 .../sbt-test/source-dependencies/trait-trait-212/build.json | 2 +-
 14 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala
index 448eac16c0..0a9612ba97 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.5"
+  val scalaVersion = "2.13.6"
 
   /* ************************************************************* */
   /* Utils to programmatically instantiate Compiler from sbt setup  */
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 58355f301a..01d7098b4e 100644
--- 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
index 7fc7cee42f..cd9cda76f6 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.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "macro-provider",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
\ 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 7fc7cee42f..cd9cda76f6 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.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "macro-provider",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
\ 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 7fc7cee42f..cd9cda76f6 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.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "macro-provider",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
\ 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 7fc7cee42f..cd9cda76f6 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.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "macro-provider",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
\ 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 bd9ee1bb28..bf2d8b919d 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.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"
     }
   ]
 }
\ 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 f06a6abd2f..4c224a35cc 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.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "core",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
\ 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 fbaa65a6d3..ded32550de 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.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "dep",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
\ 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 fbaa65a6d3..ded32550de 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.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "dep",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
\ 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 fbaa65a6d3..ded32550de 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.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "dep",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
\ 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 fbaa65a6d3..ded32550de 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.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "dep",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
\ 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 fbaa65a6d3..ded32550de 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.5"
+      "scalaVersion": "2.13.6"
     },
     {
       "name": "dep",
-      "scalaVersion": "2.13.5"
+      "scalaVersion": "2.13.6"
     }
   ]
 }
\ No newline at end of file
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
index 66087f6e37..80c36d2987 100644
--- 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"
     }
   ]
 }
\ No newline at end of file