Skip to content

Upgrade to Gradle 7.6 and Java 11#800

Merged
ejona86 merged 4 commits intogoogle:masterfrom
omarismail94:upgradeOnly
Feb 19, 2026
Merged

Upgrade to Gradle 7.6 and Java 11#800
ejona86 merged 4 commits intogoogle:masterfrom
omarismail94:upgradeOnly

Conversation

@omarismail94
Copy link
Copy Markdown
Contributor

  • Update test matrices to include Gradle 8.x (up to 8.13) and AGP 8.x versions.
  • Refactor assertJavaCompileHasProtoGeneratedDir verification in test projects to be CC compatible with Gradle 8.13+
  • Update CI workflows to use Java 17 to run tests that use AGP 8
  • Fix codenarc lint issues

TESTED: Ran ./gradlew test and it passed
First step in fixing Issue #797

@omarismail94 omarismail94 force-pushed the upgradeOnly branch 2 times, most recently from deaf902 to 1bfcd2f Compare February 13, 2026 17:09
- Update test matrices to include Gradle 8.x (up to 8.13) and AGP 8.x versions.
- Refactor `assertJavaCompileHasProtoGeneratedDir` verification in test projects to be CC compatible with Gradle 8.13+
- Update CI workflows to use Java 17 to run tests that use AGP 8
@omarismail94
Copy link
Copy Markdown
Contributor Author

@ejona86 ready for review

Copy link
Copy Markdown
Collaborator

@ejona86 ejona86 left a comment

Choose a reason for hiding this comment

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

Sending what I have. I need to stare at the assertJavaCompileHasProtoGeneratedDir changes longer.

Comment thread src/main/groovy/com/google/protobuf/gradle/GenerateProtoTask.groovy Outdated
Comment thread src/main/groovy/com/google/protobuf/gradle/GenerateProtoTask.groovy Outdated
Comment thread src/test/groovy/com/google/protobuf/gradle/ProtobufAndroidPluginTest.groovy Outdated
Comment thread README.md Outdated
Comment thread build.gradle
Comment thread build.gradle
Comment thread testProjectAndroidDependentBase/build_base.gradle
Move the verification logic into a static method within a ProtoVerifier class. This approach maintains the  the use of local closures in test.doLast, and ensures compatibility with the Gradle Configuration Cache by capturing required task outputs as providers and avoiding directproject references during execution.
Copy link
Copy Markdown
Collaborator

@ejona86 ejona86 left a comment

Choose a reason for hiding this comment

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

Looks good. Thank you so much.

Only one small change left. I'll merge after that is fixed.

Comment thread testProjectBase/build_base.gradle Outdated
@ejona86 ejona86 merged commit 82db23f into google:master Feb 19, 2026
12 checks passed
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