diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..b88d860 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,13 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + target-branch: "7.x" + commit-message: + prefix: "[7.x] " diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 84931f9..71b2cad 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -53,7 +53,7 @@ jobs: uses: playframework/.github/.github/workflows/cmd.yml@v3 with: java: 17, 11 - scala: 2.13.12, 3.3.1 + scala: 2.13.14, 3.3.3 cmd: >- sbt " +publishLocal; diff --git a/.github/workflows/dependency-graph.yml b/.github/workflows/dependency-graph.yml index 69cfe55..df0daa3 100644 --- a/.github/workflows/dependency-graph.yml +++ b/.github/workflows/dependency-graph.yml @@ -17,8 +17,8 @@ jobs: name: Submit dependencies to GitHub runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 ref: ${{ inputs.ref }} - - uses: scalacenter/sbt-dependency-submission@v2 + - uses: scalacenter/sbt-dependency-submission@v3 diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 722449d..29389a7 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -9,7 +9,7 @@ jobs: update_release_draft: runs-on: ubuntu-latest steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 with: name: "Play Ebean $RESOLVED_VERSION" config-name: release-drafts/increasing-minor-version.yml # located in .github/ in the default branch within this or the .github repo diff --git a/.scalafmt.conf b/.scalafmt.conf index 075f121..2f80541 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -10,4 +10,4 @@ spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in im trailingCommas = preserve newlines.afterCurlyLambda = preserve runner.dialect = scala212source3 -version = 3.7.17 +version = 3.8.1 diff --git a/README.md b/README.md index 6ac258a..f44661a 100644 --- a/README.md +++ b/README.md @@ -22,26 +22,32 @@ This module provides Ebean support for Play Framework. The Play Ebean plugin supports several different versions of Play and Ebean. -| Plugin version | Play version | Ebean version | -|------------------------------------------------------------------------------------------------------------|--------------|---------------| -| 8.0.0 | 3.0.0+ | 13.17.3 | -| 7.0.0 | 2.9.0+ | 13.17.3 | -| 6.2.0
**! [Important notes](https://github.com/playframework/play-ebean/releases/tag/6.2.0-RC4) !** | 2.8.18+ | 12.16.1 | -| 6.0.0 | 2.8.1 | 11.45.1 | -| 5.0.2 | 2.7.0 | 11.39.x | -| 5.0.1    | 2.7.0   | 11.32.x       | -| 5.0.0    | 2.7.0   | 11.22.x       | -| 4.1.4 | 2.6.x | 11.32.x | -| 4.1.3         | 2.6.x       | 11.15.x       | -| 4.1.0         | 2.6.x       | 11.7.x       | -| 4.0.6         | 2.6.x       | 10.4.x       | -| 4.0.2 | 2.6.x | 10.3.x | -| 3.2.0 | 2.5.x | 10.4.x | -| 3.1.0 | 2.5.x | 8.2.x | -| 3.0.2 | 2.5.x | 7.6.x | -| 3.0.1         | 2.5.x       | 6.18.x        | -| 2.0.0         | 2.4.x       | 6.8.x         | -| 1.0.0 | 2.4.x | 4.6.x | +| Plugin version | Play version | Ebean version | +|--------------------------------------------------------------------------------------------------------|--------------|----------------| +| 8.3.0 | 3.0.2+ | 15.1.0 | +| 8.2.0 | 3.0.2+ | 15.0.1 | +| 8.1.0 | 3.0.1+ | 13.23.0 | +| 8.0.0 | 3.0.0+ | 13.17.3 | +| 7.3.0 | 2.9.2+ | 15.1.0 | +| 7.2.0 | 2.9.2+ | 15.0.1 | +| 7.1.0 | 2.9.1+ | 13.23.0 | +| 7.0.0 | 2.9.0+ | 13.17.3 | +| 6.2.0
**! [Important notes](https://github.com/playframework/play-ebean/releases/tag/6.2.0-RC4) !** | 2.8.18+ | 12.16.1 | +| 6.0.0 | 2.8.1 | 11.45.1 | +| 5.0.2 | 2.7.0 | 11.39.x | +| 5.0.1    | 2.7.0   | 11.32.x       | +| 5.0.0    | 2.7.0   | 11.22.x       | +| 4.1.4 | 2.6.x | 11.32.x | +| 4.1.3         | 2.6.x       | 11.15.x       | +| 4.1.0         | 2.6.x       | 11.7.x       | +| 4.0.6         | 2.6.x       | 10.4.x       | +| 4.0.2 | 2.6.x | 10.3.x | +| 3.2.0 | 2.5.x | 10.4.x | +| 3.1.0 | 2.5.x | 8.2.x | +| 3.0.2 | 2.5.x | 7.6.x | +| 3.0.1         | 2.5.x       | 6.18.x         | +| 2.0.0         | 2.4.x       | 6.8.x         | +| 1.0.0 | 2.4.x | 4.6.x | > * Release Candidate: these releases are not stable and should not be used in production. diff --git a/docs/.scalafmt.conf b/docs/.scalafmt.conf index 1497da9..854fc03 100644 --- a/docs/.scalafmt.conf +++ b/docs/.scalafmt.conf @@ -13,4 +13,4 @@ spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in im trailingCommas = preserve newlines.afterCurlyLambda = preserve runner.dialect = scala212source3 -version = 3.7.17 +version = 3.8.1 diff --git a/docs/build.sbt b/docs/build.sbt index 678622d..a4321eb 100644 --- a/docs/build.sbt +++ b/docs/build.sbt @@ -21,8 +21,8 @@ lazy val docs = project // No resource directories shuts the ebean agent up about java sources in the classes directory Test / unmanagedResourceDirectories := Nil, Test / parallelExecution := false, - scalaVersion := "2.13.12", - crossScalaVersions := Seq("2.13.12", "3.3.1"), + scalaVersion := "2.13.14", + crossScalaVersions := Seq("2.13.14", "3.3.3"), ) .settings( Test / javafmt / sourceDirectories ++= (Test / unmanagedSourceDirectories).value, diff --git a/docs/manual/working/javaGuide/main/sql/code/ebean.sbt b/docs/manual/working/javaGuide/main/sql/code/ebean.sbt index 5950384..4f47bef 100644 --- a/docs/manual/working/javaGuide/main/sql/code/ebean.sbt +++ b/docs/manual/working/javaGuide/main/sql/code/ebean.sbt @@ -1,7 +1,7 @@ // Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. //#add-sbt-plugin -addSbtPlugin("org.playframework" % "sbt-play-ebean" % "8.0.0") +addSbtPlugin("org.playframework" % "sbt-play-ebean" % "8.2.0") //#add-sbt-plugin //#enable-plugin diff --git a/docs/project/build.properties b/docs/project/build.properties index 5b79d00..7a3d17b 100644 --- a/docs/project/build.properties +++ b/docs/project/build.properties @@ -1,3 +1,3 @@ # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. -sbt.version=1.9.8 +sbt.version=1.10.0 diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt index 91e88e3..b03b15d 100644 --- a/docs/project/plugins.sbt +++ b/docs/project/plugins.sbt @@ -6,7 +6,7 @@ lazy val sbtPlayEbean = ProjectRef(Path.fileProperty("user.dir").getParentFile, resolvers ++= DefaultOptions.resolvers(snapshot = true) -addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.1")) +addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.3")) addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 9cb60f5..acaf462 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -9,22 +9,21 @@ import sbt._ object Dependencies { object ScalaVersions { - val scala212 = "2.12.18" - val scala213 = "2.13.12" - val scala3 = "3.3.1" + val scala212 = "2.12.19" + val scala213 = "2.13.14" + val scala3 = "3.3.3" } object Versions { - val play: String = "3.0.1" - val ebean = "13.23.0" - val ebeanJakarta = s"$ebean-jakarta" + val play: String = "3.0.3" + val ebean = "15.3.0" val typesafeConfig = "1.4.3" } val ebean = libraryDependencies ++= Seq( - "io.ebean" % "ebean" % Versions.ebeanJakarta, - "io.ebean" % "ebean-ddl-generator" % Versions.ebeanJakarta, - "io.ebean" % "ebean-agent" % Versions.ebean, + ("io.ebean" % "ebean" % Versions.ebean).excludeAll(ExclusionRule("com.fasterxml.jackson.core")), + "io.ebean" % "ebean-ddl-generator" % Versions.ebean, + "io.ebean" % "ebean-agent" % Versions.ebean, "org.playframework" %% "play-java-jdbc" % Versions.play, "org.playframework" %% "play-jdbc-evolutions" % Versions.play, "org.playframework" %% "play-guice" % Versions.play % Test, @@ -36,7 +35,7 @@ object Dependencies { ) val plugin = libraryDependencies ++= Seq( - "io.ebean" % "ebean" % Versions.ebeanJakarta, + "io.ebean" % "ebean" % Versions.ebean, "io.ebean" % "ebean-agent" % Versions.ebean, "com.typesafe" % "config" % Versions.typesafeConfig, ) diff --git a/project/build.properties b/project/build.properties index 5b79d00..7a3d17b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,3 +1,3 @@ # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. -sbt.version=1.9.8 +sbt.version=1.10.0 diff --git a/sbt-play-ebean/src/main/scala/play/ebean/sbt/PlayEbean.scala b/sbt-play-ebean/src/main/scala/play/ebean/sbt/PlayEbean.scala index 6bb9621..6bdd264 100644 --- a/sbt-play-ebean/src/main/scala/play/ebean/sbt/PlayEbean.scala +++ b/sbt-play-ebean/src/main/scala/play/ebean/sbt/PlayEbean.scala @@ -57,7 +57,7 @@ object PlayEbean extends AutoPlugin { libraryDependencies ++= Seq( "org.playframework" %% "play-ebean" % playEbeanVersion.value, - "org.glassfish.jaxb" % "jaxb-runtime" % "4.0.4" + "org.glassfish.jaxb" % "jaxb-runtime" % "4.0.5" ) )