diff --git a/.github/workflows/scala3-build.yml b/.github/workflows/scala3-build.yml index 969c93662da..18f7c3e433c 100644 --- a/.github/workflows/scala3-build.yml +++ b/.github/workflows/scala3-build.yml @@ -20,17 +20,17 @@ jobs: strategy: matrix: command: - - testkit/test actor-tests/test - - actor-testkit-typed/test actor-typed-tests/test - - bench-jmh/test - - cluster/test cluster-tools/test cluster-typed/test distributed-data/test cluster-metrics/test cluster-sharding/test cluster-sharding-typed/test - - discovery/test coordination/test - - persistence/test persistence-shared/test persistence-query/test persistence-typed/test persistence-testkit/test persistence-tck/test persistence-typed-tests/test - - pki/test slf4j/test - - serialization-jackson/test - - stream/test stream-testkit/test stream-tests/test stream-typed/test - - stream-tests-tck/test - - remote/test remote-tests/test protobuf/test protobuf-v3/test + - ;testkit/test;actor-tests/test + - ;actor-testkit-typed/test;actor-typed-tests/test + - ;bench-jmh/test + - ;cluster/test;cluster-tools/test;cluster-typed/test;distributed-data/test;cluster-metrics/test;cluster-sharding/test;cluster-sharding-typed/test + - ;discovery/test;coordination/test + - ;persistence/test;persistence-shared/test;persistence-query/test;persistence-typed/test;persistence-testkit/test;persistence-tck/test;persistence-typed-tests/test + - ;pki/test;slf4j/test + - ;serialization-jackson/test + - ;stream/test;stream-testkit/test;stream-tests/test;stream-typed/test;stream-typed-tests/test + - ;stream-tests-tck/test + - ;remote/test;remote-tests/test;protobuf/test;protobuf-v3/test fail-fast: true steps: - name: Checkout diff --git a/.github/workflows/scala3-compile.yml b/.github/workflows/scala3-compile.yml index dfe13a9817a..65c1b2189a0 100644 --- a/.github/workflows/scala3-compile.yml +++ b/.github/workflows/scala3-compile.yml @@ -18,17 +18,17 @@ jobs: strategy: matrix: command: - - testkit/Test/compile actor-tests/Test/compile - - actor-testkit-typed/Test/compile actor-typed-tests/Test/compile - - bench-jmh/Test/compile - - cluster/Test/compile cluster-tools/Test/compile cluster-typed/Test/compile distributed-data/Test/compile cluster-metrics/Test/compile cluster-sharding/Test/compile cluster-sharding-typed/Test/compile - - discovery/Test/compile coordination/Test/compile - - persistence/Test/compile persistence-shared/Test/compile persistence-query/Test/compile persistence-typed/Test/compile persistence-testkit/Test/compile persistence-tck/Test/compile persistence-typed-tests/Test/compile - - pki/Test/compile slf4j/Test/compile - - serialization-jackson/Test/compile - - stream/Test/compile stream-testkit/Test/compile stream-tests/Test/compile stream-typed/Test/compile - - stream-tests-tck/Test/compile - - remote/Test/compile remote-tests/Test/compile protobuf/Test/compile protobuf-v3/Test/compile + - ;testkit/Test/compile;actor-tests/Test/compile + - ;actor-testkit-typed/Test/compile;actor-typed-tests/Test/compile + - ;bench-jmh/Test/compile + - ;cluster/Test/compile;cluster-tools/Test/compile;cluster-typed/Test/compile;distributed-data/Test/compile;cluster-metrics/Test/compile;cluster-sharding/Test/compile;cluster-sharding-typed/Test/compile + - ;discovery/Test/compile;coordination/Test/compile + - ;persistence/Test/compile;persistence-shared/Test/compile;persistence-query/Test/compile;persistence-typed/Test/compile;persistence-testkit/Test/compile;persistence-tck/Test/compile;persistence-typed-tests/Test/compile + - ;pki/Test/compile;slf4j/Test/compile + - ;serialization-jackson/Test/compile + - ;stream/Test/compile;stream-testkit/Test/compile;stream-tests/Test/compile;stream-typed/Test/compile + - ;stream-tests-tck/Test/compile + - ;remote/Test/compile;remote-tests/Test/compile;protobuf/Test/compile;protobuf-v3/Test/compile fail-fast: true steps: - name: Checkout diff --git a/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala b/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala index b1210dc76bc..77953cc3d94 100644 --- a/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala +++ b/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala @@ -311,8 +311,8 @@ private[pekko] class Deployer(val settings: ActorSystem.Settings, val dynamicAcc dynamicAccess .createInstanceFor[RouterConfig](fqn, args2) .recover { - case e @ (_: IllegalArgumentException | _: ConfigException) => throw e - case _ => throwCannotInstantiateRouter(args2, e) + case innerException @ (_: IllegalArgumentException | _: ConfigException) => throw innerException + case _ => throwCannotInstantiateRouter(args2, e) } .get case e => throwCannotInstantiateRouter(args2, e) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 9365aef4241..ff1b3546999 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,13 +30,13 @@ object Dependencies { val agronaVersion = "1.15.1" val nettyVersion = "3.10.6.Final" val protobufJavaVersion = "3.16.3" - val logbackVersion = "1.2.11" + val logbackVersion = "1.2.13" val jacksonCoreVersion = "2.14.3" val jacksonDatabindVersion = jacksonCoreVersion - val scala212Version = "2.12.19" - val scala213Version = "2.13.13" + val scala212Version = "2.12.20" + val scala213Version = "2.13.14" val scala3Version = "3.3.3" val allScalaVersions = Seq(scala213Version, scala212Version, scala3Version) diff --git a/project/PekkoDisciplinePlugin.scala b/project/PekkoDisciplinePlugin.scala index 1880ed29183..89a1b269f97 100644 --- a/project/PekkoDisciplinePlugin.scala +++ b/project/PekkoDisciplinePlugin.scala @@ -78,7 +78,7 @@ object PekkoDisciplinePlugin extends AutoPlugin { lazy val defaultScalaOptions = Def.setting(CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 12)) => "-Wconf:cat=unused-nowarn:s,any:e" - case _ => "-Wconf:cat=unused-nowarn:s,cat=lint-named-booleans:s,cat=other-shadowing:s,any:e" + case _ => "-Wconf:cat=unused-nowarn:s,cat=other-shadowing:s,any:e" }) lazy val nowarnSettings = Seq( diff --git a/project/build.properties b/project/build.properties index 27430827bc2..ee4c672cd0d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.6 +sbt.version=1.10.1 diff --git a/project/plugins.sbt b/project/plugins.sbt index a0f15659447..08ab428c336 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -14,7 +14,7 @@ addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.33") addSbtPlugin("com.github.sbt" % "sbt-osgi" % "0.9.4-INVALID-CEN-JAR-PATCH") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3") @@ -22,11 +22,11 @@ addSbtPlugin("com.github.sbt" % "sbt-boilerplate" % "0.7.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("com.github.sbt" % "sbt-pull-request-validator" % "2.0.0") -addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.31") +addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.32") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") -addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.10") -addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.3.2") +addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.12") +addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.3.4") addSbtPlugin("com.github.reibitto" % "sbt-welcome" % "0.2.2") addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.5.0") diff --git a/scripts/link-validator.conf b/scripts/link-validator.conf index 7324cd3d986..a5b2c223fad 100644 --- a/scripts/link-validator.conf +++ b/scripts/link-validator.conf @@ -61,10 +61,10 @@ site-link-validator { "http://pholser.github.com/jopt-simple" "http://pojosr.googlecode.com/" "http://team.ops4j.org/wiki/display/ops4j/Tinybundles" - "https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractFunction1.html" - "https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractFunction2.html" - "https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractFunction3.html" - "https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractPartialFunction.html" + "https://www.scala-lang.org/api/2.13.14/scala/runtime/AbstractFunction1.html" + "https://www.scala-lang.org/api/2.13.14/scala/runtime/AbstractFunction2.html" + "https://www.scala-lang.org/api/2.13.14/scala/runtime/AbstractFunction3.html" + "https://www.scala-lang.org/api/2.13.14/scala/runtime/AbstractPartialFunction.html" # Bug, see https://github.com/scala/bug/issues/12807 and https://github.com/lampepfl/dotty/issues/17973 "https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/nio/file/StandardOpenOption$.html" # Occasionally returns a 500 Internal Server Error