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

Author: ennru

.github/workflows/link-validator.yml

@@ -31,12 +31,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

.github/workflows/publish.yml

@@ -68,12 +68,12 @@ jobs:
           fetch-depth: 0
           fetch-tags: true
 
-      - name: Set up JDK 11
+      - name: Set up JDK 25
         # https://github.com/coursier/setup-action/releases
         # v1.3.5
         uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
         with:
-          jvm: temurin:1.11
+          jvm: temurin:1.25
 
       - name: Publish
         run: |-

build.sbt

@@ -377,9 +377,6 @@ lazy val unixdomainsocket =
 
 lazy val xml = alpakkaProject("xml", "xml", Dependencies.Xml, Scala3.settings)
 
-// Java Platform version for JavaDoc creation
-val JavaDocLinkVersion = "11"
-
 lazy val docs = project
   .enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin, SitePreviewPlugin, PreprocessPlugin, PublishRsyncPlugin)
   .disablePlugins(MimaPlugin)
@@ -391,20 +388,6 @@ lazy val docs = project
     Preprocess / siteSubdirName := s"api/alpakka/${projectInfoVersion.value}",
     Preprocess / sourceDirectory := (LocalRootProject / ScalaUnidoc / unidoc / target).value,
     Preprocess / preprocessRules := Seq(
-        // Java Platform Module System splits
-        // java.*
-        ((s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java/sql/").r,
-         _ => s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java\\.sql/java/sql/"),
-        ((s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java/").r,
-         _ => s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java\\.base/java/"),
-        // javax.*
-        ((s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/javax/net/").r,
-         _ => s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java\\.base/javax/net/"),
-        ((s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/javax/xml/").r,
-         _ => s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java\\.xml/javax/xml/"),
-        // org.w3c.*
-        ((s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/org/w3c/").r,
-         _ => s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java\\.xml/org/w3c/"),
         // package duplication errors
         ((s"https://doc\\.akka\\.io/api/akka-grpc/${akka.grpc.gen.BuildInfo.version}/akka/grpc/akka/grpc").r,
          _ => s"https://doc\\.akka\\.io/api/akka-grpc/${akka.grpc.gen.BuildInfo.version}/akka/grpc/"),
@@ -415,11 +398,6 @@ lazy val docs = project
         ("https://javadoc\\.io/page/".r, _ => "https://javadoc\\.io/static/")
       ),
     Paradox / siteSubdirName := s"libraries/alpakka/${projectInfoVersion.value}",
-    // make use of https://github.com/scala/scala/pull/8663
-    Compile / doc / scalacOptions ++= Seq(
-        "-jdk-api-doc-base",
-        s"https://docs.oracle.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java.base/"
-      ),
     paradoxProperties ++= Map(
         "akka.version" -> Dependencies.AkkaVersion,
         "akka-http.version" -> Dependencies.AkkaHttpVersion,
@@ -440,9 +418,7 @@ lazy val docs = project
         "couchbase.version" -> Dependencies.CouchbaseVersion,
         "extref.couchbase.base_url" -> s"https://docs.couchbase.com/java-sdk/${Dependencies.CouchbaseVersionForDocs}/%s",
         // Java
-        "extref.java-api.base_url" -> "https://docs.oracle.com/javase/8/docs/api/index.html?%s.html",
         "extref.geode.base_url" -> s"https://geode.apache.org/docs/guide/${Dependencies.GeodeVersionForDocs}/%s",
-        "extref.javaee-api.base_url" -> "https://docs.oracle.com/javaee/7/api/index.html?%s.html",
         "extref.paho-api.base_url" -> "https://www.eclipse.org/paho/files/javadoc/index.html?%s.html",
         "extref.pravega.base_url" -> s"https://cncf.pravega.io/docs/latest/%s",
         "extref.slick.base_url" -> s"https://scala-slick.org/doc/${Dependencies.SlickVersion}/%s",
@@ -454,8 +430,8 @@ lazy val docs = project
         "extref.solr.base_url" -> s"https://solr.apache.org/guide/${Dependencies.SolrVersionForDocs}/%s",
         "javadoc.org.apache.solr.base_url" -> s"https://solr.apache.org/docs/${Dependencies.SolrVersionForDocs}_0/solr-solrj/",
         // Java
-        "javadoc.base_url" -> "https://docs.oracle.com/en/java/javase/11/docs/api/java.base/",
-        "javadoc.java.base_url" -> "https://docs.oracle.com/en/java/javase/11/docs/api/java.base/",
+        "javadoc.base_url" -> s"https://docs.oracle.com/en/java/javase/${Dependencies.JavaDocLinkVersion}/docs/api",
+        "javadoc.java.base_url" -> s"https://docs.oracle.com/en/java/javase/${Dependencies.JavaDocLinkVersion}/docs/api",
         "javadoc.java.link_style" -> "direct",
         "javadoc.javax.jms.base_url" -> "https://docs.oracle.com/javaee/7/api/",
         "javadoc.jakarta.jms.base_url" -> "https://jakarta.ee/specifications/messaging/3.1/apidocs/jakarta.messaging/",

jakarta-jms/src/main/scala/akka/stream/alpakka/jakartajms/impl/JmsProducerStage.scala

@@ -65,7 +65,7 @@ private[jakartajms] final class JmsProducerStage[E <: JmsEnvelope[PassThrough],
     (logic, logic.status)
   }
 
-  private def producerLogic(inheritedAttributes: Attributes) =
+  private def producerLogic(inheritedAttributes: Attributes): TimerGraphStageLogic with JmsProducerConnector =
     new TimerGraphStageLogic(shape) with JmsProducerConnector with StageLogging {
 
       /*

jms/src/main/scala/akka/stream/alpakka/jms/impl/JmsProducerStage.scala

@@ -64,7 +64,7 @@ private[jms] final class JmsProducerStage[E <: JmsEnvelope[PassThrough], PassThr
     (logic, logic.status)
   }
 
-  private def producerLogic(inheritedAttributes: Attributes) =
+  private def producerLogic(inheritedAttributes: Attributes): TimerGraphStageLogic with JmsProducerConnector =
     new TimerGraphStageLogic(shape) with JmsProducerConnector with StageLogging {
 
       /*

kinesis/src/test/scala/akka/stream/alpakka/kinesis/Valve.scala

@@ -88,7 +88,7 @@ final class Valve[A](mode: SwitchMode) extends GraphStageWithMaterializedValue[F
 
     val promise = Promise[ValveSwitch]()
 
-    private val switch = new ValveSwitch {
+    private val switch: ValveSwitch = new ValveSwitch {
 
       val flipCallback = getAsyncCallback[(SwitchMode, Promise[Boolean])] {
         case (flipToMode, promise) =>

project/Common.scala

@@ -94,12 +94,12 @@ object Common extends AutoPlugin {
             "com.google.longrunning:com.google.protobuf:com.google.rpc:com.google.type"
           if (scalaBinaryVersion.value.startsWith("3")) {
             Seq(
-              s"-external-mappings:https://docs.oracle.com/en/java/javase/${Dependencies.JavaDocLinkVersion}/docs/api/java.base/",
+              s"-external-mappings:https://docs.oracle.com/en/java/javase/${Dependencies.JavaDocLinkVersion}/docs/api",
               s"-skip-packages:$skip"
             )
           } else {
             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",
                 skip)
           }

project/Dependencies.scala

@@ -4,13 +4,12 @@ import Keys._
 object Dependencies {
 
   // Java Platform version for JavaDoc creation
-  // sync with Java version in .github/workflows/link-validator.yml
-  lazy val JavaDocLinkVersion = 17
+  lazy val JavaDocLinkVersion = scala.util.Properties.javaSpecVersion
 
   val CronBuild = sys.env.get("GITHUB_EVENT_NAME").contains("schedule")
 
-  val Scala213 = "2.13.15" // update even in link-validator.conf
-  val Scala3 = "3.3.4"
+  val Scala213 = "2.13.17" // update even in link-validator.conf
+  val Scala3 = "3.3.7"
   val Scala2Versions = Seq(Scala213)
   val ScalaVersions = Dependencies.Scala2Versions :+ Dependencies.Scala3
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.11.7

scripts/link-validator.conf

@@ -38,12 +38,6 @@ site-link-validator {
     "https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/"
     # REMOVE some day: The Slick 3.5.2 docs are not published, 2024-12-06
     "https://scala-slick.org/doc/3.5.2/"
-    # Ignore links to docs of non-base Java modules
-    "https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/sql/"
-    "https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/xml/stream/"
-    "https://docs.oracle.com/en/java/javase/17/docs/api/java.base/org/w3c/"
-    # Ignore Pravega being linked to Java SE URLs
-    "https://docs.oracle.com/en/java/javase/11/docs/api/java.base/?io/pravega/"
     # javadoc.io is slow...
     "https://javadoc.io/doc/"
     "https://www.javadoc.io/doc/"
@@ -54,13 +48,12 @@ site-link-validator {
   ignore-files = []
 
   non-https-whitelist = [
-//    "http://logback.qos.ch/"
     "http://www.slf4j.org/"
     "http://reactivemongo.org"
     "http://www.thedevpiece.com/"
     # genereated by @apidoc
     "http://pravega.io/"
-    "http://www.scala-lang.org/api/2.13.15/scala/concurrent/Future.html"
-    "http://www.scala-lang.org/api/2.13.15/scala/util/Try.html"
+    "http://www.scala-lang.org/api/2.13.17/scala/concurrent/Future.html"
+    "http://www.scala-lang.org/api/2.13.17/scala/util/Try.html"
   ]
 }