Remove redundant minSdkVersion 21
AndroidX already defaults to minSdkVersion 21 so setting
it explicitly does not do anything.
Additionally, remove places that set test runner as well
as that is set up automatically by AndroidXPlugin
Change-Id: I225b354c313c3558bf5fc43eac2d6afd81f79b6c
diff --git a/activity/integration-tests/macrobenchmark-target/build.gradle b/activity/integration-tests/macrobenchmark-target/build.gradle
index a3b0aea..68c0b8a 100644
--- a/activity/integration-tests/macrobenchmark-target/build.gradle
+++ b/activity/integration-tests/macrobenchmark-target/build.gradle
@@ -13,10 +13,6 @@
android {
namespace "androidx.activity.integration.macrobenchmark.target"
-
- defaultConfig {
- minSdkVersion 21
- }
}
dependencies {
diff --git a/appcompat/integration-tests/receive-content-testapp/build.gradle b/appcompat/integration-tests/receive-content-testapp/build.gradle
index 0a9360b..2e4ddbe 100644
--- a/appcompat/integration-tests/receive-content-testapp/build.gradle
+++ b/appcompat/integration-tests/receive-content-testapp/build.gradle
@@ -20,9 +20,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.appcompat.demo.receivecontent"
}
diff --git a/bluetooth/bluetooth/build.gradle b/bluetooth/bluetooth/build.gradle
index f60ee03..2803d4f 100644
--- a/bluetooth/bluetooth/build.gradle
+++ b/bluetooth/bluetooth/build.gradle
@@ -55,7 +55,4 @@
android {
namespace "androidx.bluetooth"
- defaultConfig {
- minSdkVersion 21
- }
}
diff --git a/bluetooth/integration-tests/testapp/build.gradle b/bluetooth/integration-tests/testapp/build.gradle
index 588c52e..6cd02f0 100644
--- a/bluetooth/integration-tests/testapp/build.gradle
+++ b/bluetooth/integration-tests/testapp/build.gradle
@@ -32,9 +32,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
buildFeatures {
viewBinding true
}
diff --git a/camera/integration-tests/camerapipetestapp/build.gradle b/camera/integration-tests/camerapipetestapp/build.gradle
index 7dd9e57..3bd216a 100644
--- a/camera/integration-tests/camerapipetestapp/build.gradle
+++ b/camera/integration-tests/camerapipetestapp/build.gradle
@@ -24,7 +24,6 @@
android {
defaultConfig {
applicationId "androidx.camera.integration.camera2.pipe"
- minSdkVersion 21
versionCode 1
multiDexEnabled true
}
diff --git a/camera/integration-tests/coretestapp/build.gradle b/camera/integration-tests/coretestapp/build.gradle
index f44c049..b7e1643 100644
--- a/camera/integration-tests/coretestapp/build.gradle
+++ b/camera/integration-tests/coretestapp/build.gradle
@@ -23,7 +23,6 @@
android {
defaultConfig {
applicationId "androidx.camera.integration.core"
- minSdkVersion 21
versionCode 1
multiDexEnabled true
diff --git a/camera/integration-tests/diagnosetestapp/build.gradle b/camera/integration-tests/diagnosetestapp/build.gradle
index cc5e5da..320381fa 100644
--- a/camera/integration-tests/diagnosetestapp/build.gradle
+++ b/camera/integration-tests/diagnosetestapp/build.gradle
@@ -23,7 +23,6 @@
android {
defaultConfig {
applicationId "androidx.camera.integration.diagnose"
- minSdkVersion 21
multiDexEnabled true
}
diff --git a/camera/integration-tests/extensionstestapp/build.gradle b/camera/integration-tests/extensionstestapp/build.gradle
index 88ae29c..9ebe099 100644
--- a/camera/integration-tests/extensionstestapp/build.gradle
+++ b/camera/integration-tests/extensionstestapp/build.gradle
@@ -33,7 +33,6 @@
android {
defaultConfig {
applicationId "androidx.camera.integration.extensions"
- minSdkVersion 21
versionCode 1
multiDexEnabled true
}
diff --git a/camera/integration-tests/timingtestapp/build.gradle b/camera/integration-tests/timingtestapp/build.gradle
index 27eb7c1..454a1e0 100644
--- a/camera/integration-tests/timingtestapp/build.gradle
+++ b/camera/integration-tests/timingtestapp/build.gradle
@@ -23,7 +23,6 @@
android {
defaultConfig {
applicationId "androidx.camera.integration.antelope"
- minSdkVersion 21
versionCode 35
versionName "1.35"
}
diff --git a/camera/integration-tests/uiwidgetstestapp/build.gradle b/camera/integration-tests/uiwidgetstestapp/build.gradle
index 5c0b980..b791c61 100644
--- a/camera/integration-tests/uiwidgetstestapp/build.gradle
+++ b/camera/integration-tests/uiwidgetstestapp/build.gradle
@@ -23,7 +23,6 @@
android {
defaultConfig {
applicationId "androidx.camera.integration.uiwidgets"
- minSdkVersion 21
versionCode 1
versionName "1.0"
}
diff --git a/camera/integration-tests/viewfindertestapp/build.gradle b/camera/integration-tests/viewfindertestapp/build.gradle
index 3ee9071c..9791b83 100644
--- a/camera/integration-tests/viewfindertestapp/build.gradle
+++ b/camera/integration-tests/viewfindertestapp/build.gradle
@@ -24,7 +24,6 @@
android {
defaultConfig {
applicationId "androidx.camera.integration.viewfinder"
- minSdkVersion 21
multiDexEnabled true
}
diff --git a/camera/integration-tests/viewtestapp/build.gradle b/camera/integration-tests/viewtestapp/build.gradle
index 49a1bf9..4a6fa59 100644
--- a/camera/integration-tests/viewtestapp/build.gradle
+++ b/camera/integration-tests/viewtestapp/build.gradle
@@ -24,7 +24,6 @@
android {
defaultConfig {
applicationId "androidx.camera.integration.view"
- minSdkVersion 21
versionCode 1
multiDexEnabled true
}
diff --git a/car/app/app-projected/build.gradle b/car/app/app-projected/build.gradle
index a874725..58f7b7ae 100644
--- a/car/app/app-projected/build.gradle
+++ b/car/app/app-projected/build.gradle
@@ -47,9 +47,7 @@
android {
defaultConfig {
- minSdkVersion 21
multiDexEnabled = true
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildFeatures {
aidl = true
diff --git a/car/app/app-testing/build.gradle b/car/app/app-testing/build.gradle
index b003f88..eb182b1 100644
--- a/car/app/app-testing/build.gradle
+++ b/car/app/app-testing/build.gradle
@@ -50,7 +50,6 @@
android {
defaultConfig {
- minSdkVersion 21
multiDexEnabled = true
}
lintOptions {
diff --git a/car/app/app/build.gradle b/car/app/app/build.gradle
index 97ffb99..7ca22db 100644
--- a/car/app/app/build.gradle
+++ b/car/app/app/build.gradle
@@ -92,7 +92,6 @@
aidl = true
}
defaultConfig {
- minSdkVersion 21
multiDexEnabled = true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/build.gradle b/compose/foundation/foundation/integration-tests/lazy-tests/build.gradle
index b217966..76766bf 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/build.gradle
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/build.gradle
@@ -30,9 +30,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.compose.foundation.lazytests"
}
diff --git a/compose/integration-tests/demos/build.gradle b/compose/integration-tests/demos/build.gradle
index 2c71d6d..7d2fed8 100644
--- a/compose/integration-tests/demos/build.gradle
+++ b/compose/integration-tests/demos/build.gradle
@@ -46,8 +46,5 @@
ApkCopyHelperKt.setupAppApkCopy(project, "release")
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.compose.integration.demos"
}
diff --git a/compose/integration-tests/docs-snippets/build.gradle b/compose/integration-tests/docs-snippets/build.gradle
index 7e35a50..e3ff228 100644
--- a/compose/integration-tests/docs-snippets/build.gradle
+++ b/compose/integration-tests/docs-snippets/build.gradle
@@ -73,5 +73,4 @@
namespace "androidx.compose.integration.docs"
}
-android.defaultConfig.minSdkVersion 21
android.buildFeatures.viewBinding true
diff --git a/compose/integration-tests/hero/macrobenchmark-target/build.gradle b/compose/integration-tests/hero/macrobenchmark-target/build.gradle
index bcecd70..181d642 100644
--- a/compose/integration-tests/hero/macrobenchmark-target/build.gradle
+++ b/compose/integration-tests/hero/macrobenchmark-target/build.gradle
@@ -24,10 +24,6 @@
android {
namespace "androidx.compose.integration.hero.macrobenchmark.target"
- defaultConfig {
- minSdkVersion 21
- }
-
buildTypes {
release {
minifyEnabled true
diff --git a/compose/integration-tests/macrobenchmark-target/build.gradle b/compose/integration-tests/macrobenchmark-target/build.gradle
index edd93da78..8e43d97 100644
--- a/compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/compose/integration-tests/macrobenchmark-target/build.gradle
@@ -50,5 +50,3 @@
implementation(project(":constraintlayout:constraintlayout-compose"))
implementation("io.coil-kt:coil-compose:2.5.0")
}
-
-android.defaultConfig.minSdkVersion 21
diff --git a/compose/runtime/runtime-tracing/build.gradle b/compose/runtime/runtime-tracing/build.gradle
index 3976cf1..658367c 100644
--- a/compose/runtime/runtime-tracing/build.gradle
+++ b/compose/runtime/runtime-tracing/build.gradle
@@ -30,9 +30,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.compose.runtime.tracing"
}
diff --git a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
index 2371b1d..56d4d26 100644
--- a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
+++ b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle
@@ -22,9 +22,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.compose.runtime.benchmark"
}
diff --git a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
index 4196d390..4fd6efb 100644
--- a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
+++ b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
@@ -33,8 +33,5 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.compose.ui.test.manifest.integration.testapp"
}
diff --git a/core/core-splashscreen/build.gradle b/core/core-splashscreen/build.gradle
index 4bc9915..b84cd7d 100644
--- a/core/core-splashscreen/build.gradle
+++ b/core/core-splashscreen/build.gradle
@@ -30,10 +30,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- testInstrumentationRunner("androidx.test.runner.AndroidJUnitRunner")
- }
namespace "androidx.core.splashscreen"
}
diff --git a/core/core-splashscreen/samples/build.gradle b/core/core-splashscreen/samples/build.gradle
index d957863..73c9942 100644
--- a/core/core-splashscreen/samples/build.gradle
+++ b/core/core-splashscreen/samples/build.gradle
@@ -33,7 +33,6 @@
android {
defaultConfig {
applicationId "androidx.core.splashscreen.samples"
- minSdkVersion 21
}
namespace "androidx.core.splashscreen.sample"
}
diff --git a/emoji2/emoji2-emojipicker/build.gradle b/emoji2/emoji2-emojipicker/build.gradle
index ff91944..f9e72b1 100644
--- a/emoji2/emoji2-emojipicker/build.gradle
+++ b/emoji2/emoji2-emojipicker/build.gradle
@@ -52,7 +52,6 @@
android {
defaultConfig {
- minSdkVersion 21
vectorDrawables.useSupportLibrary = true
}
sourceSets {
diff --git a/emoji2/emoji2-emojipicker/samples/build.gradle b/emoji2/emoji2-emojipicker/samples/build.gradle
index a38eac3..6824517 100644
--- a/emoji2/emoji2-emojipicker/samples/build.gradle
+++ b/emoji2/emoji2-emojipicker/samples/build.gradle
@@ -34,9 +34,6 @@
implementation(project(":compose:foundation:foundation"))
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.emoji2.emojipicker.samples"
}
diff --git a/enterprise/enterprise-feedback-testing/build.gradle b/enterprise/enterprise-feedback-testing/build.gradle
index c31666f..6b59159 100644
--- a/enterprise/enterprise-feedback-testing/build.gradle
+++ b/enterprise/enterprise-feedback-testing/build.gradle
@@ -32,10 +32,6 @@
testImplementation(libs.truth)
}
android {
- defaultConfig {
- minSdkVersion 21
- }
-
testOptions.unitTests.includeAndroidResources = true
namespace "androidx.enterprise.feedback.testing"
}
diff --git a/enterprise/enterprise-feedback/build.gradle b/enterprise/enterprise-feedback/build.gradle
index f8a7ff4..a1bc13a 100644
--- a/enterprise/enterprise-feedback/build.gradle
+++ b/enterprise/enterprise-feedback/build.gradle
@@ -22,10 +22,6 @@
testImplementation(libs.robolectric)
}
android {
- defaultConfig {
- minSdkVersion 21
- }
-
testOptions.unitTests.includeAndroidResources = true
namespace "androidx.enterprise.feedback"
}
diff --git a/glance/glance-appwidget-preview/build.gradle b/glance/glance-appwidget-preview/build.gradle
index 86b0bcc..fc28bd4 100644
--- a/glance/glance-appwidget-preview/build.gradle
+++ b/glance/glance-appwidget-preview/build.gradle
@@ -50,9 +50,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.glance.appwidget.preview"
}
diff --git a/glance/glance-material/build.gradle b/glance/glance-material/build.gradle
index f8ad806..1bea181 100644
--- a/glance/glance-material/build.gradle
+++ b/glance/glance-material/build.gradle
@@ -23,9 +23,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.glance.material"
}
diff --git a/glance/glance-material3/build.gradle b/glance/glance-material3/build.gradle
index da433c9..88bc255 100644
--- a/glance/glance-material3/build.gradle
+++ b/glance/glance-material3/build.gradle
@@ -24,9 +24,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.glance.material3"
}
diff --git a/glance/glance-preview/build.gradle b/glance/glance-preview/build.gradle
index 939c4dd..117210d 100644
--- a/glance/glance-preview/build.gradle
+++ b/glance/glance-preview/build.gradle
@@ -21,9 +21,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.glance.preview"
}
diff --git a/graphics/filters/filters/build.gradle b/graphics/filters/filters/build.gradle
index 9c7f428..374bfc3 100644
--- a/graphics/filters/filters/build.gradle
+++ b/graphics/filters/filters/build.gradle
@@ -54,10 +54,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
-
namespace "androidx.graphics.filters"
}
diff --git a/graphics/graphics-core/build.gradle b/graphics/graphics-core/build.gradle
index ea794de..7fd55aa 100644
--- a/graphics/graphics-core/build.gradle
+++ b/graphics/graphics-core/build.gradle
@@ -48,7 +48,6 @@
namespace 'androidx.graphics.core'
defaultConfig {
- minSdkVersion 21
externalNativeBuild {
def versionScript = file("src/main/cpp/jni.lds").getAbsolutePath()
diff --git a/graphics/graphics-core/samples/build.gradle b/graphics/graphics-core/samples/build.gradle
index 3a78d11..fadc1fb 100644
--- a/graphics/graphics-core/samples/build.gradle
+++ b/graphics/graphics-core/samples/build.gradle
@@ -32,9 +32,6 @@
android {
namespace "androidx.graphics.core.samples"
- defaultConfig {
- minSdkVersion 21
- }
}
androidx {
diff --git a/graphics/graphics-path/build.gradle b/graphics/graphics-path/build.gradle
index 99e20bb..e0bd680 100644
--- a/graphics/graphics-path/build.gradle
+++ b/graphics/graphics-path/build.gradle
@@ -48,7 +48,6 @@
namespace "androidx.graphics.path"
defaultConfig {
- minSdkVersion 21 // Limited to 21+ due to native changes before that release
externalNativeBuild {
cmake {
cppFlags.addAll([
diff --git a/graphics/integration-tests/testapp-compose/build.gradle b/graphics/integration-tests/testapp-compose/build.gradle
index a9921f6..4ed75df 100644
--- a/graphics/integration-tests/testapp-compose/build.gradle
+++ b/graphics/integration-tests/testapp-compose/build.gradle
@@ -48,8 +48,5 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.graphics.shapes.testcompose"
}
diff --git a/graphics/integration-tests/testapp/build.gradle b/graphics/integration-tests/testapp/build.gradle
index e191d19..e45b70b 100644
--- a/graphics/integration-tests/testapp/build.gradle
+++ b/graphics/integration-tests/testapp/build.gradle
@@ -36,8 +36,5 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.graphics.shapes.test"
}
diff --git a/leanback/leanback-paging/build.gradle b/leanback/leanback-paging/build.gradle
index 4c10423..66941c4 100644
--- a/leanback/leanback-paging/build.gradle
+++ b/leanback/leanback-paging/build.gradle
@@ -47,9 +47,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
lintOptions {
// Bug in Android Lint 7.0.0-alpha15 b/187419330
disable("MissingLeanbackLauncher", "ImpliedTouchscreenHardware", "MissingLeanbackSupport")
diff --git a/leanback/leanback-preference/build.gradle b/leanback/leanback-preference/build.gradle
index 5f46d95..c387e06 100644
--- a/leanback/leanback-preference/build.gradle
+++ b/leanback/leanback-preference/build.gradle
@@ -22,10 +22,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
-
sourceSets {
main.java.srcDirs += [
"api21"
diff --git a/leanback/leanback-tab/build.gradle b/leanback/leanback-tab/build.gradle
index c671cd4..cd1640a 100644
--- a/leanback/leanback-tab/build.gradle
+++ b/leanback/leanback-tab/build.gradle
@@ -37,9 +37,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.leanback.tab"
}
diff --git a/recommendation/recommendation/build.gradle b/recommendation/recommendation/build.gradle
index e60039e..1873083 100644
--- a/recommendation/recommendation/build.gradle
+++ b/recommendation/recommendation/build.gradle
@@ -17,9 +17,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.recommendation"
}
diff --git a/samples/SupportLeanbackDemos/build.gradle b/samples/SupportLeanbackDemos/build.gradle
index c929731..b3aa7b7 100644
--- a/samples/SupportLeanbackDemos/build.gradle
+++ b/samples/SupportLeanbackDemos/build.gradle
@@ -25,8 +25,5 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "com.example.android.leanback"
}
diff --git a/security/security-crypto-ktx/build.gradle b/security/security-crypto-ktx/build.gradle
index d78c899..1efc02b 100644
--- a/security/security-crypto-ktx/build.gradle
+++ b/security/security-crypto-ktx/build.gradle
@@ -42,9 +42,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.security.ktx"
}
diff --git a/security/security-crypto/build.gradle b/security/security-crypto/build.gradle
index e3fd4db..720c1da 100644
--- a/security/security-crypto/build.gradle
+++ b/security/security-crypto/build.gradle
@@ -46,9 +46,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.security"
}
diff --git a/test/ext/junit-gtest/build.gradle b/test/ext/junit-gtest/build.gradle
index 14964f5..2b9b0f3 100644
--- a/test/ext/junit-gtest/build.gradle
+++ b/test/ext/junit-gtest/build.gradle
@@ -53,7 +53,6 @@
android {
defaultConfig {
- minSdkVersion 21
externalNativeBuild {
cmake {
arguments "-DANDROID_STL=c++_shared"
diff --git a/test/integration-tests/junit-gtest-test/build.gradle b/test/integration-tests/junit-gtest-test/build.gradle
index f6c8511..027864a 100644
--- a/test/integration-tests/junit-gtest-test/build.gradle
+++ b/test/integration-tests/junit-gtest-test/build.gradle
@@ -42,7 +42,6 @@
android {
defaultConfig {
- minSdkVersion 21
externalNativeBuild {
cmake {
arguments "-DANDROID_STL=c++_shared"
diff --git a/tv/tv-foundation/build.gradle b/tv/tv-foundation/build.gradle
index fbcaffc..0e3e522 100644
--- a/tv/tv-foundation/build.gradle
+++ b/tv/tv-foundation/build.gradle
@@ -60,9 +60,6 @@
android {
namespace "androidx.tv.foundation"
- defaultConfig {
- minSdkVersion 21
- }
}
androidx {
diff --git a/tv/tv-material/build.gradle b/tv/tv-material/build.gradle
index 5c09bcc..8594291 100644
--- a/tv/tv-material/build.gradle
+++ b/tv/tv-material/build.gradle
@@ -62,9 +62,6 @@
android {
namespace "androidx.tv.material"
- defaultConfig {
- minSdkVersion 21
- }
sourceSets.androidTest.assets.srcDirs +=
project.rootDir.absolutePath + "/../../golden/tv/compose/material3"
}
diff --git a/tvprovider/tvprovider/build.gradle b/tvprovider/tvprovider/build.gradle
index 8ddb086..fb73076 100644
--- a/tvprovider/tvprovider/build.gradle
+++ b/tvprovider/tvprovider/build.gradle
@@ -24,9 +24,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.tvprovider"
}
diff --git a/wear/wear-tooling-preview/build.gradle b/wear/wear-tooling-preview/build.gradle
index 20c87ee..0de3b5e 100644
--- a/wear/wear-tooling-preview/build.gradle
+++ b/wear/wear-tooling-preview/build.gradle
@@ -35,9 +35,6 @@
}
android {
- defaultConfig {
- minSdkVersion 21
- }
namespace "androidx.wear.tooling.preview"
}
