Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade scala, sbt and logback #1478

Merged
merged 4 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/scala3-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/scala3-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
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
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion project/PekkoDisciplinePlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.6
sbt.version=1.10.1
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ 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")
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")

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
Loading