diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 30ad55fa..70092fe3 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 78006dc3..2350e340 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,8 @@ The Play Slick plugin supports several different versions of Play and Slick. | Plugin version | Play version | Slick version | Scala version | |----------------|--------------|---------------|----------------------| -| 6.0.x | 3.0.0 | 3.5.0+ | 2.13.x/3.3.x | -| 5.2.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 | | 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 e4e87eaf..d517f955 100644 --- a/build.sbt +++ b/build.sbt @@ -23,8 +23,8 @@ lazy val commonSettings = Seq( javacOptions ++= Seq("-encoding", "UTF-8", "-Xlint:-options"), compile / javacOptions ++= Seq("--release", "11"), doc / javacOptions := Seq("-source", "11"), - scalaVersion := "2.13.12", // scala213, - crossScalaVersions := Seq("2.13.12", "3.3.1"), // scala213, + scalaVersion := "2.13.12", + crossScalaVersions := Seq("2.13.12"), scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-encoding", "utf8") ++ (CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 13)) => Seq("-Xsource:3") @@ -82,5 +82,8 @@ val previousVersion: Option[String] = Some("6.0.0-M1") 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 019b7d45..bb2fdb2d 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" }