From 1f7e1e93525de1432a5391d0bfb2e353621c8a2d Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 30 Sep 2024 09:18:43 +0200 Subject: [PATCH] bump: scala-library 2.13.15 (was 2.13.14) (#1986) --- benchmark-java/build.sbt | 2 +- native-image-tests/grpc-scala/build.sbt | 2 +- project/Dependencies.scala | 2 +- samples/akka-grpc-quickstart-java/build.sbt | 2 +- samples/akka-grpc-quickstart-scala/build.sbt | 2 +- .../src/sbt-test/gen-java/01-gen-basic-java/build.sbt | 2 +- .../src/sbt-test/gen-java/02-server-reflection/build.sbt | 2 +- .../src/sbt-test/gen-java/03-no-java-package/build.sbt | 2 +- .../src/sbt-test/gen-java/04-crash-on-keywords/build.sbt | 2 +- .../05-duplicate-messages-different-packages/build.sbt | 2 +- .../src/sbt-test/gen-scala-server/00-interop/build.sbt | 2 +- .../sbt-test/gen-scala-server/01-gen-basic-server/build.sbt | 6 +++--- .../gen-scala-server/02-multiple-services/build.sbt | 2 +- .../src/sbt-test/gen-scala-server/03-test-config/build.sbt | 2 +- .../gen-scala-server/04-server-reflection/build.sbt | 2 +- .../sbt-test/gen-scala-server/05-no-java-package/build.sbt | 2 +- .../gen-scala-server/06-compatibility-plugins/build.sbt | 2 +- .../07-gen-basic-server-with-akka-27/build.sbt | 6 +++--- .../gen-scala-server/09-scalapb-customizations/build.sbt | 2 +- .../sbt-test/gen-scala-server/10-scalapb-validate/build.sbt | 2 +- .../11-duplicate-messages-different-packages/build.sbt | 2 +- .../sbt-test/scala-2_13/01-basic-client-server/build.sbt | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) diff --git a/benchmark-java/build.sbt b/benchmark-java/build.sbt index b3ac58523..4ed8a28da 100644 --- a/benchmark-java/build.sbt +++ b/benchmark-java/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" enablePlugins(AkkaGrpcPlugin) diff --git a/native-image-tests/grpc-scala/build.sbt b/native-image-tests/grpc-scala/build.sbt index c30396c08..823680a6a 100644 --- a/native-image-tests/grpc-scala/build.sbt +++ b/native-image-tests/grpc-scala/build.sbt @@ -2,7 +2,7 @@ name := "grpc-scala" version := "1.0" -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.10.0-M1") lazy val akkaGrpcVersion = sys.props.getOrElse("akka.grpc.version", "2.4.0") diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 4fe25e53f..b6748a590 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,7 +12,7 @@ object Dependencies { object Versions { val scala212 = "2.12.19" - val scala213 = "2.13.14" + val scala213 = "2.13.15" val scala3 = "3.3.3" // the order in the list is important because the head will be considered the default. diff --git a/samples/akka-grpc-quickstart-java/build.sbt b/samples/akka-grpc-quickstart-java/build.sbt index d2ed7af14..611e7af53 100644 --- a/samples/akka-grpc-quickstart-java/build.sbt +++ b/samples/akka-grpc-quickstart-java/build.sbt @@ -1,6 +1,6 @@ name := "akka-grpc-quickstart-java" version := "1.0" -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" val akkaVersion = "2.10.0-M1" lazy val akkaGrpcVersion = sys.props.getOrElse("akka-grpc.version", "2.4.3") diff --git a/samples/akka-grpc-quickstart-scala/build.sbt b/samples/akka-grpc-quickstart-scala/build.sbt index 75291983a..f1591d620 100644 --- a/samples/akka-grpc-quickstart-scala/build.sbt +++ b/samples/akka-grpc-quickstart-scala/build.sbt @@ -1,7 +1,7 @@ name := "akka-grpc-quickstart-scala" version := "1.0" -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" val akkaVersion = "2.10.0-M1" lazy val akkaGrpcVersion = sys.props.getOrElse("akka-grpc.version", "2.4.3") 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 c6e894624..148af6dd9 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.14" +scalaVersion := "2.13.15" 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 1b41a294e..41a8f5060 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.14" +scalaVersion := "2.13.15" 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 1b41a294e..41a8f5060 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.14" +scalaVersion := "2.13.15" 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 c6e894624..148af6dd9 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.14" +scalaVersion := "2.13.15" 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 1b41a294e..41a8f5060 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.14" +scalaVersion := "2.13.15" 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 c26c06c29..2a94c06de 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.14" +scalaVersion := "2.13.15" 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 ad13d1510..b7335c936 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.14" +scalaVersion := "2.13.15" resolvers += "Akka library repository".at("https://repo.akka.io/maven") @@ -8,8 +8,8 @@ enablePlugins(AkkaGrpcPlugin) assembly / assemblyMergeStrategy := { // https://github.com/akka/akka/issues/29456 - case PathList("google", "protobuf", _) => MergeStrategy.discard - case PathList("google", "protobuf", _, _) => MergeStrategy.discard + case PathList("google", "protobuf", _) => MergeStrategy.discard + case PathList("google", "protobuf", _, _) => MergeStrategy.discard case "META-INF/versions/9/module-info.class" => MergeStrategy.discard case x => val oldStrategy = (assemblyMergeStrategy in assembly).value 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 55d121b72..8cc30743b 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.14" +scalaVersion := "2.13.15" 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 166a2df6a..afc5337fc 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.14" +scalaVersion := "2.13.15" 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 55d121b72..8cc30743b 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.14" +scalaVersion := "2.13.15" 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 55d121b72..8cc30743b 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.14" +scalaVersion := "2.13.15" 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 4df77b8d0..0fead1306 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.14" +scalaVersion := "2.13.15" 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 6cfdc23d6..a546b46ef 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.14" +scalaVersion := "2.13.15" resolvers += "Akka library repository".at("https://repo.akka.io/maven") @@ -8,8 +8,8 @@ dependencyOverrides += "com.typesafe.akka" %% "akka-stream" % "2.10.0-M1" assembly / assemblyMergeStrategy := { // https://github.com/akka/akka/issues/29456 - case PathList("google", "protobuf", _) => MergeStrategy.discard - case PathList("google", "protobuf", _, _) => MergeStrategy.discard + case PathList("google", "protobuf", _) => MergeStrategy.discard + case PathList("google", "protobuf", _, _) => MergeStrategy.discard case "META-INF/versions/9/module-info.class" => MergeStrategy.discard case x => val oldStrategy = (assembly / assemblyMergeStrategy).value 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 0942257d6..25ed511c7 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.14" +scalaVersion := "2.13.15" 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 32936372d..ff5f0c294 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.14" +scalaVersion := "2.13.15" 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 55d121b72..8cc30743b 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.14" +scalaVersion := "2.13.15" 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 077784cc5..06cc926d7 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.14" +scalaVersion := "2.13.15" resolvers += "Akka library repository".at("https://repo.akka.io/maven")