Skip to content

[Many] Migrate non examples (and pigeon test) to java 17 #10201

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

Merged
auto-submit merged 14 commits into from
Oct 14, 2025
Merged

[Many] Migrate non examples (and pigeon test) to java 17 #10201

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
071f1d5
Update tooling to enforce java 17 compile options and kotlinOptions
reidbaker Oct 9, 2025
d2069f0
Update interactive_media_ads and camera_android
reidbaker Oct 9, 2025
50b804a
Merge branch 'main' into i176027_attempt_4_non_examples
reidbaker Oct 9, 2025
164f7b2
Update compileOptions to java 17
reidbaker Oct 9, 2025
fd45002
Update changelog and pubspec for modified packages
reidbaker Oct 9, 2025
44c074e
Fix pigeon example
reidbaker Oct 9, 2025
5ec1943
Update changelog and pubspec for versions that did not need flutter o…
reidbaker Oct 9, 2025
a366555
Format packages that were updated with new dart version
reidbaker Oct 9, 2025
33dbb85
Format toolig
reidbaker Oct 9, 2025
cbb7daf
bump interactive_media_ads min flutter version
reidbaker Oct 10, 2025
927d508
update formatting for ima
reidbaker Oct 10, 2025
80b4dc7
Merge branch 'main' into i176027_attempt_4_non_examples
reidbaker Oct 13, 2025
a417381
Remove unused @Mock, error behavior throw npe when opening mocks
reidbaker Oct 13, 2025
a0c885a
Merge branch 'main' into i176027_attempt_4_non_examples
reidbaker Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Format toolig
  • Loading branch information
@reidbaker
reidbaker committed Oct 9, 2025
commit 33dbb858e015103668188da10d14ed3f28f4011f
18 changes: 13 additions & 5 deletions script/tool/lib/src/gradle_check_command.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,14 +360,18 @@ build.gradle "namespace" must match the "package" attribute in AndroidManifest.x
final bool hasLanguageVersion = gradleLines.any((String line) =>
line.contains('languageVersion') && !_isCommented(line));
final bool hasCompabilityVersions = gradleLines.any((String line) =>
line.contains('sourceCompatibility = JavaVersion.VERSION_$requiredJavaVersion') && !_isCommented(line)) &&
line.contains(
'sourceCompatibility = JavaVersion.VERSION_$requiredJavaVersion') &&
!_isCommented(line)) &&
// Newer toolchains default targetCompatibility to the same value as
// sourceCompatibility, but older toolchains require it to be set
// explicitly. The exact version cutoff (and of which piece of the
// toolchain; likely AGP) is unknown; for context see
// https://github.com/flutter/flutter/issues/125482
gradleLines.any((String line) =>
line.contains('targetCompatibility = JavaVersion.VERSION_$requiredJavaVersion') && !_isCommented(line));
line.contains(
'targetCompatibility = JavaVersion.VERSION_$requiredJavaVersion') &&
!_isCommented(line));
if (!hasLanguageVersion && !hasCompabilityVersions) {
const String javaErrorMessage = '''
build.gradle(.kts) must set an explicit Java compatibility version.
Copy link
Collaborator

@stuartmorgan-g stuartmorgan-g Oct 10, 2025

Choose a reason for hiding this comment

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

I think this should say "must set an explicit Java compatibility version of $requiredJavaVersion."

With the updated check, someone who adds an incorrect compatibility version will get an error message that just says that they need to set an explicit version, which they did, so it will be confusing.

Expand Down Expand Up @@ -395,7 +399,8 @@ for more details.''';
'$indentation${javaErrorMessage.split('\n').join('\n$indentation')}');
return false;
}
bool isKotlinOptions(String line) => line.contains('kotlinOptions') && !_isCommented(line);
bool isKotlinOptions(String line) =>
line.contains('kotlinOptions') && !_isCommented(line);
final bool hasKotlinOptions = gradleLines.any(isKotlinOptions);
final bool kotlinOptionsUsesJavaVersion = gradleLines.any((String line) =>
line.contains('jvmTarget = JavaVersion.VERSION_$requiredJavaVersion') &&
Expand All @@ -404,8 +409,11 @@ for more details.''';
if (hasKotlinOptions && !kotlinOptionsUsesJavaVersion) {
// Bad lines contains the first 4 lines including the kotlinOptions section.
String badLines = '';
final int startIndex = gradleLines.indexOf(gradleLines.firstWhere(isKotlinOptions));
for(int i = startIndex; i < math.min(startIndex + 4, gradleLines.length); i++) {
final int startIndex =
gradleLines.indexOf(gradleLines.firstWhere(isKotlinOptions));
for (int i = startIndex;
i < math.min(startIndex + 4, gradleLines.length);
i++) {
badLines += '${gradleLines[i]}\n';
}
final String kotlinErrorMessage = '''
Expand Down