Merge pull request #806 from mkurz/slick35_scala3_52x

[5.2.x] Slick 3.5.0-RC1 + Scala 3 support

.github/workflows/build-test.yml

@@ -5,7 +5,7 @@ on:
 
   push:
     branches:
-      - 5.2.x # Check branch after merge
+      - 5.3.x # Check branch after merge
 
 concurrency:
   # Only run once for latest commit per ref and cancel other (previous) runs.
@@ -38,7 +38,7 @@ jobs:
     uses: playframework/.github/.github/workflows/cmd.yml@v3
     with:
       java: 17, 11
-      scala: 2.13.x
+      scala: 2.13.x, 3.x
       cmd: sbt ++$MATRIX_SCALA test
 
   finish:

.github/workflows/dependency-graph.yml

@@ -2,7 +2,7 @@ name: Dependency Graph
 on:
   push:
     branches:
-      - 5.2.x
+      - 5.3.x
 
 concurrency:
   # Only run once for latest commit per ref and cancel other (previous) runs.

.github/workflows/publish.yml

@@ -3,7 +3,7 @@ name: Publish
 on:
   push:
     branches: # Snapshots
-      - 5.2.x
+      - 5.3.x
     tags: ["**"] # Releases
 
 jobs:

.github/workflows/release-drafter.yml

@@ -3,7 +3,7 @@ name: Release Drafter
 on:
   push:
     branches:
-      - 5.2.x
+      - 5.3.x
 
 jobs:
   update_release_draft:

README.md

@@ -34,8 +34,8 @@ To use play-slick, you need to add the following dependencies:
 
 ```scala
 libraryDependencies ++= Seq(
-  "com.typesafe.play" %% "play-slick" % "5.2.0",
-  "com.typesafe.play" %% "play-slick-evolutions" % "5.2.0"
+  "com.typesafe.play" %% "play-slick" % "5.3.0",
+  "com.typesafe.play" %% "play-slick-evolutions" % "5.3.0"
 )
 ```
 
@@ -47,6 +47,7 @@ The Play Slick plugin supports several different versions of Play and Slick.
 
 | Plugin version | Play version | Slick version | Scala version        |
 |----------------|--------------|---------------|----------------------|
+| 5.3.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        |

build.sbt

@@ -20,7 +20,7 @@ lazy val commonSettings = Seq(
   // Work around https://issues.scala-lang.org/browse/SI-9311
   scalacOptions ~= (_.filterNot(_ == "-Xfatal-warnings")),
   scalaVersion       := "2.13.12",
-  crossScalaVersions := Seq("2.13.12"),
+  crossScalaVersions := Seq("2.13.12", "3.3.1"),
   pomExtra           := scala.xml.NodeSeq.Empty, // Can be removed when dropping interplay
   developers += Developer(
     "playframework",
@@ -45,6 +45,7 @@ lazy val `play-slick` = (project in file("src/core"))
   .settings(mimaSettings)
   .settings(
     mimaBinaryIssueFilters ++= Seq(
+      ProblemFilters.exclude[DirectMissingMethodProblem]("play.api.db.slick.HasDatabaseConfig.db"),
     )
   )
   .settings(commonSettings)
@@ -73,7 +74,11 @@ val previousVersion: Option[String] = Some("5.2.0")
 ThisBuild / mimaFailOnNoPrevious := false
 
 def mimaSettings = Seq(
-  mimaPreviousArtifacts := previousVersion.map(organization.value %% moduleName.value % _).toSet,
+  mimaPreviousArtifacts := (if (CrossVersion.binaryScalaVersion(scalaVersion.value) == "3") {
+                              Set.empty
+                            } else {
+                              previousVersion.map(organization.value %% moduleName.value % _).toSet
+                            }),
   mimaBinaryIssueFilters := Seq(
   )
 )

docs/manual/working/scalaGuide/main/sql/slick/code/slick.sbt

@@ -1,10 +1,10 @@
 // #add-library-dependencies
-libraryDependencies += "com.typesafe.play" %% "play-slick" % "5.2.0"
+libraryDependencies += "com.typesafe.play" %% "play-slick" % "5.3.0"
 // #add-library-dependencies
 
 // #add-dependency-with-evolutions
 libraryDependencies ++= Seq(
-  "com.typesafe.play" %% "play-slick"            % "5.2.0",
-  "com.typesafe.play" %% "play-slick-evolutions" % "5.2.0"
+  "com.typesafe.play" %% "play-slick"            % "5.3.0",
+  "com.typesafe.play" %% "play-slick-evolutions" % "5.3.0"
 )
 // #add-dependency-with-evolutions

project/Dependencies.scala

@@ -21,7 +21,7 @@ object Dependencies {
 object Version {
   val play = _root_.play.core.PlayVersion.current
 
-  val slick = "3.4.1"
+  val slick = "3.5.0-RC1"
   val h2    = "2.2.224"
 }