Skip to content

Commit 8e73bab

Browse files
author
Emmanuel Garcia
authored
Migrate template to Gradle 6.7 and AGP 4.1.0 (#70808)
1 parent 1e06280 commit 8e73bab

File tree

170 files changed

+353
-746
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+353
-746
lines changed

‎dev/benchmarks/complex_layout/android/app/build.gradle‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,11 @@ apply plugin: 'com.android.application'
1919
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2020

2121
android {
22-
compileSdkVersion 29
23-
24-
lintOptions {
25-
disable 'InvalidPackage'
26-
}
22+
compileSdkVersion 30
2723

2824
defaultConfig {
2925
minSdkVersion 16
30-
targetSdkVersion 29
26+
targetSdkVersion 30
3127
versionCode 1
3228
versionName "0.0.1"
3329
}

‎dev/benchmarks/complex_layout/android/build.gradle‎

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

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.5.0'
12+
classpath 'com.android.tools.build:gradle:4.1.0'
1313
}
1414
}
1515

‎dev/benchmarks/complex_layout/android/gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
33
android.enableJetifier=true
4-
android.enableR8=true

‎dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

‎dev/benchmarks/macrobenchmarks/android/app/build.gradle‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,12 @@ apply plugin: 'com.android.application'
2929
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
3030

3131
android {
32-
compileSdkVersion 29
33-
34-
lintOptions {
35-
disable 'InvalidPackage'
36-
}
32+
compileSdkVersion 30
3733

3834
defaultConfig {
3935
applicationId "com.example.macrobenchmarks"
4036
minSdkVersion 16
41-
targetSdkVersion 29
37+
targetSdkVersion 30
4238
versionCode flutterVersionCode.toInteger()
4339
versionName flutterVersionName
4440
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

‎dev/benchmarks/macrobenchmarks/android/build.gradle‎

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

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.5.0'
12+
classpath 'com.android.tools.build:gradle:4.1.0'
1313
}
1414
}
1515

‎dev/benchmarks/macrobenchmarks/android/gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
33
android.enableJetifier=true
4-
android.enableR8=true

‎dev/benchmarks/macrobenchmarks/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

‎dev/benchmarks/microbenchmarks/android/app/build.gradle‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,11 @@ apply plugin: 'com.android.application'
1919
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2020

2121
android {
22-
compileSdkVersion 29
23-
24-
lintOptions {
25-
disable 'InvalidPackage'
26-
}
22+
compileSdkVersion 30
2723

2824
defaultConfig {
2925
minSdkVersion 16
30-
targetSdkVersion 29
26+
targetSdkVersion 30
3127
versionCode 1
3228
versionName "0.0.1"
3329
}

‎dev/benchmarks/microbenchmarks/android/build.gradle‎

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

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.5.0'
12+
classpath 'com.android.tools.build:gradle:4.1.0'
1313
}
1414
}
1515

0 commit comments

Comments
 (0)