Skip to content

Upgrade protobuf Gradle plugin to 0.10.0 across all modules#11310

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 2 commits into
masterfrom
bdu/bump-proto-plugin-to-0.10.0
May 11, 2026
Merged

Upgrade protobuf Gradle plugin to 0.10.0 across all modules#11310
gh-worker-dd-mergequeue-cf854d[bot] merged 2 commits into
masterfrom
bdu/bump-proto-plugin-to-0.10.0

Conversation

@bric3
Copy link
Copy Markdown
Contributor

@bric3 bric3 commented May 7, 2026

What Does This Do

Aligns all 8 usages from 0.8.18/0.9.3/0.9.4 to 0.10.0 as part of Gradle 9 preparation. Also fixes related Gradle 9 incompatibilities:

  • Replace deprecated $buildDir with layout.buildDirectory.dir() and fix the generated source path (source -> sources)
  • Replace eager spread-operator *.plugins {} with lazy configureEach
  • Remove redundant legacy buildscript { classpath } block in armeria-grpc/application

Motivation

Prepare Gradle 9
Improve build quality

Additional Notes

Sub-PR from #10402, #11272

Aligns all 8 usages from 0.8.18/0.9.3/0.9.4 to 0.10.0 as part of
Gradle 9 preparation. Also fixes related Gradle 9 incompatibilities:

* Replace deprecated `$buildDir` with `layout.buildDirectory.dir()`
  and fix the generated source path (source -> sources)
* Replace eager spread-operator `*.plugins {}` with lazy `configureEach`
* Remove redundant legacy `buildscript { classpath }` block in
  armeria-grpc/application
@bric3 bric3 requested review from a team as code owners May 7, 2026 19:32
@bric3 bric3 added tag: no release notes Changes to exclude from release notes comp: tooling Build & Tooling labels May 7, 2026
@bric3 bric3 changed the title build: Upgrade protobuf Gradle plugin to 0.10.0 across all modules Upgrade protobuf Gradle plugin to 0.10.0 across all modules May 7, 2026
Comment on lines 37 to 43
sourceSets {
test {
java {
srcDir "$buildDir/generated/source/proto/test/java"
srcDir layout.buildDirectory.dir("generated/sources/proto/test/java")
}
}
}
Copy link
Copy Markdown
Contributor

@AlexeyKuznetsov-DD AlexeyKuznetsov-DD May 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build failed and Clude suggested to delete this block completely:

The protobuf 0.8.18 plugin (pre-upgrade) didn't auto-add the directory, so the manual addition was needed.
Plugin 0.10.0 does it for you — keeping the manual line on top of it actively breaks the wiring.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forgot this one, fixed in #11343

Copy link
Copy Markdown
Contributor

@AlexeyKuznetsov-DD AlexeyKuznetsov-DD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but couple of jobs failed on CI, should be easy to fix.

…e chain

The `srcDirs +=` assignment discards the lazy task-dependency wiring
that protobuf plugin 0.10.0 establishes between `generateTestProto` and
`compileTestJava`, causing `compileTestGroovy` to miss Test2, Test3 on
**clean builds**. Now that the plugin auto-registers generated sources;
the block can go away.
@bric3 bric3 added this pull request to the merge queue May 11, 2026
@dd-octo-sts
Copy link
Copy Markdown
Contributor

dd-octo-sts Bot commented May 11, 2026

/merge

@gh-worker-devflow-routing-ef8351
Copy link
Copy Markdown

gh-worker-devflow-routing-ef8351 Bot commented May 11, 2026

View all feedbacks in Devflow UI.

2026-05-11 10:15:08 UTC ℹ️ Start processing command /merge


2026-05-11 10:15:12 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).


2026-05-11 11:28:43 UTC ℹ️ MergeQueue: This merge request was merged

@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 11, 2026
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot merged commit 10e03bd into master May 11, 2026
755 of 757 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot deleted the bdu/bump-proto-plugin-to-0.10.0 branch May 11, 2026 11:28
@github-actions github-actions Bot added this to the 1.63.0 milestone May 11, 2026
gh-worker-dd-mergequeue-cf854d Bot pushed a commit that referenced this pull request May 11, 2026
…ion (#11343)

build(gradle): remove redundant sourceSets block in protobuf-3.0

Plugin 0.10.0 automatically registers generated proto sources into the
corresponding source sets. The manual srcDir addition was required for
plugin 0.8.18 but is now redundant — keeping it on top of the plugin's
own wiring actively breaks source set registration (review comment on #11310).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

type: EOF

Co-authored-by: brice.dutheil <brice.dutheil@datadoghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

comp: tooling Build & Tooling tag: no release notes Changes to exclude from release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants