diff --git a/dev/benchmarks/complex_layout/android/app/build.gradle b/dev/benchmarks/complex_layout/android/app/build.gradle index 3ed4b231c65..4c646465930 100644 --- a/dev/benchmarks/complex_layout/android/app/build.gradle +++ b/dev/benchmarks/complex_layout/android/app/build.gradle @@ -30,7 +30,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "0.0.1" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -53,9 +52,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/dev/benchmarks/macrobenchmarks/android/app/build.gradle b/dev/benchmarks/macrobenchmarks/android/app/build.gradle index 56558a55fda..caa5acfc5a6 100644 --- a/dev/benchmarks/macrobenchmarks/android/app/build.gradle +++ b/dev/benchmarks/macrobenchmarks/android/app/build.gradle @@ -41,7 +41,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -55,9 +54,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/dev/benchmarks/microbenchmarks/android/app/build.gradle b/dev/benchmarks/microbenchmarks/android/app/build.gradle index 12975dbc90b..b3b148868c9 100644 --- a/dev/benchmarks/microbenchmarks/android/app/build.gradle +++ b/dev/benchmarks/microbenchmarks/android/app/build.gradle @@ -30,7 +30,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "0.0.1" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -45,9 +44,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/dev/benchmarks/test_apps/stocks/android/app/build.gradle b/dev/benchmarks/test_apps/stocks/android/app/build.gradle index 160ac2dab5a..34bf0c01235 100644 --- a/dev/benchmarks/test_apps/stocks/android/app/build.gradle +++ b/dev/benchmarks/test_apps/stocks/android/app/build.gradle @@ -41,7 +41,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -56,9 +55,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/dev/integration_tests/abstract_method_smoke_test/android/app/build.gradle b/dev/integration_tests/abstract_method_smoke_test/android/app/build.gradle index e3715e4298c..d0f73f3b638 100644 --- a/dev/integration_tests/abstract_method_smoke_test/android/app/build.gradle +++ b/dev/integration_tests/abstract_method_smoke_test/android/app/build.gradle @@ -52,7 +52,6 @@ android { targetSdkVersion 29 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/dev/integration_tests/android_embedding_v2_smoke_test/android/app/build.gradle b/dev/integration_tests/android_embedding_v2_smoke_test/android/app/build.gradle index 98fcf9f94c0..e23700480cc 100644 --- a/dev/integration_tests/android_embedding_v2_smoke_test/android/app/build.gradle +++ b/dev/integration_tests/android_embedding_v2_smoke_test/android/app/build.gradle @@ -47,7 +47,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -65,7 +64,4 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } diff --git a/dev/integration_tests/android_host_app/app/build.gradle b/dev/integration_tests/android_host_app/app/build.gradle index 8c82de774a5..5c63a09a534 100644 --- a/dev/integration_tests/android_host_app/app/build.gradle +++ b/dev/integration_tests/android_host_app/app/build.gradle @@ -18,7 +18,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } } diff --git a/dev/integration_tests/android_host_app_v2_embedding/app/build.gradle b/dev/integration_tests/android_host_app_v2_embedding/app/build.gradle index 5110c1bb468..4a7efed235e 100644 --- a/dev/integration_tests/android_host_app_v2_embedding/app/build.gradle +++ b/dev/integration_tests/android_host_app_v2_embedding/app/build.gradle @@ -18,7 +18,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } } diff --git a/dev/integration_tests/android_semantics_testing/android/app/build.gradle b/dev/integration_tests/android_semantics_testing/android/app/build.gradle index d2616e650ef..02672602b35 100644 --- a/dev/integration_tests/android_semantics_testing/android/app/build.gradle +++ b/dev/integration_tests/android_semantics_testing/android/app/build.gradle @@ -30,7 +30,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "0.0.1" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -53,9 +52,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/android/app/build.gradle b/dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/android/app/build.gradle index 97268f1e0b3..254bf3bc662 100644 --- a/dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/android/app/build.gradle +++ b/dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/android/app/build.gradle @@ -42,7 +42,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -62,8 +61,4 @@ dependencies { implementation 'androidx.fragment:fragment:1.1.0-beta01' implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0-alpha01' implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01' - - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } diff --git a/dev/integration_tests/android_splash_screens/splash_screen_load_rotate/android/app/build.gradle b/dev/integration_tests/android_splash_screens/splash_screen_load_rotate/android/app/build.gradle index 765722472ff..c1718b27990 100644 --- a/dev/integration_tests/android_splash_screens/splash_screen_load_rotate/android/app/build.gradle +++ b/dev/integration_tests/android_splash_screens/splash_screen_load_rotate/android/app/build.gradle @@ -42,7 +42,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -62,8 +61,4 @@ dependencies { implementation 'androidx.fragment:fragment:1.1.0-beta01' implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0-alpha01' implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01' - - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } diff --git a/dev/integration_tests/android_splash_screens/splash_screen_trans_rotate/android/app/build.gradle b/dev/integration_tests/android_splash_screens/splash_screen_trans_rotate/android/app/build.gradle index 6d2c11670d4..76d23b5a13c 100644 --- a/dev/integration_tests/android_splash_screens/splash_screen_trans_rotate/android/app/build.gradle +++ b/dev/integration_tests/android_splash_screens/splash_screen_trans_rotate/android/app/build.gradle @@ -42,7 +42,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -62,8 +61,4 @@ dependencies { implementation 'androidx.fragment:fragment:1.1.0-beta01' implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0-alpha01' implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01' - - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } diff --git a/dev/integration_tests/android_views/android/app/build.gradle b/dev/integration_tests/android_views/android/app/build.gradle index 3533a606514..07e46ac0113 100644 --- a/dev/integration_tests/android_views/android/app/build.gradle +++ b/dev/integration_tests/android_views/android/app/build.gradle @@ -42,7 +42,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -57,9 +56,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/dev/integration_tests/channels/android/app/build.gradle b/dev/integration_tests/channels/android/app/build.gradle index d2616e650ef..02672602b35 100644 --- a/dev/integration_tests/channels/android/app/build.gradle +++ b/dev/integration_tests/channels/android/app/build.gradle @@ -30,7 +30,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "0.0.1" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -53,9 +52,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/dev/integration_tests/codegen/android/app/build.gradle b/dev/integration_tests/codegen/android/app/build.gradle index d2616e650ef..02672602b35 100644 --- a/dev/integration_tests/codegen/android/app/build.gradle +++ b/dev/integration_tests/codegen/android/app/build.gradle @@ -30,7 +30,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "0.0.1" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -53,9 +52,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/dev/integration_tests/external_ui/android/app/build.gradle b/dev/integration_tests/external_ui/android/app/build.gradle index 6634cbd0bfc..65748f75438 100644 --- a/dev/integration_tests/external_ui/android/app/build.gradle +++ b/dev/integration_tests/external_ui/android/app/build.gradle @@ -31,7 +31,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -44,9 +43,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/dev/integration_tests/flavors/android/app/build.gradle b/dev/integration_tests/flavors/android/app/build.gradle index bd9b91a3a7a..99d51e7fd59 100644 --- a/dev/integration_tests/flavors/android/app/build.gradle +++ b/dev/integration_tests/flavors/android/app/build.gradle @@ -31,7 +31,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -59,9 +58,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/dev/integration_tests/flutter_driver_screenshot_test/android/app/build.gradle b/dev/integration_tests/flutter_driver_screenshot_test/android/app/build.gradle index 09851727225..6c9a828dab2 100644 --- a/dev/integration_tests/flutter_driver_screenshot_test/android/app/build.gradle +++ b/dev/integration_tests/flutter_driver_screenshot_test/android/app/build.gradle @@ -47,7 +47,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -65,7 +64,4 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } diff --git a/dev/integration_tests/image_loading/android/app/bin/build.gradle b/dev/integration_tests/image_loading/android/app/bin/build.gradle index d2616e650ef..02672602b35 100644 --- a/dev/integration_tests/image_loading/android/app/bin/build.gradle +++ b/dev/integration_tests/image_loading/android/app/bin/build.gradle @@ -30,7 +30,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "0.0.1" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -53,9 +52,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/dev/integration_tests/image_loading/android/app/build.gradle b/dev/integration_tests/image_loading/android/app/build.gradle index d2616e650ef..02672602b35 100644 --- a/dev/integration_tests/image_loading/android/app/build.gradle +++ b/dev/integration_tests/image_loading/android/app/build.gradle @@ -30,7 +30,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "0.0.1" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -53,9 +52,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/dev/integration_tests/module_host_with_custom_build/app/build.gradle b/dev/integration_tests/module_host_with_custom_build/app/build.gradle index c1bd0318f3f..59ef7001817 100644 --- a/dev/integration_tests/module_host_with_custom_build/app/build.gradle +++ b/dev/integration_tests/module_host_with_custom_build/app/build.gradle @@ -16,7 +16,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } // Test build types. buildTypes { diff --git a/dev/integration_tests/module_host_with_custom_build_v2_embedding/app/build.gradle b/dev/integration_tests/module_host_with_custom_build_v2_embedding/app/build.gradle index 11c3bc0cff1..3825dfec3e6 100644 --- a/dev/integration_tests/module_host_with_custom_build_v2_embedding/app/build.gradle +++ b/dev/integration_tests/module_host_with_custom_build_v2_embedding/app/build.gradle @@ -16,7 +16,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } // Test build types. buildTypes { diff --git a/dev/integration_tests/named_isolates/android/app/build.gradle b/dev/integration_tests/named_isolates/android/app/build.gradle index 5a96f03d0f1..d1e48651087 100644 --- a/dev/integration_tests/named_isolates/android/app/build.gradle +++ b/dev/integration_tests/named_isolates/android/app/build.gradle @@ -31,7 +31,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "0.0.1" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -50,7 +49,4 @@ flutter { dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.android.material:material:1.0.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } diff --git a/dev/integration_tests/platform_interaction/android/app/build.gradle b/dev/integration_tests/platform_interaction/android/app/build.gradle index d2616e650ef..02672602b35 100644 --- a/dev/integration_tests/platform_interaction/android/app/build.gradle +++ b/dev/integration_tests/platform_interaction/android/app/build.gradle @@ -30,7 +30,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "0.0.1" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -53,9 +52,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/dev/integration_tests/release_smoke_test/android/app/build.gradle b/dev/integration_tests/release_smoke_test/android/app/build.gradle index 41f8be36894..54e70dcce08 100644 --- a/dev/integration_tests/release_smoke_test/android/app/build.gradle +++ b/dev/integration_tests/release_smoke_test/android/app/build.gradle @@ -59,7 +59,7 @@ flutter { } dependencies { - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13' androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } diff --git a/dev/integration_tests/ui/android/app/build.gradle b/dev/integration_tests/ui/android/app/build.gradle index 5f0609d5677..c253412bcb5 100644 --- a/dev/integration_tests/ui/android/app/build.gradle +++ b/dev/integration_tests/ui/android/app/build.gradle @@ -30,7 +30,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -45,9 +44,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/dev/manual_tests/android/app/build.gradle b/dev/manual_tests/android/app/build.gradle index 09ea58ea274..5f6b28f6294 100644 --- a/dev/manual_tests/android/app/build.gradle +++ b/dev/manual_tests/android/app/build.gradle @@ -47,7 +47,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -65,7 +64,4 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } diff --git a/examples/catalog/android/app/build.gradle b/examples/catalog/android/app/build.gradle index 041cb565beb..f6cb9535c24 100644 --- a/examples/catalog/android/app/build.gradle +++ b/examples/catalog/android/app/build.gradle @@ -41,7 +41,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -56,9 +55,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/examples/flutter_gallery/android/app/build.gradle b/examples/flutter_gallery/android/app/build.gradle index 3070d8cd489..4df3bb8beaa 100644 --- a/examples/flutter_gallery/android/app/build.gradle +++ b/examples/flutter_gallery/android/app/build.gradle @@ -77,7 +77,7 @@ flutter { } dependencies { - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13' androidTestImplementation 'androidx.test:rules:1.1.1' androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' diff --git a/examples/flutter_view/android/app/build.gradle b/examples/flutter_view/android/app/build.gradle index da61c8f6925..e865d01267d 100644 --- a/examples/flutter_view/android/app/build.gradle +++ b/examples/flutter_view/android/app/build.gradle @@ -41,7 +41,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -60,7 +59,4 @@ flutter { dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.android.material:material:1.0.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } diff --git a/examples/hello_world/android/app/build.gradle b/examples/hello_world/android/app/build.gradle index abf5774884d..b2c9c5e35b9 100644 --- a/examples/hello_world/android/app/build.gradle +++ b/examples/hello_world/android/app/build.gradle @@ -41,7 +41,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -56,9 +55,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/examples/image_list/android/app/build.gradle b/examples/image_list/android/app/build.gradle index 4608e284059..af898cfcd71 100644 --- a/examples/image_list/android/app/build.gradle +++ b/examples/image_list/android/app/build.gradle @@ -42,7 +42,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -57,9 +56,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/examples/layers/android/app/build.gradle b/examples/layers/android/app/build.gradle index 1de2e0e047a..a158bbb7b89 100644 --- a/examples/layers/android/app/build.gradle +++ b/examples/layers/android/app/build.gradle @@ -41,7 +41,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -56,9 +55,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} diff --git a/examples/platform_channel/android/app/build.gradle b/examples/platform_channel/android/app/build.gradle index 8e5e5476cf1..482a8953d8b 100644 --- a/examples/platform_channel/android/app/build.gradle +++ b/examples/platform_channel/android/app/build.gradle @@ -58,7 +58,7 @@ flutter { } dependencies { - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13' androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } diff --git a/examples/platform_view/android/app/build.gradle b/examples/platform_view/android/app/build.gradle index e15e49ec5ff..f8b44bfaea1 100644 --- a/examples/platform_view/android/app/build.gradle +++ b/examples/platform_view/android/app/build.gradle @@ -41,7 +41,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { @@ -60,7 +59,4 @@ flutter { dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.android.material:material:1.0.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } diff --git a/packages/flutter_tools/templates/app/android-java.tmpl/app/build.gradle.tmpl b/packages/flutter_tools/templates/app/android-java.tmpl/app/build.gradle.tmpl index f550e3ce41a..f6388b42544 100644 --- a/packages/flutter_tools/templates/app/android-java.tmpl/app/build.gradle.tmpl +++ b/packages/flutter_tools/templates/app/android-java.tmpl/app/build.gradle.tmpl @@ -38,12 +38,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - {{#androidX}} - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - {{/androidX}} - {{^androidX}} - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - {{/androidX}} } buildTypes { @@ -58,15 +52,3 @@ android { flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' - {{#androidX}} - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' - {{/androidX}} - {{^androidX}} - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' - {{/androidX}} -} diff --git a/packages/flutter_tools/templates/app/android-kotlin.tmpl/app/build.gradle.tmpl b/packages/flutter_tools/templates/app/android-kotlin.tmpl/app/build.gradle.tmpl index cee012e78d3..c8ff73db775 100644 --- a/packages/flutter_tools/templates/app/android-kotlin.tmpl/app/build.gradle.tmpl +++ b/packages/flutter_tools/templates/app/android-kotlin.tmpl/app/build.gradle.tmpl @@ -43,12 +43,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - {{#androidX}} - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - {{/androidX}} - {{^androidX}} - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - {{/androidX}} } buildTypes { @@ -66,13 +60,4 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - testImplementation 'junit:junit:4.12' - {{#androidX}} - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' - {{/androidX}} - {{^androidX}} - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' - {{/androidX}} } diff --git a/packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/build.gradle.tmpl index 926beae2218..5c5f4825a47 100644 --- a/packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/build.gradle.tmpl +++ b/packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/build.gradle.tmpl @@ -16,12 +16,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - {{#androidX}} - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - {{/androidX}} - {{^androidX}} - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - {{/androidX}} } buildTypes { @@ -43,15 +37,10 @@ dependencies { {{#androidX}} implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' {{/androidX}} {{^androidX}} implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation 'com.android.support:design:28.0.0' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' {{/androidX}} - testImplementation 'junit:junit:4.12' } diff --git a/packages/flutter_tools/templates/module/android/library/Flutter.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/module/android/library/Flutter.tmpl/build.gradle.tmpl index 0a8051b1d15..b3defac9147 100644 --- a/packages/flutter_tools/templates/module/android/library/Flutter.tmpl/build.gradle.tmpl +++ b/packages/flutter_tools/templates/module/android/library/Flutter.tmpl/build.gradle.tmpl @@ -37,12 +37,6 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - {{#androidX}} - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - {{/androidX}} - {{^androidX}} - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - {{/androidX}} } } @@ -51,7 +45,6 @@ flutter { } dependencies { - testImplementation 'junit:junit:4.12' {{#androidX}} implementation 'androidx.appcompat:appcompat:1.0.2' {{/androidX}} diff --git a/packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl index 0e9b8fda52c..c7237959dd8 100644 --- a/packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl +++ b/packages/flutter_tools/templates/module/android/library_new_embedding/Flutter.tmpl/build.gradle.tmpl @@ -37,19 +37,9 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - {{#androidX}} - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - {{/androidX}} - {{^androidX}} - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - {{/androidX}} } } flutter { source '../..' } - -dependencies { - testImplementation 'junit:junit:4.12' -} diff --git a/packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl index dca5162228f..4d8a50b0a54 100644 --- a/packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl +++ b/packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl @@ -26,12 +26,6 @@ android { defaultConfig { minSdkVersion 16 - {{#androidX}} - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - {{/androidX}} - {{^androidX}} - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - {{/androidX}} } lintOptions { disable 'InvalidPackage' diff --git a/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl index db5fd284998..b2fb7839fab 100644 --- a/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl +++ b/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl @@ -32,12 +32,6 @@ android { } defaultConfig { minSdkVersion 16 - {{#androidX}} - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - {{/androidX}} - {{^androidX}} - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - {{/androidX}} } lintOptions { disable 'InvalidPackage'