-
-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'playframework:main' into master
- Loading branch information
Showing
50 changed files
with
1,250 additions
and
1,122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # Scala Steward: Reformat with scalafmt 3.5.8 | ||
| 7fe92e05b8508927343db11bd4c6bbbd723253c1 | ||
| # Enable Java formatter | ||
| 367b1e5662a20cda35df21d715bd76d1bf4d2324 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| extends: .github |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| pullRequests.frequency = "@monthly" | ||
|
|
||
| commits.message = "${artifactName} ${nextVersion} (was ${currentVersion})" | ||
|
|
||
| pullRequests.grouping = [ | ||
| { name = "patches", "title" = "Patch updates", "filter" = [{"version" = "patch"}] } | ||
| ] | ||
|
|
||
| buildRoots = [ | ||
| ".", | ||
| "docs", | ||
| ] | ||
|
|
||
| updates.ignore = [ | ||
| // these will get updated along with ebean, so no need to update them separately | ||
| { groupId = "io.ebean", artifactId = "ebean-ddl-generator" } | ||
| { groupId = "io.ebean", artifactId = "ebean-agent" } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| name: Check | ||
|
|
||
| on: | ||
| pull_request: | ||
|
|
||
| push: | ||
| branches: | ||
| - main # Check branch after merge | ||
|
|
||
| concurrency: | ||
| # Only run once for latest commit per ref and cancel other (previous) runs. | ||
| group: ci-${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| check-code-style: | ||
| name: Code Style | ||
| uses: playframework/.github/.github/workflows/cmd.yml@v3 | ||
| with: | ||
| cmd: sbt validateCode | ||
|
|
||
| check-binary-compatibility: | ||
| name: Binary Compatibility | ||
| uses: playframework/.github/.github/workflows/binary-check.yml@v3 | ||
|
|
||
| check-docs: | ||
| name: Docs | ||
| uses: playframework/.github/.github/workflows/cmd.yml@v3 | ||
| with: | ||
| java: 17, 11 | ||
| scala: 2.13.x, 3.x | ||
| cmd: cd docs && sbt ++$MATRIX_SCALA validateCode | ||
|
|
||
| tests: | ||
| name: Tests | ||
| needs: | ||
| - "check-code-style" | ||
| - "check-binary-compatibility" | ||
| - "check-docs" | ||
| uses: playframework/.github/.github/workflows/cmd.yml@v3 | ||
| with: | ||
| java: 17, 11 | ||
| scala: 2.13.x, 3.x | ||
| cmd: >- | ||
| sbt ++$MATRIX_SCALA test | ||
| scripted-tests: | ||
| name: Scripted tests | ||
| needs: | ||
| - "check-code-style" | ||
| - "check-binary-compatibility" | ||
| - "check-docs" | ||
| uses: playframework/.github/.github/workflows/cmd.yml@v3 | ||
| with: | ||
| java: 17, 11 | ||
| scala: 2.13.12, 3.3.1 | ||
| cmd: >- | ||
| sbt " | ||
| +publishLocal; | ||
| set plugin/scriptedLaunchOpts += \"-Dscala.version=$MATRIX_SCALA\"; | ||
| show scriptedSbt; | ||
| show scriptedLaunchOpts; | ||
| plugin/scripted; | ||
| " | ||
| finish: | ||
| name: Finish | ||
| if: github.event_name == 'pull_request' | ||
| needs: # Should be last | ||
| - "tests" | ||
| - "scripted-tests" | ||
| uses: playframework/.github/.github/workflows/rtm.yml@v3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| name: Dependency Graph | ||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
|
|
||
| concurrency: | ||
| # Only run once for latest commit per ref and cancel other (previous) runs. | ||
| group: dependency-graph-${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| permissions: | ||
| contents: write # this permission is needed to submit the dependency graph | ||
|
|
||
| jobs: | ||
| dependency-graph: | ||
| name: Submit dependencies to GitHub | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 | ||
| ref: ${{ inputs.ref }} | ||
| - uses: scalacenter/sbt-dependency-submission@v2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| name: Publish | ||
|
|
||
| on: | ||
| push: | ||
| branches: # Snapshots | ||
| - main | ||
| tags: ["**"] # Releases | ||
|
|
||
| jobs: | ||
| publish-artifacts: | ||
| name: Publish / Artifacts | ||
| uses: playframework/.github/.github/workflows/publish.yml@v3 | ||
| secrets: inherit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,13 @@ | ||
| align = true | ||
| align.preset = true | ||
| assumeStandardLibraryStripMargin = true | ||
| danglingParentheses = true | ||
| docstrings = JavaDoc | ||
| danglingParentheses.preset = true | ||
| docstrings.style = Asterisk | ||
| maxColumn = 120 | ||
| project.git = true | ||
| rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifiers, PreferCurlyFors ] | ||
| rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] | ||
| spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } | ||
| trailingCommas = preserve | ||
| newlines.afterCurlyLambda = preserve | ||
| version = 2.6.4 | ||
| runner.dialect = scala212source3 | ||
| version = 3.7.17 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,52 @@ | ||
| # play-ebean | ||
| <!--- Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> --> | ||
|
|
||
| [](https://travis-ci.com/playframework/play-ebean) | ||
| [](http://mvnrepository.com/artifact/com.typesafe.play/play-ebean_2.12) | ||
| # Play Ebean | ||
|
|
||
| [](https://twitter.com/playframework) | ||
| [](https://discord.gg/g5s2vtZ4Fa) | ||
| [](https://github.com/playframework/playframework/discussions) | ||
| [](https://stackoverflow.com/tags/playframework) | ||
| [](https://www.youtube.com/channel/UCRp6QDm5SDjbIuisUpxV9cg) | ||
| [](https://www.twitch.tv/playframework) | ||
| [](https://opencollective.com/playframework) | ||
|
|
||
| [](https://github.com/playframework/play-ebean/actions/workflows/build-test.yml) | ||
| [](https://mvnrepository.com/artifact/org.playframework/play-ebean_2.13) | ||
| [](https://github.com/playframework/play-ebean) | ||
| [](https://scala-steward.org) | ||
| [](https://mergify.com) | ||
|
|
||
| This module provides Ebean support for Play Framework. | ||
|
|
||
| ## Releases | ||
|
|
||
| The Play Ebean plugin supports several different versions of Play and Ebean. | ||
|
|
||
| | Plugin version | Play version | Ebean version | | ||
| |----------------|--------------|---------------| | ||
| | 6.1.0 | 2.8.x | 12.8.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.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 | | ||
|
|
||
| > * Release Candidate: these releases are not stable and should not be used in production. | ||
| ## Support | ||
|
|
||
| The Play Ebean support library is *[Community Driven][]*. | ||
|
|
||
| We also recommend using the payintech fork: https://github.com/payintech/play-ebean | ||
|
|
||
| [Community Driven]: https://developer.lightbend.com/docs/introduction/getting-help/support-terminology.html | ||
| ## Releasing a new version | ||
|
|
||
| See https://github.com/playframework/.github/blob/main/RELEASING.md |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.