From 45d3b8701346954f6fc3b6cf9d5194bc34518093 Mon Sep 17 00:00:00 2001 From: Brad Corso Date: Thu, 7 Dec 2023 14:29:02 -0800 Subject: [PATCH] Make `minSdk` and `targetSdk` versions consistent across Gradle tests. The `minSdk` is set to `16` since we test some of our artifacts on API 16. RELNOTES=N/A PiperOrigin-RevId: 588910365 --- javatests/artifacts/dagger-android-ksp/app/build.gradle | 2 +- .../artifacts/dagger-android/simple/app/build.gradle | 8 ++++---- .../artifacts/hilt-android/pluginMarker/app/build.gradle | 2 +- .../hilt-android/simple/app-java-only/build.gradle | 2 +- javatests/artifacts/hilt-android/simple/app/build.gradle | 2 +- .../hilt-android/simple/deep-android-lib/build.gradle | 2 +- .../hilt-android/simple/earlyentrypoint/build.gradle | 2 +- .../artifacts/hilt-android/simple/feature/build.gradle | 2 +- .../artifacts/hilt-android/simple/uitest/build.gradle | 2 +- .../simpleKotlin/android-library/build.gradle | 2 +- .../artifacts/hilt-android/simpleKotlin/app/build.gradle | 2 +- .../simpleKotlin/deep-android-lib/build.gradle | 2 +- .../artifacts/hilt-android/viewmodel/app/build.gradle | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/javatests/artifacts/dagger-android-ksp/app/build.gradle b/javatests/artifacts/dagger-android-ksp/app/build.gradle index 9787926bb82..434590a4752 100644 --- a/javatests/artifacts/dagger-android-ksp/app/build.gradle +++ b/javatests/artifacts/dagger-android-ksp/app/build.gradle @@ -25,7 +25,7 @@ android { compileSdkVersion 33 defaultConfig { applicationId 'dagger.android.ksp' - minSdk 21 + minSdk 16 targetSdk 33 versionCode 1 versionName "1.0" diff --git a/javatests/artifacts/dagger-android/simple/app/build.gradle b/javatests/artifacts/dagger-android/simple/app/build.gradle index be30b3bc17f..881a304cb48 100644 --- a/javatests/artifacts/dagger-android/simple/app/build.gradle +++ b/javatests/artifacts/dagger-android/simple/app/build.gradle @@ -17,13 +17,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 32 - buildToolsVersion "32.0.0" + compileSdkVersion 33 + buildToolsVersion "33.0.0" defaultConfig { applicationId "dagger.android.simple" - minSdkVersion 15 - targetSdkVersion 32 + minSdkVersion 16 + targetSdkVersion 33 versionCode 1 versionName "1.0" } diff --git a/javatests/artifacts/hilt-android/pluginMarker/app/build.gradle b/javatests/artifacts/hilt-android/pluginMarker/app/build.gradle index 23aa57eac20..e4cde41e7fb 100644 --- a/javatests/artifacts/hilt-android/pluginMarker/app/build.gradle +++ b/javatests/artifacts/hilt-android/pluginMarker/app/build.gradle @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "dagger.hilt.android.simple" - minSdkVersion 21 + minSdkVersion 16 targetSdkVersion 33 } diff --git a/javatests/artifacts/hilt-android/simple/app-java-only/build.gradle b/javatests/artifacts/hilt-android/simple/app-java-only/build.gradle index af856e79073..7a156efd565 100644 --- a/javatests/artifacts/hilt-android/simple/app-java-only/build.gradle +++ b/javatests/artifacts/hilt-android/simple/app-java-only/build.gradle @@ -23,7 +23,7 @@ android { defaultConfig { applicationId "dagger.hilt.android.simple" - minSdkVersion 15 + minSdkVersion 16 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/javatests/artifacts/hilt-android/simple/app/build.gradle b/javatests/artifacts/hilt-android/simple/app/build.gradle index 5342fb8c52d..8a196cf7008 100644 --- a/javatests/artifacts/hilt-android/simple/app/build.gradle +++ b/javatests/artifacts/hilt-android/simple/app/build.gradle @@ -48,7 +48,7 @@ android { defaultConfig { applicationId "dagger.hilt.android.simple" - minSdkVersion 15 + minSdkVersion 16 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/javatests/artifacts/hilt-android/simple/deep-android-lib/build.gradle b/javatests/artifacts/hilt-android/simple/deep-android-lib/build.gradle index 15938a133d1..ab5424efcfa 100644 --- a/javatests/artifacts/hilt-android/simple/deep-android-lib/build.gradle +++ b/javatests/artifacts/hilt-android/simple/deep-android-lib/build.gradle @@ -8,7 +8,7 @@ android { buildToolsVersion "33.0.0" defaultConfig { - minSdkVersion 15 + minSdkVersion 16 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/javatests/artifacts/hilt-android/simple/earlyentrypoint/build.gradle b/javatests/artifacts/hilt-android/simple/earlyentrypoint/build.gradle index 5c3f57088f2..2a36e6fb293 100644 --- a/javatests/artifacts/hilt-android/simple/earlyentrypoint/build.gradle +++ b/javatests/artifacts/hilt-android/simple/earlyentrypoint/build.gradle @@ -8,7 +8,7 @@ android { buildToolsVersion "33.0.0" defaultConfig { - minSdkVersion 15 + minSdkVersion 16 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/javatests/artifacts/hilt-android/simple/feature/build.gradle b/javatests/artifacts/hilt-android/simple/feature/build.gradle index be8a71aa549..dd33e291dc4 100644 --- a/javatests/artifacts/hilt-android/simple/feature/build.gradle +++ b/javatests/artifacts/hilt-android/simple/feature/build.gradle @@ -24,7 +24,7 @@ android { buildToolsVersion "33.0.0" defaultConfig { - minSdkVersion 15 + minSdkVersion 16 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/javatests/artifacts/hilt-android/simple/uitest/build.gradle b/javatests/artifacts/hilt-android/simple/uitest/build.gradle index 1b6f260176f..7c4e0fde29c 100644 --- a/javatests/artifacts/hilt-android/simple/uitest/build.gradle +++ b/javatests/artifacts/hilt-android/simple/uitest/build.gradle @@ -22,7 +22,7 @@ android { buildToolsVersion "33.0.0" defaultConfig { - minSdkVersion 15 + minSdkVersion 16 targetSdkVersion 33 testInstrumentationRunner "dagger.hilt.android.simple.uitest.TestRunner" missingDimensionStrategy 'tier', 'free' diff --git a/javatests/artifacts/hilt-android/simpleKotlin/android-library/build.gradle b/javatests/artifacts/hilt-android/simpleKotlin/android-library/build.gradle index 2b6684a12f7..1e83543c93a 100644 --- a/javatests/artifacts/hilt-android/simpleKotlin/android-library/build.gradle +++ b/javatests/artifacts/hilt-android/simpleKotlin/android-library/build.gradle @@ -10,7 +10,7 @@ android { buildToolsVersion "33.0.0" defaultConfig { - minSdkVersion 15 + minSdkVersion 16 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/javatests/artifacts/hilt-android/simpleKotlin/app/build.gradle b/javatests/artifacts/hilt-android/simpleKotlin/app/build.gradle index 052faa5410a..fe4f5b42403 100644 --- a/javatests/artifacts/hilt-android/simpleKotlin/app/build.gradle +++ b/javatests/artifacts/hilt-android/simpleKotlin/app/build.gradle @@ -26,7 +26,7 @@ android { defaultConfig { applicationId "dagger.hilt.android.simpleKotlin" - minSdkVersion 15 + minSdkVersion 16 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/javatests/artifacts/hilt-android/simpleKotlin/deep-android-lib/build.gradle b/javatests/artifacts/hilt-android/simpleKotlin/deep-android-lib/build.gradle index 1f8d9c71db1..8973bb9a2eb 100644 --- a/javatests/artifacts/hilt-android/simpleKotlin/deep-android-lib/build.gradle +++ b/javatests/artifacts/hilt-android/simpleKotlin/deep-android-lib/build.gradle @@ -11,7 +11,7 @@ android { buildToolsVersion "33.0.0" defaultConfig { - minSdkVersion 15 + minSdkVersion 16 targetSdkVersion 33 versionCode 1 versionName "1.0" diff --git a/javatests/artifacts/hilt-android/viewmodel/app/build.gradle b/javatests/artifacts/hilt-android/viewmodel/app/build.gradle index 806461bb46b..a212b3cb0cc 100644 --- a/javatests/artifacts/hilt-android/viewmodel/app/build.gradle +++ b/javatests/artifacts/hilt-android/viewmodel/app/build.gradle @@ -25,7 +25,7 @@ android { compileSdkVersion 33 defaultConfig { applicationId 'dagger.hilt.viewmodel' - minSdk 21 + minSdk 16 targetSdk 33 versionCode 1 versionName "1.0"