Skip to content

Commit

Permalink
bump: Akka Persistence JDBC 5.4.0 and Scala 3 across all modules (#541)
Browse files Browse the repository at this point in the history
* bump: Akka Persistence JDBC 5.4.0 and Scala 3 across all modules
* Filter out slf4j 2.0 which comes in transitively via Slick 3.5
  • Loading branch information
johanandren authored May 24, 2024
1 parent 8f144c9 commit 00b98ec
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
# cover relevant combinations when combined with the matrix Yugabyte tests
# { scalaVersion: "2.13", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler', testCmd: "test"}
- { scalaVersion: "2.13", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test"}
- { scalaVersion: "3.3", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "core/test"}
- { scalaVersion: "3.3", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test"}
- { scalaVersion: "2.13", jdkVersion: "1.21.0", jvmName: "temurin:1.21", extraOpts: '', testCmd: "test"}
steps:
- name: Checkout
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
# cover relevant combinations when combined with the matrix Postgres tests
- { scalaVersion: "2.13", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler', testCmd: "test" }
# { scalaVersion: "2.13", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test" }
- { scalaVersion: "3.3", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "core/test"}
- { scalaVersion: "3.3", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test"}
steps:
- name: Checkout
# https://github.com/actions/checkout/releases
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
include:
- { scalaVersion: "2.13", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler', testCmd: "test"}
- { scalaVersion: "2.13", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test"}
- { scalaVersion: "3.3", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "core/test"}
- { scalaVersion: "3.3", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test"}
- { scalaVersion: "2.13", jdkVersion: "1.21.0", jvmName: "temurin:1.21", extraOpts: '', testCmd: "test"}
steps:
- name: Checkout
Expand Down
3 changes: 1 addition & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ inThisBuild(

def common: Seq[Setting[_]] =
Seq(
crossScalaVersions := Dependencies.Scala2Versions,
crossScalaVersions := Dependencies.ScalaVersions,
scalaVersion := Dependencies.Scala213,
crossVersion := CrossVersion.binary,
scalafmtOnCompile := true,
Expand Down Expand Up @@ -91,7 +91,6 @@ def suffixFileFilter(suffix: String): FileFilter = new SimpleFileFilter(f => f.g

lazy val core = (project in file("core"))
.settings(common)
.settings(Scala3.settings)
.settings(name := "akka-persistence-r2dbc", libraryDependencies ++= Dependencies.core)
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(CiReleasePlugin)
Expand Down
6 changes: 4 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ object Dependencies {
val ScalaVersions = Dependencies.Scala2Versions :+ Dependencies.Scala3
val AkkaVersion = System.getProperty("override.akka.version", "2.9.3")
val AkkaVersionInDocs = AkkaVersion.take(3)
val AkkaPersistenceJdbcVersion = "5.2.0" // only in migration tool tests
val AkkaPersistenceJdbcVersion = "5.4.0" // only in migration tool tests
val AkkaProjectionVersionInDocs = "current"
val H2Version = "2.2.224"
val R2dbcH2Version = "1.0.0.RELEASE"
Expand Down Expand Up @@ -72,7 +72,9 @@ object Dependencies {

val migrationTests =
Seq(
"com.lightbend.akka" %% "akka-persistence-jdbc" % AkkaPersistenceJdbcVersion % Test,
("com.lightbend.akka" %% "akka-persistence-jdbc" % AkkaPersistenceJdbcVersion % Test)
// Unsupported SLF4J 2 transitively pulled in by Slick 3.5.0
.exclude("org.slf4j", "slf4j-api"),
"com.microsoft.sqlserver" % "mssql-jdbc" % SqlServerJdbcVersion % Test,
TestDeps.postgresql,
TestDeps.logback,
Expand Down
7 changes: 0 additions & 7 deletions project/Scala3.scala

This file was deleted.

0 comments on commit 00b98ec

Please sign in to comment.