Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.2.x] Use stable slick 3.4 and drop out-of-the-box Scala 3 support for now #804

Merged
merged 2 commits into from
Nov 14, 2023
Merged

[5.2.x] Use stable slick 3.4 and drop out-of-the-box Scala 3 support for now #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4f733f
Downgrade slick to stable 3.4
mkurz Nov 14, 2023
6c3a6b8
Drop Scala 3 support for now
mkurz Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ The Play Slick plugin supports several different versions of Play and Slick.

| Plugin version | Play version | Slick version | Scala version |
|----------------|--------------|---------------|----------------------|
| 5.2.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 |
| 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Global / onLoad := (Global / onLoad).value.andThen { s =>
lazy val commonSettings = Seq(
// Work around https://issues.scala-lang.org/browse/SI-9311
scalacOptions ~= (_.filterNot(_ == "-Xfatal-warnings")),
scalaVersion := "2.13.12", // scala213,
crossScalaVersions := Seq("2.13.12", "3.3.1"), // scala213,
scalaVersion := "2.13.12",
crossScalaVersions := Seq("2.13.12"),
pomExtra := scala.xml.NodeSeq.Empty, // Can be removed when dropping interplay
developers += Developer(
"playframework",
Expand Down Expand Up @@ -73,5 +73,8 @@ val previousVersion: Option[String] = Some("5.2.0-RC1")
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
View file
Open in desktop
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
Loading