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 c6c91d7a7ff..cbcd7738c63 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -41,7 +41,7 @@ object Dependencies { val jacksonDatabindVersion = jacksonCoreVersion val scala212Version = "2.12.19" - val scala213Version = "2.13.13" + 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 9f79e53bb26..1e1f4a94e43 100644 --- a/project/PekkoDisciplinePlugin.scala +++ b/project/PekkoDisciplinePlugin.scala @@ -76,7 +76,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/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