From e4f733face4fdde5811a8abaf6fca5eed3740431 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 14 Nov 2023 14:05:17 +0100 Subject: [PATCH 1/2] Downgrade slick to stable 3.4 --- build.sbt | 5 ++++- project/Dependencies.scala | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 2d2331a1..eba481f0 100644 --- a/build.sbt +++ b/build.sbt @@ -73,5 +73,8 @@ val previousVersion: Option[String] = Some("5.2.0-RC1") ThisBuild / mimaFailOnNoPrevious := false def mimaSettings = Seq( - mimaPreviousArtifacts := previousVersion.map(organization.value %% moduleName.value % _).toSet + mimaPreviousArtifacts := previousVersion.map(organization.value %% moduleName.value % _).toSet, + mimaBinaryIssueFilters := Seq( + ProblemFilters.exclude[DirectMissingMethodProblem]("play.api.db.slick.HasDatabaseConfig.db") + ) ) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 339c598e..f14986c3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -21,7 +21,7 @@ object Dependencies { object Version { val play = _root_.play.core.PlayVersion.current - val slick = "3.5.0-M4" + val slick = "3.4.1" val h2 = "2.2.224" } From 6c3a6b868873cff91663542ae29dcff37472f0c9 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 14 Nov 2023 14:07:18 +0100 Subject: [PATCH 2/2] Drop Scala 3 support for now --- .github/workflows/build-test.yml | 2 +- README.md | 2 +- build.sbt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 62272cae..38ddccdf 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -38,7 +38,7 @@ jobs: uses: playframework/.github/.github/workflows/cmd.yml@v3 with: java: 17, 11 - scala: 2.13.x, 3.x + scala: 2.13.x cmd: sbt ++$MATRIX_SCALA test finish: diff --git a/README.md b/README.md index 742f0a1c..87c8de12 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ The Play Slick plugin supports several different versions of Play and Slick. | Plugin version | Play version | Slick version | Scala version | |----------------|--------------|---------------|----------------------| -| 5.2.x | 2.9.0 | 3.5.0+ | 2.13.x/3.3.x | +| 5.2.x | 2.9.0 | 3.4.1 | 2.13.x | | 5.1.x | 2.8.16 | 3.4.1+ | 2.12.x/2.13.x | | 5.0.x | 2.8.x | 3.3.2+ | 2.12.x/2.13.x | | 4.0.2+ | 2.7.x | 3.3.2+ | 2.11.x/2.12.x/2.13.x | diff --git a/build.sbt b/build.sbt index eba481f0..dce1256e 100644 --- a/build.sbt +++ b/build.sbt @@ -19,8 +19,8 @@ Global / onLoad := (Global / onLoad).value.andThen { s => lazy val commonSettings = Seq( // Work around https://issues.scala-lang.org/browse/SI-9311 scalacOptions ~= (_.filterNot(_ == "-Xfatal-warnings")), - scalaVersion := "2.13.12", // scala213, - crossScalaVersions := Seq("2.13.12", "3.3.1"), // scala213, + scalaVersion := "2.13.12", + crossScalaVersions := Seq("2.13.12"), pomExtra := scala.xml.NodeSeq.Empty, // Can be removed when dropping interplay developers += Developer( "playframework",