From c3e3a86fc068b79f799a7fe88ff83f1316f2cc9d Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 17 Oct 2023 17:58:35 +0200 Subject: [PATCH] bump: Scala 2.13.12 (#1859) --- benchmark-java/build.sbt | 2 +- project/Dependencies.scala | 2 +- sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt | 2 +- sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt | 2 +- sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt | 2 +- sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt | 2 +- .../gen-java/05-duplicate-messages-different-packages/build.sbt | 2 +- sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt | 2 +- .../src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt | 2 +- .../sbt-test/gen-scala-server/02-multiple-services/build.sbt | 2 +- .../src/sbt-test/gen-scala-server/03-test-config/build.sbt | 2 +- .../sbt-test/gen-scala-server/04-server-reflection/build.sbt | 2 +- .../src/sbt-test/gen-scala-server/05-no-java-package/build.sbt | 2 +- .../gen-scala-server/06-compatibility-plugins/build.sbt | 2 +- .../gen-scala-server/07-gen-basic-server-with-akka-27/build.sbt | 2 +- .../gen-scala-server/09-scalapb-customizations/build.sbt | 2 +- .../src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt | 2 +- .../11-duplicate-messages-different-packages/build.sbt | 2 +- .../src/sbt-test/scala-2_13/01-basic-client-server/build.sbt | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/benchmark-java/build.sbt b/benchmark-java/build.sbt index b1fc8d0a8..ab30b4c5a 100644 --- a/benchmark-java/build.sbt +++ b/benchmark-java/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" enablePlugins(AkkaGrpcPlugin) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d6d61c323..5a84ed82d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,7 +7,7 @@ import buildinfo.BuildInfo object Dependencies { object Versions { val scala212 = "2.12.18" - val scala213 = "2.13.11" + val scala213 = "2.13.12" val scala3 = "3.3.1" // the order in the list is important because the head will be considered the default. diff --git a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt index f7cdca78f..160a9e6c5 100644 --- a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt index 87faaac62..33f76943f 100644 --- a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt index 87faaac62..33f76943f 100644 --- a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt index f7cdca78f..160a9e6c5 100644 --- a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt index 87faaac62..33f76943f 100644 --- a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt index 0964115c4..1593fbf07 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt index da5108779..a31750eb1 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt index 89a930afa..d7f984f26 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt index 2f75213df..cbd96fdd6 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt index 89a930afa..d7f984f26 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt index 89a930afa..d7f984f26 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt index e43cc14ac..56a78f470 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/build.sbt index 9f924dd1a..e4e44e4dc 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt index e149daa4a..19b8376d9 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt index 5dcd0a4f5..49cf3cef2 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt index 89a930afa..d7f984f26 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven") diff --git a/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/build.sbt b/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/build.sbt index b270113ab..ad0d8a14e 100644 --- a/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/build.sbt +++ b/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.11" +scalaVersion := "2.13.12" resolvers += "Akka library repository".at("https://repo.akka.io/maven")