Skip to content

Commit dad6b9f

Browse files
scala-steward-asf[bot]raboofpjfanning
authored
Update scala-library to 2.13.15 (#1505)
* Update scala-library to 2.13.15 * Update link-validator.conf * fix `-Wconf` to match new semantics Override order reversed, see also https://github.com/scala/scala/releases --------- Co-authored-by: Arnout Engelen <[email protected]> Co-authored-by: PJ Fanning <[email protected]>
1 parent ce3620f commit dad6b9f

File tree

8 files changed

+29
-19
lines changed

8 files changed

+29
-19
lines changed

actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorContextSpec.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
package org.apache.pekko.actor.typed
1515

16+
import scala.annotation.nowarn
1617
import scala.concurrent.duration._
1718
import scala.reflect.ClassTag
1819

@@ -88,7 +89,9 @@ abstract class ActorContextSpec extends ScalaTestWithActorTestKit with AnyWordSp
8889
"An ActorContext" must {
8990

9091
"be usable from Behavior.interpretMessage" in {
91-
// compilation only
92+
// false-postive 'unused' warning possibly fixed in 2.13.6 https://github.com/scala/bug/issues/13041
93+
@nowarn
94+
// test compilation only
9295
lazy val b: Behavior[String] = Behaviors.receive { (context, message) =>
9396
Behavior.interpretMessage(b, context, message)
9497
}

bench-jmh/src/main/scala/org/apache/pekko/actor/RequestResponseActors.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ object RequestResponseActors {
8585
val fullPathToDispatcher = "pekko.actor." + dispatcher
8686
val latch = new CountDownLatch(numActors)
8787
val actorsPairs = for {
88-
i <- (1 to (numActors / 2)).toVector
88+
_ <- (1 to (numActors / 2)).toVector
8989
userQueryActor = system.actorOf(
9090
UserQueryActor.props(latch, numQueriesPerActor, numUsersInDBPerActor).withDispatcher(fullPathToDispatcher))
9191
userServiceActor = system.actorOf(

cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ class DistributedPubSubMediator(settings: DistributedPubSubSettings)
855855
val topicPrefix = self.path.toStringWithoutAddress
856856
(for {
857857
(_, bucket) <- registry
858-
(key, value) <- bucket.content.toSeq
858+
(key, _) <- bucket.content.toSeq
859859
if key.startsWith(topicPrefix)
860860
topic = key.substring(topicPrefix.length + 1)
861861
if !topic.contains('/') // exclude group topics

persistence/src/main/scala/org/apache/pekko/persistence/serialization/MessageSerializer.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends BaseSerializer
149149
else None)
150150
}
151151

152+
@nowarn("msg=deprecated")
152153
def persistentFSMSnapshot(persistentFSMSnapshot: mf.PersistentFSMSnapshot): PersistentFSMSnapshot[Any] = {
153154
PersistentFSMSnapshot(
154155
persistentFSMSnapshot.getStateIdentifier,

persistence/src/test/scala/org/apache/pekko/persistence/serialization/SnapshotSerializerSpec.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@
1717

1818
package org.apache.pekko.persistence.serialization
1919

20+
import annotation.nowarn
21+
2022
import org.apache.pekko
2123
import pekko.persistence.fsm.PersistentFSM.PersistentFSMSnapshot
2224
import pekko.serialization.SerializationExtension
2325
import pekko.testkit.PekkoSpec
2426

2527
import java.util.Base64
2628

29+
@nowarn("msg=deprecated")
2730
private[serialization] object SnapshotSerializerTestData {
2831
val fsmSnapshot = PersistentFSMSnapshot[String]("test-identifier", "test-data", None)
2932
// https://github.com/apache/pekko/pull/837#issuecomment-1847320309

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ object Dependencies {
4242
val jacksonDatabindVersion = jacksonCoreVersion
4343

4444
val scala212Version = "2.12.20"
45-
val scala213Version = "2.13.14"
45+
val scala213Version = "2.13.15"
4646
val scala3Version = "3.3.4"
4747
val allScalaVersions = Seq(scala213Version, scala212Version, scala3Version)
4848

project/PekkoDisciplinePlugin.scala

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ object PekkoDisciplinePlugin extends AutoPlugin {
7474
"pekko-stream-tests-tck",
7575
"pekko-testkit")
7676

77-
lazy val defaultScalaOptions = Def.setting(CrossVersion.partialVersion(scalaVersion.value) match {
78-
case Some((2, 12)) => "-Wconf:cat=unused-nowarn:s,any:e"
79-
case _ => "-Wconf:cat=unused-nowarn:s,cat=other-shadowing:s,any:e"
77+
lazy val defaultScalaOptions = Def.setting(CrossVersion.partialVersion(scalaVersion.value).get match {
78+
case (3, _) => "-Wconf:cat=unused-nowarn:s,cat=other-shadowing:s,any:e"
79+
case (2, 13) => "-Wconf:any:e,cat=unused-nowarn:s,cat=other-shadowing:s"
80+
case (2, 12) => "-Wconf:cat=unused-nowarn:s,any:e"
8081
})
8182

8283
lazy val nowarnSettings = Seq(
@@ -101,16 +102,18 @@ object PekkoDisciplinePlugin extends AutoPlugin {
101102
lazy val docs =
102103
Seq(
103104
Compile / scalacOptions -= defaultScalaOptions.value,
104-
Compile / scalacOptions ++= (
105-
if (scalaVersion.value.startsWith("3.")) Nil
106-
else Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")
107-
),
105+
Compile / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value).get match {
106+
case (3, _) => Nil
107+
case (2, 13) => Seq("-Wconf:any:e,cat=unused:s,cat=deprecation:s,cat=unchecked:s")
108+
case (2, 12) => Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")
109+
}),
108110
Test / scalacOptions --= Seq("-Xlint", "-unchecked", "-deprecation"),
109111
Test / scalacOptions -= defaultScalaOptions.value,
110-
Test / scalacOptions ++= (
111-
if (scalaVersion.value.startsWith("3.")) Nil
112-
else Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")
113-
),
112+
Test / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value).get match {
113+
case (3, _) => Nil
114+
case (2, 13) => Seq("-Wconf:any:e,cat=unused:s,cat=deprecation:s,cat=unchecked:s")
115+
case (2, 12) => Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")
116+
}),
114117
Compile / doc / scalacOptions := Seq())
115118

116119
lazy val disciplineSettings =

scripts/link-validator.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ site-link-validator {
5151
ignore-prefixes = [
5252
## GitHub will block with "429 Too Many Requests"
5353
"https://github.com/"
54-
"https://www.scala-lang.org/api/2.13.14/scala/runtime/AbstractFunction1.html"
55-
"https://www.scala-lang.org/api/2.13.14/scala/runtime/AbstractFunction2.html"
56-
"https://www.scala-lang.org/api/2.13.14/scala/runtime/AbstractFunction3.html"
57-
"https://www.scala-lang.org/api/2.13.14/scala/runtime/AbstractPartialFunction.html"
54+
"https://www.scala-lang.org/api/2.13.15/scala/runtime/AbstractFunction1.html"
55+
"https://www.scala-lang.org/api/2.13.15/scala/runtime/AbstractFunction2.html"
56+
"https://www.scala-lang.org/api/2.13.15/scala/runtime/AbstractFunction3.html"
57+
"https://www.scala-lang.org/api/2.13.15/scala/runtime/AbstractPartialFunction.html"
5858
## Bug, see https://github.com/scala/bug/issues/12807 and https://github.com/lampepfl/dotty/issues/17973
5959
"https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/nio/file/StandardOpenOption$.html"
6060
]

0 commit comments

Comments
 (0)