Skip to content

Commit

Permalink
Merge pull request #803 from marko-asplund/slick-341
Browse files Browse the repository at this point in the history
Downgrade to Slick v3.4.1, so that Play v3 based version can be released
  • Loading branch information
mkurz authored Nov 14, 2023
2 parents a34f690 + 61ce67d commit 08de520
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
9 changes: 6 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
)
)
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down

0 comments on commit 08de520

Please sign in to comment.