github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Gradle and AGP versions to 7.5/7.2 and migrate examples/tests (#108197)

Browse Source
This commit is contained in:
Gary Qian 2022-07-25 15:23:08 -07:00 committed by GitHub
parent b3814c7ff0
commit ca6cecf034
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/benchmarks/complex_layout/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.0.0' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
dev/benchmarks/macrobenchmarks/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
dev/benchmarks/microbenchmarks/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
dev/benchmarks/platform_views_layout/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
dev/benchmarks/test_apps/stocks/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
dev/integration_tests/android_views/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
dev/integration_tests/deferred_components_test/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
dev/integration_tests/flutter_gallery/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
examples/api/android/build.gradle
View File

@ -10,7 +10,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }

2
examples/flutter_view/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
examples/hello_world/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
examples/image_list/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
examples/layers/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
examples/platform_channel/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

2
examples/platform_view/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

12
packages/flutter_tools/lib/src/android/gradle_utils.dart
View File

@ -27,10 +27,10 @@ import 'android_sdk.dart';
// For more information about the latest version, check: // For more information about the latest version, check:
// https://developer.android.com/studio/releases/gradle-plugin#updating-gradle // https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
// https://kotlinlang.org/docs/gradle.html#plugin-and-versions // https://kotlinlang.org/docs/gradle.html#plugin-and-versions
const String templateDefaultGradleVersion = '7.4'; const String templateDefaultGradleVersion = '7.5';
const String templateAndroidGradlePluginVersion = '7.1.2'; const String templateAndroidGradlePluginVersion = '7.2.0';
const String templateDefaultGradleVersionForModule = '7.1.2'; const String templateDefaultGradleVersionForModule = '7.2.0';
const String templateKotlinGradlePluginVersion = '1.6.10'; const String templateKotlinGradlePluginVersion = '1.7.10';
// These versions should match the values in flutter.gradle (FlutterExtension). // These versions should match the values in flutter.gradle (FlutterExtension).
// The Flutter Gradle plugin is only applied to app projects, and modules that are built from source // The Flutter Gradle plugin is only applied to app projects, and modules that are built from source
@ -204,8 +204,8 @@ String getGradleVersionFor(String androidPluginVersion) {
if (_isWithinVersionRange(androidPluginVersion, min: '4.0.0', max: '4.1.0')) { if (_isWithinVersionRange(androidPluginVersion, min: '4.0.0', max: '4.1.0')) {
return '6.7'; return '6.7';
} }
if (_isWithinVersionRange(androidPluginVersion, min: '7.0', max: '7.4')) { if (_isWithinVersionRange(androidPluginVersion, min: '7.0', max: '7.5')) {
return '7.4'; return '7.5';
} }
throwToolExit('Unsupported Android Plugin version: $androidPluginVersion.'); throwToolExit('Unsupported Android Plugin version: $androidPluginVersion.');
} }

4
packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
View File

@ -907,10 +907,10 @@ A problem occurred evaluating project ':app'.
'│ To fix this issue, replace the following content: │\n' '│ To fix this issue, replace the following content: │\n'
'│ /android/build.gradle: │\n' '│ /android/build.gradle: │\n'
"│ - classpath 'com.android.tools.build:gradle:<current-version>' │\n" "│ - classpath 'com.android.tools.build:gradle:<current-version>' │\n"
"│ + classpath 'com.android.tools.build:gradle:7.1.2' │\n" "│ + classpath 'com.android.tools.build:gradle:7.2.0' │\n"
'│ /android/gradle/wrapper/gradle-wrapper.properties: │\n' '│ /android/gradle/wrapper/gradle-wrapper.properties: │\n'
'│ - https://services.gradle.org/distributions/gradle-<current-version>-all.zip │\n' '│ - https://services.gradle.org/distributions/gradle-<current-version>-all.zip │\n'
'│ + https://services.gradle.org/distributions/gradle-7.4-all.zip │\n' '│ + https://services.gradle.org/distributions/gradle-7.5-all.zip │\n'
'└──────────────────────────────────────────────────────────────────────────────────┘\n' '└──────────────────────────────────────────────────────────────────────────────────┘\n'
) )
); );

2
packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart
View File

@ -357,7 +357,7 @@ void main() {
'gradle', 'gradle',
label: 'gradle-expected-file-not-found', label: 'gradle-expected-file-not-found',
parameters: CustomDimensions.fromMap(<String, String> { parameters: CustomDimensions.fromMap(<String, String> {
'cd37': 'androidGradlePluginVersion: 7.4, fileExtension: .aab', 'cd37': 'androidGradlePluginVersion: 7.5, fileExtension: .aab',
}), }),
), ),
)); ));

6
packages/flutter_tools/test/general.shard/android/gradle_test.dart
View File

@ -443,9 +443,9 @@ flutter:
expect(getGradleVersionFor('4.0.0'), '6.7'); expect(getGradleVersionFor('4.0.0'), '6.7');
expect(getGradleVersionFor('4.1.0'), '6.7'); expect(getGradleVersionFor('4.1.0'), '6.7');
expect(getGradleVersionFor('7.0'), '7.4'); expect(getGradleVersionFor('7.0'), '7.5');
expect(getGradleVersionFor('7.1.2'), '7.4'); expect(getGradleVersionFor('7.1.2'), '7.5');
expect(getGradleVersionFor('7.2'), '7.4'); expect(getGradleVersionFor('7.2'), '7.5');
}); });
testWithoutContext('throws on unsupported versions', () { testWithoutContext('throws on unsupported versions', () {

4
packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart
View File

@ -73,7 +73,7 @@ void main() {
'distributionPath=wrapper/dists\n' 'distributionPath=wrapper/dists\n'
'zipStoreBase=GRADLE_USER_HOME\n' 'zipStoreBase=GRADLE_USER_HOME\n'
'zipStorePath=wrapper/dists\n' 'zipStorePath=wrapper/dists\n'
'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.4-all.zip\n'); 'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.5-all.zip\n');
}); });
testWithoutContext('injects the wrapper when some files are missing', () { testWithoutContext('injects the wrapper when some files are missing', () {
@ -110,7 +110,7 @@ void main() {
'distributionPath=wrapper/dists\n' 'distributionPath=wrapper/dists\n'
'zipStoreBase=GRADLE_USER_HOME\n' 'zipStoreBase=GRADLE_USER_HOME\n'
'zipStorePath=wrapper/dists\n' 'zipStorePath=wrapper/dists\n'
'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.4-all.zip\n'); 'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.5-all.zip\n');
}); });
testWithoutContext('injects the wrapper and the Gradle version is derivated from the AGP version', () { testWithoutContext('injects the wrapper and the Gradle version is derivated from the AGP version', () {

6
packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart
View File

@ -58,12 +58,12 @@ void main() {
final RegExp androidPluginRegExp = final RegExp androidPluginRegExp =
RegExp(r'com\.android\.tools\.build:gradle:(\d+\.\d+\.\d+)'); RegExp(r'com\.android\.tools\.build:gradle:(\d+\.\d+\.\d+)');
// Use AGP 4.1.0 // Use AGP 7.2.0
final String newBuildGradle = buildGradle.replaceAll( final String newBuildGradle = buildGradle.replaceAll(
androidPluginRegExp, 'com.android.tools.build:gradle:4.1.0'); androidPluginRegExp, 'com.android.tools.build:gradle:7.2.0');
buildGradleFile.writeAsStringSync(newBuildGradle); buildGradleFile.writeAsStringSync(newBuildGradle);
// Run flutter build apk using AGP 4.1.0 // Run flutter build apk using AGP 7.2.0
result = processManager.runSync(<String>[ result = processManager.runSync(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(), ...getLocalEngineArguments(),