Skip to content

Commit 4d70b09

Browse files
pjfanningpjfanning
authored
upgrade scala, sbt and logback (#1478)
* upgrade scala, sbt and logback * compile issue * more scala 2.13 issues * scala 3 build
1 parent afe6f77 commit 4d70b09

File tree

8 files changed

+37
-37
lines changed

8 files changed

+37
-37
lines changed

‎.github/workflows/scala3-build.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ jobs:
2020
strategy:
2121
matrix:
2222
command:
23-
- testkit/test actor-tests/test
24-
- actor-testkit-typed/test actor-typed-tests/test
25-
- bench-jmh/test
26-
- cluster/test cluster-tools/test cluster-typed/test distributed-data/test cluster-metrics/test cluster-sharding/test cluster-sharding-typed/test
27-
- discovery/test coordination/test
28-
- persistence/test persistence-shared/test persistence-query/test persistence-typed/test persistence-testkit/test persistence-tck/test persistence-typed-tests/test
29-
- pki/test slf4j/test
30-
- serialization-jackson/test
31-
- stream/test stream-testkit/test stream-tests/test stream-typed/test
32-
- stream-tests-tck/test
33-
- remote/test remote-tests/test protobuf/test protobuf-v3/test
23+
- ;testkit/test;actor-tests/test
24+
- ;actor-testkit-typed/test;actor-typed-tests/test
25+
- ;bench-jmh/test
26+
- ;cluster/test;cluster-tools/test;cluster-typed/test;distributed-data/test;cluster-metrics/test;cluster-sharding/test;cluster-sharding-typed/test
27+
- ;discovery/test;coordination/test
28+
- ;persistence/test;persistence-shared/test;persistence-query/test;persistence-typed/test;persistence-testkit/test;persistence-tck/test;persistence-typed-tests/test
29+
- ;pki/test;slf4j/test
30+
- ;serialization-jackson/test
31+
- ;stream/test;stream-testkit/test;stream-tests/test;stream-typed/test;stream-typed-tests/test
32+
- ;stream-tests-tck/test
33+
- ;remote/test;remote-tests/test;protobuf/test;protobuf-v3/test
3434
fail-fast: true
3535
steps:
3636
- name: Checkout

‎.github/workflows/scala3-compile.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ jobs:
1818
strategy:
1919
matrix:
2020
command:
21-
- testkit/Test/compile actor-tests/Test/compile
22-
- actor-testkit-typed/Test/compile actor-typed-tests/Test/compile
23-
- bench-jmh/Test/compile
24-
- 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
25-
- discovery/Test/compile coordination/Test/compile
26-
- 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
27-
- pki/Test/compile slf4j/Test/compile
28-
- serialization-jackson/Test/compile
29-
- stream/Test/compile stream-testkit/Test/compile stream-tests/Test/compile stream-typed/Test/compile
30-
- stream-tests-tck/Test/compile
31-
- remote/Test/compile remote-tests/Test/compile protobuf/Test/compile protobuf-v3/Test/compile
21+
- ;testkit/Test/compile;actor-tests/Test/compile
22+
- ;actor-testkit-typed/Test/compile;actor-typed-tests/Test/compile
23+
- ;bench-jmh/Test/compile
24+
- ;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
25+
- ;discovery/Test/compile;coordination/Test/compile
26+
- ;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
27+
- ;pki/Test/compile;slf4j/Test/compile
28+
- ;serialization-jackson/Test/compile
29+
- ;stream/Test/compile;stream-testkit/Test/compile;stream-tests/Test/compile;stream-typed/Test/compile
30+
- ;stream-tests-tck/Test/compile
31+
- ;remote/Test/compile;remote-tests/Test/compile;protobuf/Test/compile;protobuf-v3/Test/compile
3232
fail-fast: true
3333
steps:
3434
- name: Checkout

‎actor/src/main/scala/org/apache/pekko/actor/Deployer.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ private[pekko] class Deployer(val settings: ActorSystem.Settings, val dynamicAcc
311311
dynamicAccess
312312
.createInstanceFor[RouterConfig](fqn, args2)
313313
.recover {
314-
case e @ (_: IllegalArgumentException | _: ConfigException) => throw e
315-
case _ => throwCannotInstantiateRouter(args2, e)
314+
case innerException @ (_: IllegalArgumentException | _: ConfigException) => throw innerException
315+
case _ => throwCannotInstantiateRouter(args2, e)
316316
}
317317
.get
318318
case e => throwCannotInstantiateRouter(args2, e)

‎project/Dependencies.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ object Dependencies {
3030
val agronaVersion = "1.15.1"
3131
val nettyVersion = "3.10.6.Final"
3232
val protobufJavaVersion = "3.16.3"
33-
val logbackVersion = "1.2.11"
33+
val logbackVersion = "1.2.13"
3434

3535
val jacksonCoreVersion = "2.14.3"
3636
val jacksonDatabindVersion = jacksonCoreVersion
3737

38-
val scala212Version = "2.12.19"
39-
val scala213Version = "2.13.13"
38+
val scala212Version = "2.12.20"
39+
val scala213Version = "2.13.14"
4040
val scala3Version = "3.3.3"
4141
val allScalaVersions = Seq(scala213Version, scala212Version, scala3Version)
4242

‎project/PekkoDisciplinePlugin.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ object PekkoDisciplinePlugin extends AutoPlugin {
7878

7979
lazy val defaultScalaOptions = Def.setting(CrossVersion.partialVersion(scalaVersion.value) match {
8080
case Some((2, 12)) => "-Wconf:cat=unused-nowarn:s,any:e"
81-
case _ => "-Wconf:cat=unused-nowarn:s,cat=lint-named-booleans:s,cat=other-shadowing:s,any:e"
81+
case _ => "-Wconf:cat=unused-nowarn:s,cat=other-shadowing:s,any:e"
8282
})
8383

8484
lazy val nowarnSettings = Seq(

‎project/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.6
1+
sbt.version=1.10.1

‎project/plugins.sbt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2")
1414
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
1515
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.33")
1616
addSbtPlugin("com.github.sbt" % "sbt-osgi" % "0.9.4-INVALID-CEN-JAR-PATCH")
17-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
17+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
1818
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
1919
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
2020
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
2121
addSbtPlugin("com.github.sbt" % "sbt-boilerplate" % "0.7.0")
2222

2323
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
2424
addSbtPlugin("com.github.sbt" % "sbt-pull-request-validator" % "2.0.0")
25-
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.31")
25+
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.32")
2626

2727
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
28-
addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.10")
29-
addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.3.2")
28+
addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.12")
29+
addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.3.4")
3030
addSbtPlugin("com.github.reibitto" % "sbt-welcome" % "0.2.2")
3131
addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.5.0")
3232

‎scripts/link-validator.conf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ site-link-validator {
6161
"http://pholser.github.com/jopt-simple"
6262
"http://pojosr.googlecode.com/"
6363
"http://team.ops4j.org/wiki/display/ops4j/Tinybundles"
64-
"https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractFunction1.html"
65-
"https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractFunction2.html"
66-
"https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractFunction3.html"
67-
"https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractPartialFunction.html"
64+
"https://www.scala-lang.org/api/2.13.14/scala/runtime/AbstractFunction1.html"
65+
"https://www.scala-lang.org/api/2.13.14/scala/runtime/AbstractFunction2.html"
66+
"https://www.scala-lang.org/api/2.13.14/scala/runtime/AbstractFunction3.html"
67+
"https://www.scala-lang.org/api/2.13.14/scala/runtime/AbstractPartialFunction.html"
6868
# Bug, see https://github.com/scala/bug/issues/12807 and https://github.com/lampepfl/dotty/issues/17973
6969
"https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/nio/file/StandardOpenOption$.html"
7070
# Occasionally returns a 500 Internal Server Error

0 commit comments

Comments
 (0)