flutter/packages
1
0
Fork 0
mirror of https://github.com/flutter/packages.git synced 2025-08-14 01:43:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

[various] Update Java compatibility version to 11 (#7795)

Browse Source 
Now that `stable` requires AGP 7.0, which in turn requires Java 11+, we should be able to set our compatibility version to 11 (setting the min Flutter SDK version to current stable).

Also removes the gradle conditionals for setting namespace (and the repo tool checks that it is present), as that was only needed for AGP 4.1 compatibility.

Part of https://github.com/flutter/flutter/issues/156111
This commit is contained in:
stuartmorgan
2024-10-05 05:06:33 -07:00
committed by GitHub
parent aa741d164c
commit 4afc383a6d
84 changed files with 250 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
script/tool/lib/src/gradle_check_command.dart
View File

@ -298,31 +298,13 @@ apply plugin: "com.google.cloud.artifactregistry.gradle-plugin"
final RegExpMatch? namespaceMatch =
namespaceRegex.firstMatch(gradleContents);
// For plugins, make sure the namespace is conditionalized so that it
// doesn't break client apps using AGP 4.1 and earlier (which don't have
// a namespace property, and will fail to build if it's set).
const String namespaceConditional =
'if (project.android.hasProperty("namespace"))';
String exampleSetNamespace = "namespace 'dev.flutter.foo'";
if (!isExample) {
exampleSetNamespace = '''
$namespaceConditional {
$exampleSetNamespace
}''';
}
// Wrap the namespace command in an `android` block, adding the indentation
// to make it line up correctly.
final String exampleAndroidNamespaceBlock = '''
android {
${exampleSetNamespace.split('\n').join('\n ')}
}
''';
if (namespaceMatch == null) {
final String errorMessage = '''
const String errorMessage = '''
build.gradle must set a "namespace":
$exampleAndroidNamespaceBlock
android {
namespace 'dev.flutter.foo'
}
The value must match the "package" attribute in AndroidManifest.xml, if one is
present. For more information, see:
@ -333,18 +315,6 @@ https://developer.android.com/build/publish-library/prep-lib-release#choose-name
'$indentation${errorMessage.split('\n').join('\n$indentation')}');
return false;
} else {
if (!isExample && !gradleContents.contains(namespaceConditional)) {
final String errorMessage = '''
build.gradle for a plugin must conditionalize "namespace":
$exampleAndroidNamespaceBlock
''';
printError(
'$indentation${errorMessage.split('\n').join('\n$indentation')}');
return false;
}
return _validateNamespaceMatchesManifest(package,
isExample: isExample, namespace: namespaceMatch.group(1)!);
}
@ -398,15 +368,15 @@ build.gradle must set an explicit Java compatibility version.
This can be done either via "sourceCompatibility"/"targetCompatibility":
android {
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
}
or "toolchain":
java {
toolchain {
languageVersion = JavaLanguageVersion.of(8)
languageVersion = JavaLanguageVersion.of(11)
}
}