bump: scala 2.13.17 and 3.3.7 (#32825)

johanandren · sebastian-alfers · web-flow · commit 860845bad4ff · 2025-10-27T17:04:09.000+01:00
---------

Co-authored-by: Sebastian &lt;sebastian.alfers@gmail.com&gt;
diff --git a/.github/workflows/check-samples.yml b/.github/workflows/check-samples.yml
@@ -18,6 +18,9 @@ jobs:
   check-samples:
     name: Check Sample Projects
     runs-on: Akka-Default
+    env:
+      SCALA3_VERSION: 3.3.7
+
     steps:
       - name: Checkout Global Scripts
         # This MUST be before the main checkout or else the dynver will not work
@@ -77,7 +80,7 @@ jobs:
         run: |-
           cd samples/akka-quickstart-scala
           sbt test -Dakka.version=`cat ~/.version`
-          sbt 'clean; ++3.3.3!; test' -Dakka.version=`cat ~/.version`
+          sbt "clean; ++${SCALA3_VERSION}!; test" -Dakka.version=`cat ~/.version`
 
       - name: Test akka-sample-cluster-java
         run: |-
@@ -88,7 +91,7 @@ jobs:
         run: |-
           cd samples/akka-sample-cluster-scala
           sbt test -Dakka.version=`cat ~/.version`
-          sbt 'clean; ++3.3.3!; test' -Dakka.version=`cat ~/.version`
+          sbt "clean; ++${SCALA3_VERSION}!; test" -Dakka.version=`cat ~/.version`
 
       - name: Test akka-sample-distributed-data-java
         run: |-
@@ -100,7 +103,7 @@ jobs:
         run: |-
           cd samples/akka-sample-distributed-data-scala
           sbt test multi-jvm:test -Dakka.version=`cat ~/.version`
-          sbt 'clean; ++3.3.3!; test; multi-jvm:test' -Dakka.version=`cat ~/.version`
+          sbt "clean; ++${SCALA3_VERSION}!; test; multi-jvm:test" -Dakka.version=`cat ~/.version`
 
       - name: Test akka-sample-fsm-java
         run: |-
@@ -111,7 +114,7 @@ jobs:
         run: |-
           cd samples/akka-sample-fsm-scala
           sbt test -Dakka.version=`cat ~/.version`
-          sbt 'clean; ++3.3.3!; test' -Dakka.version=`cat ~/.version`
+          sbt "clean; ++${SCALA3_VERSION}!; test" -Dakka.version=`cat ~/.version`
 
       - name: Test akka-sample-sharding-java
         run: |-
@@ -122,13 +125,13 @@ jobs:
         run: |-
           cd samples/akka-sample-sharding-scala
           sbt test -Dakka.version=`cat ~/.version`
-          sbt 'clean; ++3.3.3!; test' -Dakka.version=`cat ~/.version`
+          sbt "clean; ++${SCALA3_VERSION}!; test" -Dakka.version=`cat ~/.version`
 
       - name: Test akka-sample-kafka-to-sharding-scala
         run: |-
           cd samples/akka-sample-kafka-to-sharding-scala
           sbt test -Dakka.version=`cat ~/.version`
-          sbt 'clean; ++3.3.3!; test' -Dakka.version=`cat ~/.version`
+          sbt "clean; ++${SCALA3_VERSION}!; test" -Dakka.version=`cat ~/.version`
 
       - name: Email on failure
         if: ${{ failure() }}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala
@@ -77,7 +77,7 @@ object ActorSystemSpec {
 
   class SlowDispatcher(_config: Config, _prerequisites: DispatcherPrerequisites)
       extends MessageDispatcherConfigurator(_config, _prerequisites) {
-    private val instance = new Dispatcher(
+    private val instance: Dispatcher = new Dispatcher(
       this,
       this.config.getString("id"),
       this.config.getInt("throughput"),
diff --git a/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala b/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala
@@ -93,7 +93,7 @@ class LoggingReceiveSpec extends AnyWordSpec with BeforeAndAfterAll {
           case null =>
         }
 
-        val actor = TestActorRef(new Actor {
+        val actor: TestActorRef[Actor] = TestActorRef(new Actor {
           def switch: Actor.Receive = { case "becomenull" => context.become(r, false) }
           def receive =
             switch.orElse(LoggingReceive {
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/PropsAdapter.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/PropsAdapter.scala
@@ -16,12 +16,15 @@ import akka.actor.typed.internal.PropsImpl._
 import akka.annotation.InternalApi
 import akka.dispatch.Mailboxes
 
+import scala.annotation.nowarn
+
 /**
  * INTERNAL API
  */
 @InternalApi private[akka] object PropsAdapter {
 
   private final val TypedCreatorFunctionConsumerClazz = classOf[TypedCreatorFunctionConsumer]
+  @nowarn("msg=never used")
   private final val ActorAdapterClazz = classOf[ActorAdapter[_]]
   private final val DefaultTypedDeploy = Deploy.local.copy(mailbox = "akka.actor.typed.default-mailbox")
 
diff --git a/akka-actor/src/main/scala-2.13/akka/util/ByteString.scala b/akka-actor/src/main/scala-2.13/akka/util/ByteString.scala
@@ -361,7 +361,7 @@ object ByteString {
     }
 
     def compact: CompactByteString =
-      if (isCompact) ByteString1C(bytes) else ByteString1C(toArray)
+      if (isCompact) ByteString1C(bytes) else ByteString1C(toArray())
 
     def asByteBuffer: ByteBuffer = {
       val buffer = ByteBuffer.wrap(bytes, startIndex, length).asReadOnlyBuffer
@@ -441,7 +441,7 @@ object ByteString {
 
     override def toArrayUnsafe(): Array[Byte] = {
       if (startIndex == 0 && length == bytes.length) bytes
-      else toArray
+      else toArray()
     }
   }
 
@@ -833,7 +833,7 @@ sealed abstract class ByteString
    *
    * @return this ByteString copied into a byte array
    */
-  protected[ByteString] def toArray: Array[Byte] = toArray[Byte]
+  protected[ByteString] def toArray(): Array[Byte] = toArray[Byte]
 
   final override def toArray[B >: Byte](implicit arg0: ClassTag[B]): Array[B] = {
     // super uses byteiterator
@@ -869,7 +869,7 @@ sealed abstract class ByteString
    * only read the bytes and never mutate then. For all other intents and purposes, please use the usual
    * toArray method - which provide the immutability guarantees by copying the backing array.
    */
-  def toArrayUnsafe(): Array[Byte] = toArray
+  def toArrayUnsafe(): Array[Byte] = toArray()
 
   override def foreach[@specialized U](f: Byte => U): Unit = iterator.foreach(f)
 
@@ -932,7 +932,7 @@ sealed abstract class ByteString
    * Creates a new ByteBuffer with a copy of all bytes contained in this
    * ByteString.
    */
-  def toByteBuffer: ByteBuffer = ByteBuffer.wrap(toArray)
+  def toByteBuffer: ByteBuffer = ByteBuffer.wrap(toArray())
 
   /**
    * Decodes this ByteString as a UTF-8 encoded String.
diff --git a/akka-actor/src/main/scala/akka/actor/Address.scala b/akka-actor/src/main/scala/akka/actor/Address.scala
@@ -7,13 +7,13 @@ import java.net.MalformedURLException
 import java.net.URI
 import java.net.URISyntaxException
 import java.util.Optional
-
 import scala.annotation.tailrec
 import scala.collection.immutable
 import scala.jdk.OptionConverters._
-
 import akka.annotation.InternalApi
 
+import scala.annotation.nowarn
+
 /**
  * The address specifies the physical location under which an Actor can be
  * reached. Examples are local addresses, identified by the ActorSystem’s
@@ -65,8 +65,8 @@ final case class Address private[akka] (protocol: String, system: String, host:
    * entity.
    */
   def hasGlobalScope: Boolean = host.isDefined
-
   // store hashCode
+  @nowarn("msg=deprecated")
   @transient override lazy val hashCode: Int = scala.util.hashing.MurmurHash3.productHash(this)
 
   /**
diff --git a/akka-actor/src/main/scala/akka/routing/RouterConfig.scala b/akka-actor/src/main/scala/akka/routing/RouterConfig.scala
@@ -81,7 +81,7 @@ trait RouterConfig extends Serializable {
   /**
    * Overridable merge strategy, by default completely prefers `this` (i.e. no merge).
    */
-  def withFallback(@nowarn("msg=never used") other: RouterConfig): RouterConfig = this
+  def withFallback(other: RouterConfig): RouterConfig = this
 
   /**
    * Check that everything is there which is needed. Called in constructor of RoutedActorRef to fail early.
diff --git a/akka-docs/src/test/scala/docs/persistence/testkit/TestKitExamples.scala b/akka-docs/src/test/scala/docs/persistence/testkit/TestKitExamples.scala
@@ -22,7 +22,6 @@ object PersistenceTestKitSampleSpec {
     val empty: State = new State
   }
   final class State extends CborSerializable {
-    @nowarn("msg=never used")
     def updated(event: Evt): State = this
   }
 }
diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/Unpersistent.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/Unpersistent.scala
@@ -109,7 +109,7 @@ private[akka] object Unpersistent {
 
     private var sequenceNr: Long = initialSequenceNr
     private var state: State = initialState
-    private var metadata: Option[Any] = None
+    private var metadataState: Option[Any] = None
     private val stashedCommands = ListBuffer.empty[Command]
 
     private def snapshotMetadata() =
@@ -143,7 +143,7 @@ private[akka] object Unpersistent {
 
           case Persist(event, metadataEntries) =>
             sequenceNr += 1
-            metadata = if (metadataEntries.isEmpty) None else Some(CompositeMetadata(metadataEntries))
+            metadataState = if (metadataEntries.isEmpty) None else Some(CompositeMetadata(metadataEntries))
             state = eventHandler(state, event)
             onEvent(event, sequenceNr, tagger(state, event))
             shouldSnapshot = shouldSnapshot || snapshotRequested(event)
@@ -155,7 +155,7 @@ private[akka] object Unpersistent {
                 val event = evtWithMeta.event
                 val metadataEntries = evtWithMeta.metadataEntries
                 sequenceNr += 1
-                metadata = if (metadataEntries.isEmpty) None else Some(CompositeMetadata(metadataEntries))
+                metadataState = if (metadataEntries.isEmpty) None else Some(CompositeMetadata(metadataEntries))
                 state = eventHandler(state, event)
                 val tags = tagger(state, event)
                 (event, sequenceNr, tags)
@@ -219,7 +219,7 @@ private[akka] object Unpersistent {
     }
 
     override def metadata[M: ClassTag]: Option[M] =
-      CompositeMetadata.extract[M](metadata)
+      CompositeMetadata.extract[M](metadataState)
   }
 
   private class WrappedDurableStateBehavior[Command, State](
diff --git a/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala b/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala
@@ -667,7 +667,7 @@ private[persistence] trait Eventsourced
    * @param replayMax maximum number of messages to replay.
    * @param timeout recovery event timeout
    */
-  private def recoveryStarted(replayMax: Long, timeout: FiniteDuration) = new State {
+  private def recoveryStarted(replayMax: Long, timeout: FiniteDuration): State = new State {
 
     val timeoutCancellable = {
       import context.dispatcher
@@ -783,7 +783,7 @@ private[persistence] trait Eventsourced
    *
    * All incoming messages are stashed.
    */
-  private def recovering(recoveryBehavior: Receive, timeout: FiniteDuration) =
+  private def recovering(recoveryBehavior: Receive, timeout: FiniteDuration): State =
     new State {
 
       // protect against snapshot stalling forever because of journal overloaded and such
diff --git a/akka-remote/src/main/scala/akka/remote/artery/Control.scala b/akka-remote/src/main/scala/akka/remote/artery/Control.scala
@@ -193,7 +193,8 @@ private[remote] class OutboundControlJunction(
   val out: Outlet[OutboundEnvelope] = Outlet("OutboundControlJunction.out")
   override val shape: FlowShape[OutboundEnvelope, OutboundEnvelope] = FlowShape(in, out)
 
-  override def createLogicAndMaterializedValue(inheritedAttributes: Attributes) = {
+  override def createLogicAndMaterializedValue(
+      inheritedAttributes: Attributes): (GraphStageLogic, OutboundControlJunction.OutboundControlIngress) = {
 
     val logic = new GraphStageLogic(shape)
       with InHandler
diff --git a/akka-stream-tests/src/test/scala/akka/stream/MaterializerWithAttributesSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/MaterializerWithAttributesSpec.scala
@@ -27,18 +27,19 @@ class MaterializerWithAttributesSpec
 
   implicit val materializer: Materializer = Materializer(system, Attributes.name("foo"))
 
-  val attributesSource = new GraphStageWithMaterializedValue[SourceShape[Nothing], Attributes] {
-    val out = Outlet[Nothing]("AttributesSource.out")
-    override val shape = SourceShape(out)
-
-    override def createLogicAndMaterializedValue(inheritedAttributes: Attributes): (GraphStageLogic, Attributes) =
-      new GraphStageLogic(shape) with OutHandler {
-        override def preStart(): Unit = completeStage()
-        override def onPull(): Unit = completeStage()
-
-        setHandler(out, this)
-      } -> inheritedAttributes
-  }
+  val attributesSource: GraphStageWithMaterializedValue[SourceShape[Nothing], Attributes] =
+    new GraphStageWithMaterializedValue[SourceShape[Nothing], Attributes] {
+      val out = Outlet[Nothing]("AttributesSource.out")
+      override val shape = SourceShape(out)
+
+      override def createLogicAndMaterializedValue(inheritedAttributes: Attributes): (GraphStageLogic, Attributes) =
+        new GraphStageLogic(shape) with OutHandler {
+          override def preStart(): Unit = completeStage()
+          override def onPull(): Unit = completeStage()
+
+          setHandler(out, this)
+        } -> inheritedAttributes
+    }
 
   "SystemMaterializer with attributes" should {
     "apply its attributes to streams it materializes" in {
diff --git a/akka-stream/src/main/scala/akka/stream/impl/QueueSource.scala b/akka-stream/src/main/scala/akka/stream/impl/QueueSource.scala
@@ -41,7 +41,8 @@ import akka.stream.stage._
   val out = Outlet[T]("queueSource.out")
   override val shape: SourceShape[T] = SourceShape.of(out)
 
-  override def createLogicAndMaterializedValue(inheritedAttributes: Attributes) = {
+  override def createLogicAndMaterializedValue(
+      inheritedAttributes: Attributes): (GraphStageLogic, SourceQueueWithComplete[T]) = {
     val completion = Promise[Done]()
     val name = inheritedAttributes.nameOrDefault(getClass.toString)
 
diff --git a/akka-stream/src/main/scala/akka/stream/impl/SetupStage.scala b/akka-stream/src/main/scala/akka/stream/impl/SetupStage.scala
@@ -35,7 +35,7 @@ import akka.stream.stage.OutHandler
     (createStageLogic(matPromise), matPromise.future)
   }
 
-  private def createStageLogic(matPromise: Promise[M]) = new GraphStageLogic(shape) {
+  private def createStageLogic(matPromise: Promise[M]): GraphStageLogic = new GraphStageLogic(shape) {
     import SetupStage._
 
     val subInlet = new SubSinkInlet[U]("SetupFlowStage")
@@ -78,7 +78,7 @@ import akka.stream.stage.OutHandler
     (createStageLogic(matPromise), matPromise.future)
   }
 
-  private def createStageLogic(matPromise: Promise[M]) = new GraphStageLogic(shape) {
+  private def createStageLogic(matPromise: Promise[M]): GraphStageLogic = new GraphStageLogic(shape) {
     import SetupStage._
 
     val subInlet = new SubSinkInlet[T]("SetupSourceStage")
diff --git a/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala b/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala
@@ -245,7 +245,8 @@ import akka.stream.stage._
 
   override protected def initialAttributes: Attributes = DefaultAttributes.seqSink
 
-  override def createLogicAndMaterializedValue(inheritedAttributes: Attributes) = {
+  override def createLogicAndMaterializedValue(
+      inheritedAttributes: Attributes): (GraphStageLogic with InHandler, Future[That]) = {
     val p: Promise[That] = Promise()
     val logic = new GraphStageLogic(shape) with InHandler {
       val buf = cbf.newBuilder
@@ -302,7 +303,8 @@ import akka.stream.stage._
 
   override def toString: String = "QueueSink"
 
-  override def createLogicAndMaterializedValue(inheritedAttributes: Attributes) = {
+  override def createLogicAndMaterializedValue(
+      inheritedAttributes: Attributes): (GraphStageLogic, SinkQueueWithCancel[T]) = {
     val stageLogic = new GraphStageLogic(shape) with InHandler with SinkQueueWithCancel[T] {
 
       val maxBuffer = inheritedAttributes.get[InputBuffer](InputBuffer(16, 16)).max
diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/TcpStages.scala b/akka-stream/src/main/scala/akka/stream/impl/io/TcpStages.scala
@@ -52,7 +52,9 @@ import akka.util.ByteString
     throw new UnsupportedOperationException("Not used")
 
   // TODO: Timeout on bind
-  override def createLogicAndMaterializedValue(inheritedAttributes: Attributes, eagerMaterialzer: Materializer) = {
+  override def createLogicAndMaterializedValue(
+      inheritedAttributes: Attributes,
+      eagerMaterialzer: Materializer): (GraphStageLogic, Future[StreamTcp.ServerBinding]) = {
     val bindingPromise = Promise[ServerBinding]()
 
     val logic = new TimerGraphStageLogic(shape) with StageLogging {
diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKit.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKit.scala
@@ -180,7 +180,7 @@ private[akka] object MetricsKit {
     override def matches(name: String, metric: Metric) = classOf[KnownOpsInTimespanTimer].isInstance(metric)
   }
 
-  val GcMetricsFilter = new MetricFilter {
+  val GcMetricsFilter: MetricFilter = new MetricFilter {
     val keyPattern = """.*\.gc\..*""".r.pattern
 
     override def matches(name: String, metric: Metric) = keyPattern.matcher(name).matches()
diff --git a/native-image-tests/cluster-scala/build.sbt b/native-image-tests/cluster-scala/build.sbt
@@ -2,7 +2,7 @@ import scala.collection.Seq
 
 name := "cluster-scala"
 version := "1.0"
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 // Note: this default isn't really used anywhere so not important to bump
 lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.10.9")
diff --git a/native-image-tests/local-scala/build.sbt b/native-image-tests/local-scala/build.sbt
@@ -2,7 +2,7 @@ import scala.collection.Seq
 
 name := "local-scala"
 version := "1.0"
-scalaVersion := "2.13.15"
+scalaVersion := "2.13.17"
 
 // Note: this default isn't really used anywhere so not important to bump
 lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.10.9")
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -30,8 +30,8 @@ object Dependencies {
   val jacksonDatabindVersion = jacksonCoreVersion // https://github.com/FasterXML/jackson/wiki/Jackson-Releases
 
   // Also update URLs in link-validator.conf
-  val scala213Version = "2.13.15"
-  val scala3Version = "3.3.4"
+  val scala213Version = "2.13.17"
+  val scala3Version = "3.3.7"
 
   val allScalaVersions = Seq(scala213Version, scala3Version)
 
@@ -50,7 +50,6 @@ object Dependencies {
 
   object Compile {
     // Compile
-
     val config = "com.typesafe" % "config" % "1.4.5" // ApacheV2
     val `netty-transport` = "io.netty" % "netty-transport" % nettyVersion // ApacheV2
     val `netty-handler` = "io.netty" % "netty-handler" % nettyVersion // ApacheV2
@@ -174,7 +173,7 @@ object Dependencies {
   // TODO check if `l ++=` everywhere expensive?
   val l = libraryDependencies
 
-  val actor = l += config
+  val actor = l ++= Seq(config)
 
   val actorTyped = l ++= Seq(slf4jApi)
 
diff --git a/samples/akka-quickstart-scala/build.sbt b/samples/akka-quickstart-scala/build.sbt
diff --git a/samples/akka-sample-fsm-scala/build.sbt b/samples/akka-sample-fsm-scala/build.sbt

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ class LoggingReceiveSpec extends AnyWordSpec with BeforeAndAfterAll {`
`93`	`93`	`case null =>`
`94`	`94`	`}`
`95`	`95`
`96`		`- val actor = TestActorRef(new Actor {`
	`96`	`+ val actor: TestActorRef[Actor] = TestActorRef(new Actor {`
`97`	`97`	`def switch: Actor.Receive = { case "becomenull" => context.become(r, false) }`
`98`	`98`	`def receive =`
`99`	`99`	`switch.orElse(LoggingReceive {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ object PersistenceTestKitSampleSpec {`
`22`	`22`	`val empty: State = new State`
`23`	`23`	`}`
`24`	`24`	`final class State extends CborSerializable {`
`25`		`- @nowarn("msg=never used")`
`26`	`25`	`def updated(event: Evt): State = this`
`27`	`26`	`}`
`28`	`27`	`}`