Merge pull request #805 from mkurz/slick35_scala3

Slick 3.5.0-RC1 + Scala 3 support

.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
+      scala: 2.13.x, 3.x
       cmd: sbt ++$MATRIX_SCALA test
 
   finish:

README.md

@@ -34,8 +34,8 @@ To use play-slick, you need to add the following dependencies:
 
 ```scala
 libraryDependencies ++= Seq(
-  "org.playframework" %% "play-slick" % "6.0.0",
-  "org.playframework" %% "play-slick-evolutions" % "6.0.0"
+  "org.playframework" %% "play-slick" % "6.1.0",
+  "org.playframework" %% "play-slick-evolutions" % "6.1.0"
 )
 ```
 
@@ -47,6 +47,8 @@ The Play Slick plugin supports several different versions of Play and Slick.
 
 | Plugin version | Play version | Slick version | Scala version        |
 |----------------|--------------|---------------|----------------------|
+| 6.1.x          | 3.0.0        | 3.5.0+        | 2.13.x/3.3.x         |
+| 5.3.x          | 2.9.0        | 3.5.0+        | 2.13.x/3.3.x         |
 | 6.0.x          | 3.0.0        | 3.4.1         | 2.13.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        |

build.sbt

@@ -24,7 +24,7 @@ lazy val commonSettings = Seq(
   compile / javacOptions ++= Seq("--release", "11"),
   doc / javacOptions := Seq("-source", "11"),
   scalaVersion       := "2.13.12",
-  crossScalaVersions := Seq("2.13.12"),
+  crossScalaVersions := Seq("2.13.12", "3.3.1"),
   scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-encoding", "utf8") ++
     (CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((2, 13)) => Seq("-Xsource:3")
@@ -56,6 +56,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)
@@ -82,7 +83,11 @@ val previousVersion: Option[String] = Some("6.0.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 += "org.playframework" %% "play-slick" % "6.0.0"
+libraryDependencies += "org.playframework" %% "play-slick" % "6.1.0"
 // #add-library-dependencies
 
 // #add-dependency-with-evolutions
 libraryDependencies ++= Seq(
-  "org.playframework" %% "play-slick"            % "6.0.0",
-  "org.playframework" %% "play-slick-evolutions" % "6.0.0"
+  "org.playframework" %% "play-slick"            % "6.1.0",
+  "org.playframework" %% "play-slick-evolutions" % "6.1.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"
 }