Skip to content

Commit

Permalink
Merge branch 'playframework:main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@AntoineDuComptoirDesPharmacies
AntoineDuComptoirDesPharmacies authored Jul 9, 2024
2 parents 0fa0712 + 75eba32 commit 52130ae
Show file tree
Hide file tree
Showing 14 changed files with 61 additions and 43 deletions.
13 changes: 13 additions & 0 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
@@ -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] "
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dependency-graph.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
46 changes: 26 additions & 20 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<br>**! [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<br>**! [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.
Expand Down
2 changes: 1 addition & 1 deletion docs/.scalafmt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions docs/build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/working/javaGuide/main/sql/code/ebean.sbt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>

//#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
Expand Down
2 changes: 1 addition & 1 deletion docs/project/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>

sbt.version=1.9.8
sbt.version=1.10.0
2 changes: 1 addition & 1 deletion docs/project/plugins.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
19 changes: 9 additions & 10 deletions project/Dependencies.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>

sbt.version=1.9.8
sbt.version=1.10.0
2 changes: 1 addition & 1 deletion sbt-play-ebean/src/main/scala/play/ebean/sbt/PlayEbean.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
)

Expand Down

0 comments on commit 52130ae

Please sign in to comment.