Skip to content

[tool] Change gradle-check logic to enforce alignment of java versions and a minimum (17) #10206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 17 commits into from
Oct 22, 2025
Merged

[tool] Change gradle-check logic to enforce alignment of java versions and a minimum (17) #10206

merged 17 commits into from
Oct 22, 2025
+151 −17

Conversation

reidbaker
Copy link
Contributor

@reidbaker reidbaker commented Oct 10, 2025 •
edited
Loading

Hold review/merge until #10201 has merged.
This pr is code review feedback from #10201 (comment)

  • Update gradle-check to support minimum java version and validating java version alignment

Pre-Review Checklist

  • I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
  • I read the [Tree Hygiene] page, which explains my responsibilities.
  • I read and followed the [relevant style guides] and ran [the auto-formatter].
  • I signed the [CLA].
  • The title of the PR starts with the name of the package surrounded by square brackets, e.g. [shared_preferences]
  • I [linked to at least one issue that this PR fixes] in the description above.
  • I updated pubspec.yaml with an appropriate new version according to the [pub versioning philosophy], or I have commented below to indicate which [version change exemption] this PR falls under[^1].
  • I updated CHANGELOG.md to add a description of the change, [following repository CHANGELOG style], or I have commented below to indicate which [CHANGELOG exemption] this PR falls under[^1].
  • I updated/added any relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making, or I have commented below to indicate which [test exemption] this PR falls under[^1].
  • All existing and new tests are passing.

@github-actions github-actions bot removed the p: interactive_media_ads Plugin for IMA SDK label Oct 14, 2025
@reidbaker reidbaker marked this pull request as ready for review October 14, 2025 18:33
@gmackall gmackall changed the title [tool] Change gradle-check logic to enforce alignemnt of java versions and a minimum (17) [tool] Change gradle-check logic to enforce alignment of java versions and a minimum (17) Oct 14, 2025
stuartmorgan-g
stuartmorgan-g approved these changes Oct 15, 2025
View reviewed changes
Copy link
Collaborator

@stuartmorgan-g stuartmorgan-g left a comment

Choose a reason for hiding this comment

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

LGTM.

I have an optional suggestion for restructuring; feel free to ignore it if you disagree that it's simpler.

script/tool/lib/src/gradle_check_command.dart Outdated
'$indentation${minimumJavaVersionError.split('\n').join('\n$indentation')}');
return false;
}
if (!javaVersions.every((String element) => element == '$version')) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

I would strongly prefer making this the first check instead of the second, since if you don't already know there's going to be a check that they all match, the check above that only the first element is the right version seems wrong.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah I can make this change :) standby

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Copy link
Collaborator

Choose a reason for hiding this comment

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

It's still second; I would put this before line 465's check.

stuartmorgan-g
stuartmorgan-g approved these changes Oct 21, 2025
View reviewed changes
Copy link
Collaborator

@stuartmorgan-g stuartmorgan-g left a comment

Choose a reason for hiding this comment

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

Still LGTM.

script/tool/lib/src/gradle_check_command.dart Outdated
'$indentation${minimumJavaVersionError.split('\n').join('\n$indentation')}');
return false;
}
if (!javaVersions.every((String element) => element == '$version')) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

It's still second; I would put this before line 465's check.

@reidbaker
Copy link
Contributor Author

@stuartmorgan-g I misunderstood what ordering you wanted changed in. I thought you wanted the alignment and minimum checks to happen before the namespace and other checks.

Changed to validate alignment before value and fixed a test setup that failed as a result.

@reidbaker reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 22, 2025
@auto-submit auto-submit bot merged commit e04b6e4 into flutter:main Oct 22, 2025
80 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 22, 2025
@engine-flutter-autoroll
e04b6e410 [tool] Change gradle-check logic to enforce alignment of ja…
3fa5dc8 
…va versions and a minimum (17) (flutter/packages#10206)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Oct 22, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 22, 2025
@engine-flutter-autoroll
e04b6e410 [tool] Change gradle-check logic to enforce alignment of ja…
060888c 
…va versions and a minimum (17) (flutter/packages#10206)
This was referenced Oct 22, 2025
Closed
Open
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 23, 2025
@engine-flutter-autoroll
e04b6e410 [tool] Change gradle-check logic to enforce alignment of ja…
c6c55e8 
…va versions and a minimum (17) (flutter/packages#10206)
github-merge-queue bot pushed a commit to flutter/flutter that referenced this pull request Oct 23, 2025
@engine-flutter-autoroll
Roll Packages from d113bbc1107e to 9ec29b6d23e7 (12 revisions) (#177455)
63a925f 
flutter/packages@d113bbc...9ec29b6

2025-10-22 omar_hanafy@icloud.com [go_router] Support for top level
`onEnter` callback. (flutter/packages#8339)
2025-10-22 katelovett@google.com [go_router_builder] Ignore experimental
features (flutter/packages#10275)
2025-10-22 engine-flutter-autoroll@skia.org Roll Flutter from
2d34167 to 75004a6 (39 revisions) (flutter/packages#10279)
2025-10-22 47866232+chunhtai@users.noreply.github.com [ci]Adds mechanism
for packages to opt in to batched release (flutter/packages#10237)
2025-10-22 1063596+reidbaker@users.noreply.github.com [tool] Change
gradle-check logic to enforce alignment of java versions and a minimum
(17) (flutter/packages#10206)
2025-10-22 eternalkaif@gmail.com [various] Migrate example Radio groups
to new RadioGroup API (flutter/packages#10155)
2025-10-22 davidmartos96@gmail.com [mustache_template] Emoji support
(flutter/packages#10110)
2025-10-22 38378650+hgraceb@users.noreply.github.com [image_picker] Fix
typos in error messages for android (flutter/packages#10188)
2025-10-22 38378650+hgraceb@users.noreply.github.com [image_picker] Fix
typos in error messages for platform interface (flutter/packages#10211)
2025-10-21 robert.odrowaz@leancode.pl [camera_avfoundation] Wrappers
swift migration - part 1 (flutter/packages#10119)
2025-10-21 NearTox@outlook.com [go_router_builder] expand supported
versions of analyzer, build and source_gen (flutter/packages#10078)
2025-10-20 engine-flutter-autoroll@skia.org Roll Flutter from
891d7d5 to 2d34167 (18 revisions) (flutter/packages#10268)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages-flutter-autoroll
Please CC flutter-ecosystem@google.com on the revert to ensure that a
human
is aware of the problem.

To file a bug in Flutter:
https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@stuartmorgan-g stuartmorgan-g stuartmorgan-g approved these changes

+1 more reviewer

@gemini-code-assist gemini-code-assist[bot] gemini-code-assist[bot] left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

autosubmit Merge PR when tree becomes green via auto submit App

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@reidbaker @stuartmorgan-g