bump: Scala 2.13.17 & 3.3.7, sbt 1.11.7 (#2083)

ennru · web-flow · commit 2032a834d381 · 2025-10-27T08:18:14.000+01:00
diff --git a/.github/workflows/link-validator.yml b/.github/workflows/link-validator.yml
@@ -26,12 +26,12 @@ jobs:
         # v6.4.5
         uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d
 
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         # https://github.com/coursier/setup-action/releases
         # v1.3.5
         uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
         with:
-          jvm: temurin:1.17
+          jvm: temurin:1.25
           apps: cs
 
       - name: sbt site
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -82,12 +82,12 @@ jobs:
           # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
           fetch-depth: 0
 
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         # https://github.com/coursier/setup-action/releases
         # v1.3.5
         uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
         with:
-          jvm: temurin:1.17
+          jvm: temurin:1.25
 
       - name: Publish
         run: |-
diff --git a/benchmark-java/build.sbt b/benchmark-java/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 enablePlugins(AkkaGrpcPlugin)
 
diff --git a/benchmark-java/project/build.properties b/benchmark-java/project/build.properties
@@ -1 +1 @@
-sbt.version=1.11.2
+sbt.version=1.11.7
diff --git 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.15"
+scalaVersion := "2.13.17"
 
 lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.10.5")
 lazy val akkaGrpcVersion = sys.props.getOrElse("akka.grpc.version", "2.5.4")
@@ -27,7 +27,7 @@ libraryDependencies ++= Seq(
   "com.typesafe.akka" %% "akka-stream" % akkaVersion,
   "com.typesafe.akka" %% "akka-discovery" % akkaVersion,
   "com.typesafe.akka" %% "akka-pki" % akkaVersion,
-  "ch.qos.logback" % "logback-classic" % "1.2.3",
+  "ch.qos.logback" % "logback-classic" % "1.5.18",
   "com.typesafe.akka" %% "akka-actor-testkit-typed" % akkaVersion % Test,
   "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion % Test,
   "org.scalatest" %% "scalatest" % "3.2.12" % Test)
diff --git a/native-image-tests/grpc-scala/project/build.properties b/native-image-tests/grpc-scala/project/build.properties
@@ -1 +1 @@
-sbt.version=1.11.2
+sbt.version=1.11.7
diff --git a/project/Common.scala b/project/Common.scala
@@ -98,12 +98,11 @@ object Common extends AutoPlugin {
         "-doc-canonical-base-url",
         "https://doc.akka.io/api/akka-grpc/current/") ++
       (if (scalaBinaryVersion.value.startsWith("3")) {
-         Seq(
-           s"-external-mappings:https://docs.oracle.com/en/java/javase/${Dependencies.JavaDocLinkVersion}/docs/api/java.base/")
+         Seq(s"-external-mappings:https://docs.oracle.com/en/java/javase/${Dependencies.JavaDocLinkVersion}/docs/api")
        } else if (isJdk17orHigher && scalaBinaryVersion.value.startsWith("2.13")) {
          Seq(
            "-jdk-api-doc-base",
-           s"https://docs.oracle.com/en/java/javase/${Dependencies.JavaDocLinkVersion}/docs/api/java.base/",
+           s"https://docs.oracle.com/en/java/javase/${Dependencies.JavaDocLinkVersion}/docs/api",
            "-skip-packages",
            "akka.pattern")
        } else {
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -7,13 +7,12 @@ import buildinfo.BuildInfo
 object Dependencies {
 
   // Java Platform version for JavaDoc creation
-  // sync with Java version in .github/workflows/release.yml#documentation
-  lazy val JavaDocLinkVersion = 17
+  lazy val JavaDocLinkVersion = scala.util.Properties.javaSpecVersion
 
   object Versions {
     val scala212 = "2.12.20"
-    val scala213 = "2.13.15"
-    val scala3 = "3.3.4"
+    val scala213 = "2.13.17"
+    val scala3 = "3.3.7"
 
     // the order in the list is important because the head will be considered the default.
     val CrossScalaForLib = Seq(scala213, scala3)
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.11.2
+sbt.version=1.11.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -20,7 +20,7 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3")
 
 // docs
-addSbtPlugin("io.akka" % "sbt-paradox-akka" % "25.10.0")
+addSbtPlugin("io.akka" % "sbt-paradox-akka" % "25.10.2")
 addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-dependencies" % "0.2.4")
 addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.3")
 addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.7.0")
diff --git a/samples/akka-grpc-quickstart-java/build.gradle b/samples/akka-grpc-quickstart-java/build.gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-  implementation 'org.scala-lang:scala-library:2.13.15'
+  implementation 'org.scala-lang:scala-library:2.13.17'
 
   implementation 'com.typesafe.akka:akka-actor-typed_2.13:2.10.5'
   implementation 'com.typesafe.akka:akka-discovery_2.13:2.10.5'
diff --git 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.15"
+scalaVersion := "2.13.17"
 
 val akkaVersion = "2.10.5"
 lazy val akkaGrpcVersion = sys.props.getOrElse("akka-grpc.version", "2.5.7")
diff --git a/samples/akka-grpc-quickstart-java/project/build.properties b/samples/akka-grpc-quickstart-java/project/build.properties
@@ -1 +1 @@
-sbt.version=1.11.2
+sbt.version=1.11.7
diff --git a/samples/akka-grpc-quickstart-scala/build.gradle b/samples/akka-grpc-quickstart-scala/build.gradle
@@ -19,14 +19,14 @@ repositories {
 }
 
 dependencies {
-  implementation 'org.scala-lang:scala-library:2.13.15'
+  implementation 'org.scala-lang:scala-library:2.13.17'
 
   implementation 'com.typesafe.akka:akka-actor-typed_2.13:2.10.5'
   implementation 'com.typesafe.akka:akka-discovery_2.13:2.10.5'
   implementation 'com.typesafe.akka:akka-stream_2.13:2.10.5'
   implementation 'com.typesafe.akka:akka-pki_2.13:2.10.5'
 
-  implementation 'ch.qos.logback:logback-classic:1.2.13'
+  implementation 'ch.qos.logback:logback-classic:1.5.18'
 
   testImplementation 'com.typesafe.akka:akka-actor-testkit-typed_2.13:2.10.5'
   testImplementation 'com.typesafe.akka:akka-stream-testkit_2.13:2.10.5'
diff --git 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.15"
+scalaVersion := "2.13.17"
 
 val akkaVersion = "2.10.5"
 lazy val akkaGrpcVersion = sys.props.getOrElse("akka-grpc.version", "2.5.7")
diff --git a/samples/akka-grpc-quickstart-scala/project/build.properties b/samples/akka-grpc-quickstart-scala/project/build.properties
@@ -1 +1 @@
-sbt.version=1.11.2
+sbt.version=1.11.7
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
diff --git a/sbt-plugin/src/sbt-test/gen-java/06-java-with-scala-handler/build.sbt b/sbt-plugin/src/sbt-test/gen-java/06-java-with-scala-handler/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
diff --git a/sbt-plugin/src/sbt-test/gen-java/07-java-blocking-with-scala-handler/build.sbt b/sbt-plugin/src/sbt-test/gen-java/07-java-blocking-with-scala-handler/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 
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
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven/github_actions")
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-scalaVersion := "2.13.15"`
	`1`	`+scalaVersion := "2.13.17"`
`2`	`2`
`3`	`3`	`enablePlugins(AkkaGrpcPlugin)`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=1.11.2`
	`1`	`+sbt.version=1.11.7`