Skip to content

Commit

Permalink
Update scala-library to 2.13.14 (#1308)
Browse files Browse the repository at this point in the history
* Update scala-library to 2.13.14

* rename var that causes compile issue

* Update PekkoDisciplinePlugin.scala

* Update link-validator.conf

---------

Co-authored-by: scala-steward-asf[bot] <147768647+scala-steward-asf[bot]@users.noreply.github.com>
Co-authored-by: PJ Fanning <[email protected]>
  • Loading branch information
scala-steward-asf[bot] and pjfanning authored May 4, 2024
1 parent d2255a0 commit b6f2c57
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions actor/src/main/scala/org/apache/pekko/actor/Deployer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion project/PekkoDisciplinePlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
8 changes: 4 additions & 4 deletions scripts/link-validator.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b6f2c57

Please sign in to comment.