Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit ca6cecf

Browse files
authored
Upgrade Gradle and AGP versions to 7.5/7.2 and migrate examples/tests (#108197)
1 parent b3814c7 commit ca6cecf

File tree

22 files changed

+33
-33
lines changed

22 files changed

+33
-33
lines changed

dev/benchmarks/complex_layout/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:7.0.0'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

dev/benchmarks/macrobenchmarks/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.3'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

dev/benchmarks/microbenchmarks/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.3'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

dev/benchmarks/platform_views_layout/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.3'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.3'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

dev/benchmarks/test_apps/stocks/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.3'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

dev/integration_tests/android_views/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.3'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

dev/integration_tests/deferred_components_test/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.3'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

dev/integration_tests/flutter_gallery/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.3'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

examples/api/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
}
1111

1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:4.1.3'
13+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1414
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1515
}
1616
}

examples/flutter_view/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.3'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

examples/hello_world/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.3'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

examples/image_list/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.3'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

examples/layers/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.3'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

examples/platform_channel/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.3'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

examples/platform_view/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:4.1.3'
17+
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

packages/flutter_tools/lib/src/android/gradle_utils.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import 'android_sdk.dart';
2727
// For more information about the latest version, check:
2828
// https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
2929
// https://kotlinlang.org/docs/gradle.html#plugin-and-versions
30-
const String templateDefaultGradleVersion = '7.4';
31-
const String templateAndroidGradlePluginVersion = '7.1.2';
32-
const String templateDefaultGradleVersionForModule = '7.1.2';
33-
const String templateKotlinGradlePluginVersion = '1.6.10';
30+
const String templateDefaultGradleVersion = '7.5';
31+
const String templateAndroidGradlePluginVersion = '7.2.0';
32+
const String templateDefaultGradleVersionForModule = '7.2.0';
33+
const String templateKotlinGradlePluginVersion = '1.7.10';
3434

3535
// These versions should match the values in flutter.gradle (FlutterExtension).
3636
// 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) {
204204
if (_isWithinVersionRange(androidPluginVersion, min: '4.0.0', max: '4.1.0')) {
205205
return '6.7';
206206
}
207-
if (_isWithinVersionRange(androidPluginVersion, min: '7.0', max: '7.4')) {
208-
return '7.4';
207+
if (_isWithinVersionRange(androidPluginVersion, min: '7.0', max: '7.5')) {
208+
return '7.5';
209209
}
210210
throwToolExit('Unsupported Android Plugin version: $androidPluginVersion.');
211211
}

packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -907,10 +907,10 @@ A problem occurred evaluating project ':app'.
907907
'│ To fix this issue, replace the following content: │\n'
908908
'│ /android/build.gradle: │\n'
909909
"│ - classpath 'com.android.tools.build:gradle:<current-version>' │\n"
910-
"│ + classpath 'com.android.tools.build:gradle:7.1.2' │\n"
910+
"│ + classpath 'com.android.tools.build:gradle:7.2.0' │\n"
911911
'│ /android/gradle/wrapper/gradle-wrapper.properties: │\n'
912912
'│ - https://services.gradle.org/distributions/gradle-<current-version>-all.zip │\n'
913-
'│ + https://services.gradle.org/distributions/gradle-7.4-all.zip │\n'
913+
'│ + https://services.gradle.org/distributions/gradle-7.5-all.zip │\n'
914914
'└──────────────────────────────────────────────────────────────────────────────────┘\n'
915915
)
916916
);

packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ void main() {
357357
'gradle',
358358
label: 'gradle-expected-file-not-found',
359359
parameters: CustomDimensions.fromMap(<String, String> {
360-
'cd37': 'androidGradlePluginVersion: 7.4, fileExtension: .aab',
360+
'cd37': 'androidGradlePluginVersion: 7.5, fileExtension: .aab',
361361
}),
362362
),
363363
));

packages/flutter_tools/test/general.shard/android/gradle_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,9 +443,9 @@ flutter:
443443
expect(getGradleVersionFor('4.0.0'), '6.7');
444444
expect(getGradleVersionFor('4.1.0'), '6.7');
445445

446-
expect(getGradleVersionFor('7.0'), '7.4');
447-
expect(getGradleVersionFor('7.1.2'), '7.4');
448-
expect(getGradleVersionFor('7.2'), '7.4');
446+
expect(getGradleVersionFor('7.0'), '7.5');
447+
expect(getGradleVersionFor('7.1.2'), '7.5');
448+
expect(getGradleVersionFor('7.2'), '7.5');
449449
});
450450

451451
testWithoutContext('throws on unsupported versions', () {

packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void main() {
7373
'distributionPath=wrapper/dists\n'
7474
'zipStoreBase=GRADLE_USER_HOME\n'
7575
'zipStorePath=wrapper/dists\n'
76-
'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.4-all.zip\n');
76+
'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.5-all.zip\n');
7777
});
7878

7979
testWithoutContext('injects the wrapper when some files are missing', () {
@@ -110,7 +110,7 @@ void main() {
110110
'distributionPath=wrapper/dists\n'
111111
'zipStoreBase=GRADLE_USER_HOME\n'
112112
'zipStorePath=wrapper/dists\n'
113-
'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.4-all.zip\n');
113+
'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.5-all.zip\n');
114114
});
115115

116116
testWithoutContext('injects the wrapper and the Gradle version is derivated from the AGP version', () {

packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ void main() {
5858
final RegExp androidPluginRegExp =
5959
RegExp(r'com\.android\.tools\.build:gradle:(\d+\.\d+\.\d+)');
6060

61-
// Use AGP 4.1.0
61+
// Use AGP 7.2.0
6262
final String newBuildGradle = buildGradle.replaceAll(
63-
androidPluginRegExp, 'com.android.tools.build:gradle:4.1.0');
63+
androidPluginRegExp, 'com.android.tools.build:gradle:7.2.0');
6464
buildGradleFile.writeAsStringSync(newBuildGradle);
6565

66-
// Run flutter build apk using AGP 4.1.0
66+
// Run flutter build apk using AGP 7.2.0
6767
result = processManager.runSync(<String>[
6868
flutterBin,
6969
...getLocalEngineArguments(),

0 commit comments

Comments
 (0)