Skip to content

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

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

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

Conversation

@mkurz

@mkurz mkurz commented Nov 16, 2026 •

Copy link
Copy Markdown
Member

Consolidate the open main-branch dependency updates using the supplied retained snapshots. The builds use core Play 3.1.0-M10-5da0b97a-SNAPSHOT, Play gRPC 0.13.0-M5+111-8170b920-SNAPSHOT, ScalaTestPlus Play 8.0.0-M2+95-3cde726d-SNAPSHOT, Pekko/Pekko HTTP/Pekko gRPC 2.0.0, Scala 3.3.9, sbt 2.1.0 and Gradle 9.9.1. Each dependency update and build fix has a separate signed commit.

Remove the Apache snapshot repositories, the gRPC Pekko dependency overrides and the resource-directory deduplication workaround covered by #1579. ScalaTestPlus Play now references the configured core Play snapshot, so Gradle no longer needs explicit core-module alignment. The Ebean sbt plugin and sbt application dependencies also resolve without the earlier overrides.

Use Play gRPC's corrected router generator with normal Scala 3 source generation. Keep the Java-first compilation settings for the Scala 3.10.1 Protobuf access problem and the separate Slick compilation serialization setting; those still require independent investigation.

Refresh the asset compiler lockfiles, fix the Scala REST API Gradle scala-uri coordinates, and normalize the wrapper batch script while preserving CRLF working copies through the existing attributes.

Supersedes or incorporates: #1579, #1702, #1703, #1704, #1706, #1708, #1710, #1712, #1716, #1717, #1719, #1728, #1738, #1746, #1747, #1748, #1749, #1752, #1756, #1757, #1758, #1760, #1761, #1762, #1763, #1764, #1766, #1767, #1769, #1770, #1771, #1772, #1773, #1775, #1778, #1779. Some original Gradle PRs have already reached main; their changes are retained through the updated base.

Local validation on Java 17:

  • The previous consolidated revision passed 112/112 invocations, covering 174 sample/Scala/build-tool combinations with Scala 2.13.18 and 3.3.9, sbt 1.13.0/2.1.0 and Gradle 9.9.1, plus all eight gRPC packaging combinations.
  • After updating Play gRPC and ScalaTestPlus Play and removing their two workarounds, focused checks passed with Scala 3.3.9: Scala gRPC on sbt 1.13.0 and 2.1.0 (eight tests each), and one Secure Session Gradle 9.9.1 run, including symmetric encryption.
  • Both generated Scala 3 gRPC routers pass the actor system with (using system). The full matrix was not repeated for these snapshot updates.
  • git diff --check; all 45 feature commits are signed.

The upstream Play gRPC router fix has merged and is included in the consumed snapshot.

@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

mkurz and others added 25 commits November 19, 2026 14:59
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.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.8.1...v9.9.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit c328165)

Includes the subsequent Gradle 9.9.1 wrapper update.
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.
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.8.2 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.8.2...v9.9.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 382e593)

Includes the subsequent Gradle 9.9.1 wrapper update.
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.8.2 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.8.2...v9.9.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit f65e1f6)

Includes the subsequent Gradle 9.9.1 wrapper update.
(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.
mkurz and others added 20 commits November 19, 2026 18:01
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.
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.
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.
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.9.0 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.9.0...v9.9.1)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Incorporates playframework#1756 (source commit cf12865).
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.9.0 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.9.0...v9.9.1)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Incorporates playframework#1757 (source commit 27bec0e).
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.9.0 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.9.0...v9.9.1)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Incorporates playframework#1758 (source commit b009b03).
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.9.0 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.9.0...v9.9.1)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Incorporates playframework#1760 (source commit 65941ba).
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.9.0 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.9.0...v9.9.1)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Incorporates playframework#1762 (source commit da53caa).
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.9.0 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.9.0...v9.9.1)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Incorporates playframework#1763 (source commit f8198c6).
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.9.0 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.9.0...v9.9.1)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Incorporates playframework#1764 (source commit 740a2b0).
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.9.0 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.9.0...v9.9.1)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Incorporates playframework#1766 (source commit 77c1b10).
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.9.0 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.9.0...v9.9.1)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Incorporates playframework#1767 (source commit 8c98747).
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.9.0 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.9.0...v9.9.1)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Incorporates playframework#1769 (source commit 95d2c3e).
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.9.0 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.9.0...v9.9.1)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Incorporates playframework#1770 (source commit 5ddfeee).
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.9.0 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.9.0...v9.9.1)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Incorporates playframework#1772 (source commit b9b5c8e).
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.9.0 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.9.0...v9.9.1)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Incorporates playframework#1773 (source commit 358f700).
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.9.0 to 9.9.1.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](gradle/gradle@v9.9.0...v9.9.1)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.9.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Incorporates playframework#1775 (source commit 1c09c95).
(cherry picked from commit 2eb0cc4)
@mkurz
mkurz force-pushed the consolidate-main-dependency-updates branch from cbd8368 to b064078 Compare November 19, 2026 17:08
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.

2 participants