Skip to content

Commit 61c6c29

Browse files
author
Emmanuel Garcia
authored
Migrate examples and tests to AndroidX (flutter#41251)
1 parent cc3ca9a commit 61c6c29

File tree

61 files changed

+160
-112
lines changed

Some content is hidden

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

61 files changed

+160
-112
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
targetSdkVersion 28
2727
versionCode 1
2828
versionName "0.0.1"
29-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
29+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3030
}
3131

3232
buildTypes {
@@ -52,6 +52,6 @@ flutter {
5252

5353
dependencies {
5454
testImplementation 'junit:junit:4.12'
55-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
56-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
55+
androidTestImplementation 'androidx.test:runner:1.1.1'
56+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
5757
}

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

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ android {
3737
targetSdkVersion 28
3838
versionCode flutterVersionCode.toInteger()
3939
versionName flutterVersionName
40-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
40+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4141
}
4242

4343
buildTypes {
@@ -54,6 +54,6 @@ flutter {
5454

5555
dependencies {
5656
testImplementation 'junit:junit:4.12'
57-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
58-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
57+
androidTestImplementation 'androidx.test:runner:1.1.1'
58+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
5959
}

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

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
targetSdkVersion 28
2727
versionCode 1
2828
versionName "0.0.1"
29-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
29+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3030
}
3131

3232
buildTypes {
@@ -44,6 +44,6 @@ flutter {
4444

4545
dependencies {
4646
testImplementation 'junit:junit:4.12'
47-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
48-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
47+
androidTestImplementation 'androidx.test:runner:1.1.1'
48+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
4949
}

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

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

‎dev/integration_tests/android_host_app/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
2-
32
android.useAndroidX=true
43
android.enableJetifier=true

‎dev/integration_tests/android_semantics_testing/android/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
targetSdkVersion 28
2727
versionCode 1
2828
versionName "0.0.1"
29-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
29+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3030
}
3131

3232
buildTypes {
@@ -52,6 +52,6 @@ flutter {
5252

5353
dependencies {
5454
testImplementation 'junit:junit:4.12'
55-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
56-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
55+
androidTestImplementation 'androidx.test:runner:1.1.1'
56+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
5757
}

‎dev/integration_tests/android_semantics_testing/android/gradle.properties‎

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

‎dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/android/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
targetSdkVersion 28
3939
versionCode flutterVersionCode.toInteger()
4040
versionName flutterVersionName
41-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
41+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4242
}
4343

4444
buildTypes {
@@ -60,6 +60,6 @@ dependencies {
6060
implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01'
6161

6262
testImplementation 'junit:junit:4.12'
63-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
64-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
63+
androidTestImplementation 'androidx.test:runner:1.1.1'
64+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
6565
}

0 commit comments

Comments
 (0)