Skip to content

Consolidate main-branch dependency updates and fix sample builds - #1750

Open
mkurz wants to merge 33 commits into
playframework:mainfrom
mkurz:consolidate-main-dependency-updates
Open

mkurz wants to merge 33 commits into
playframework:mainfrom
mkurz:consolidate-main-dependency-updates

Conversation

@mkurz

@mkurz mkurz commented Nov 16, 2026 •

Copy link
Copy Markdown
Member

Refresh the sample dependencies and combine the outstanding dependency updates in one branch, keeping each update and fix in a separate commit. Use the supplied retained snapshots, Scala 3.3.9, sbt 2.1.0, Scala 3.10.1 for the next-Scala CI lane, and Gradle 9.9.0 throughout.

The runtime fixes keep core Play modules on the configured snapshot when ScalaTestPlus or other integrations reference older Play builds. This fixes Secure Session's encryption test, which loaded Pekko serialization-jackson 2.0.0-M4 alongside Pekko 2.0.0. Apply the alignment in both sbt and Gradle; the published Play BOM currently has no version constraints. Also pin Ebean's transitive sbt Play plugin to the directly configured snapshot. The gRPC samples retain temporary Pekko/Pekko HTTP 2.0.0 overrides until compatible Pekko gRPC and Play gRPC releases are available.

Compile the Java gRPC sources with javac before Scala to avoid Scala 3.10.1's access errors in generated Protobuf builders. Disable the sample's unused reverse-route generation to avoid a Java/Scala compilation cycle.

Serialize compilation of the three Slick subprojects to avoid intermittent Scala 3 compiler failures during concurrent compilation; keep all tests enabled.

Refresh the generated npm lockfiles for the updated asset compilers. Also fix the Scala REST API's Gradle scala-uri group ID and normalize the batch script introduced by its wrapper update, retaining CRLF working copies through the existing attributes.

Supersedes #1702, #1703, #1704, #1706, #1708, #1710, #1712, #1716, #1717, #1719, #1728, #1738, #1746, #1747, #1748, and #1749.

Validation:

  • Passed: all 31 sbt samples, with sbt 1.13.0 and 2.1.0, and all 25 Gradle samples, on Java 17 with Scala 2.13.18 and 3.3.9 (112 sample/build-tool/Scala combinations, default Pekko HTTP backend).
  • Includes the custom REST API documentation/Gatling compilation checks, isolated Slick migrations/code generation, and TLS tests.
  • Reproduced Secure Session's Gradle failure before the fix and verified it passes afterward.
  • Java gRPC: reproduced the Scala 3.10.1 generated-Java access error and verified all four functional tests with the javac-first settings under both sbt versions.
  • Scala gRPC, Ebean, and Slick also passed focused Scala 3.10.1 tests under both sbt versions.
  • Full GitHub CI matrix: all 1,344 build combinations passed after retrying transient dependency downloads and cancelled cases.
  • git diff --check.

Upstream dependency alignment is now tracked in separate PRs:

These projects publish snapshots only from main. Once the aligned artifacts are published, update this PR to consume them and remove the general core Play alignment and Ebean plugin overrides. The current branch keeps its tested overrides until those artifacts are available.

The Pekko gRPC release vote is for 2.0.0-RC1: https://lists.apache.org/thread.html/jg9twwvcqnzj3nkv3dtb1x7c91r3kn89. Revisit the gRPC-specific overrides after the compatible plugin/runtime/codegen and updated Play gRPC artifacts are published. The separate Slick parallel-compilation and Java/Protobuf mixed-compilation workarounds require their own verification before removal.

mkurz and others added 30 commits November 16, 2026 17:37
Align every Scala 3.3 compiler and library definition with the refreshed snapshots. Includes the Scala update from playframework#1712.
Use the latest retained main-branch publication in sbt and Gradle samples.
Keep Gradle template compilation aligned with the latest retained Twirl publication.
Use the latest retained main-branch Anorm publication.
Use the latest retained WebJars Play publication in sbt and Gradle samples.
Consolidate playframework#1748 using the latest retained Play gRPC publication.
Consolidate playframework#1747 and align the Gradle catalog with the sbt plugin.
Consolidate playframework#1717 using the latest retained publication in both build tools.
Consolidate playframework#1716 using the latest retained Play Slick publication.
Consolidate playframework#1702 across the JPA and WebSocket samples.
Consolidate playframework#1703 without unrelated batch-script changes.
Consolidate playframework#1706 without unrelated batch-script changes.
Use the latest retained main-branch publication.
Consolidate playframework#1708 and align the Gradle cluster and Secure Session samples.
Consolidate playframework#1710 in both the sbt build and Gradle version catalog.
Consolidate playframework#1746 in both the JPA and REST API samples and both build tools.
Consolidate playframework#1704 with the latest retained publication for each plugin.
Consolidate the jnr-ffi update from playframework#1712 and align sbt with Gradle.
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.8.1 to 9.9.0.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.8.1...v9.9.0)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit c328165)
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.8.2 to 9.9.0.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.8.2...v9.9.0)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 382e593)
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.8.2 to 9.9.0.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.8.2...v9.9.0)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit f65e1f6)
(cherry picked from commit c5b5557)
(cherry picked from commit 2a8078b)
Use the group ID already declared in the version catalog and sbt build. The old coordinates prevent Gradle from resolving scala-uri 4.2.0.
Normalize the batch script reintroduced by the Gradle wrapper update. The existing text eol=crlf attributes preserve CRLF in working copies while storing LF in Git; the other batch scripts were already normalized on main.
Keep core Play modules on the configured snapshot when older integration dependencies are selected by Gradle. This prevents the encryption test from loading pekko-serialization-jackson 2.0.0-M4 alongside Pekko 2.0.0. Verified the failing Gradle test before and after the fix on Java 17 and Scala 2.13.18.
Apply the Secure Session dependency-alignment fix consistently across the remaining Gradle samples. Integration snapshots can otherwise make Gradle select older core Play artifacts and incompatible Pekko modules. The published Play BOM currently contains no dependency constraints, so align the core milestone snapshots explicitly.
Extend the temporary dependency overrides while Pekko gRPC and Play gRPC still reference older Pekko releases. Keep version-conflict checks enabled and use the versions selected by Play. Verified the Scala gRPC tests with sbt 1.13.0 and 2.1.0 on Java 17 and Scala 2.13.18.
Override the core Play entry points with the versions supplied by the Play plugin. ScalaTestPlus and Play gRPC snapshots can otherwise select older core Play artifacts, mixing Pekko 2.0.0-M4 with the current Pekko HTTP server. Apply the same alignment to all samples and both sbt versions without disabling compatibility checks.
Record the lockfiles regenerated by the upgraded CoffeeScript and LESS asset plugins. Align all three CoffeeScript installations with 2.7.1 and retain the resolved optional LESS dependencies used by the passing sample tests.
The Ebean plugin references an older core Play build, which can win snapshot version resolution. Override that transitive plugin with the directly declared Play plugin, preserving its sbt cross-version attributes.
Concurrent Scala 3.3.9 compilations intermittently fail with missing standard-library symbols or cyclic tuple errors. Limit compilation to one subproject at a time while retaining every test. The complete Scala 3.3.9 suites pass with this setting under both sbt versions.
@mergify

mergify Bot commented Nov 16, 2026

Copy link
Copy Markdown
Contributor

Tick the box to add this pull request to the merge queue (same as @mergifyio queue). If it does not match the queue conditions yet, it enters the queue once it does.

  • Queue this pull request

Scala 3.10.1 rejects the protected BuilderParent types in Protobuf Java sources during mixed compilation. Compile Java with javac first. The gRPC sample does not use reverse routes, so omit their generation to avoid a Java/Scala compilation cycle. All four functional tests pass on Scala 3.10.1 under sbt 1.13.0 and 2.1.0 with these settings.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant