From 1a7e01a6ab8a86a95156fbd38b4531897a3ab642 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 14 Nov 2023 14:12:45 +0100 Subject: [PATCH 1/5] slick 3.5.0-RC1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index bb2fdb2d..0985076e 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.4.1" + val slick = "3.5.0-RC1" val h2 = "2.2.224" } From af4389592402694938da692da8d6c65f9e51940d Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 14 Nov 2023 14:13:37 +0100 Subject: [PATCH 2/5] Publish for Scala 3, thanks to slick 3.5 RC1 --- .github/workflows/build-test.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 70092fe3..30ad55fa 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 + scala: 2.13.x, 3.x cmd: sbt ++$MATRIX_SCALA test finish: diff --git a/build.sbt b/build.sbt index 190f5abc..a8fd9f27 100644 --- a/build.sbt +++ b/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") From c36bf69c0bfe472d1c0f8e4dd1dd2200a926d9be Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 14 Nov 2023 14:13:57 +0100 Subject: [PATCH 3/5] Update README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2350e340..5c8a05a1 100644 --- a/README.md +++ b/README.md @@ -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 | From fb67cbfa86f0b3fd542ce2a85214f09d023ee6e3 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 14 Nov 2023 14:24:12 +0100 Subject: [PATCH 4/5] Upgrade versions --- README.md | 4 ++-- .../manual/working/scalaGuide/main/sql/slick/code/slick.sbt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5c8a05a1..3a7e0c73 100644 --- a/README.md +++ b/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" ) ``` diff --git a/docs/manual/working/scalaGuide/main/sql/slick/code/slick.sbt b/docs/manual/working/scalaGuide/main/sql/slick/code/slick.sbt index 4feb9653..9579d40b 100644 --- a/docs/manual/working/scalaGuide/main/sql/slick/code/slick.sbt +++ b/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 From 1a4e6d11eda17a0176aff5ff0911b8fb80d611f4 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 21 Feb 2024 21:17:20 +0100 Subject: [PATCH 5/5] MiMa --- build.sbt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index a8fd9f27..735378b9 100644 --- a/build.sbt +++ b/build.sbt @@ -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( ) )