Update compileSdk for test apps that require it
BUG: 346290560
Test: ./gradlew cRAM
Change-Id: Id52026b9e31fc13747b123588035714b3722de67
diff --git a/activity/integration-tests/macrobenchmark-target/build.gradle b/activity/integration-tests/macrobenchmark-target/build.gradle
index 68c0b8a..e984599 100644
--- a/activity/integration-tests/macrobenchmark-target/build.gradle
+++ b/activity/integration-tests/macrobenchmark-target/build.gradle
@@ -12,7 +12,8 @@
}
android {
- namespace "androidx.activity.integration.macrobenchmark.target"
+ compileSdk 35
+ namespace "androidx.activity.integration.macrobenchmark.target"
}
dependencies {
diff --git a/activity/integration-tests/testapp/build.gradle b/activity/integration-tests/testapp/build.gradle
index 09b6006..7fbf614 100644
--- a/activity/integration-tests/testapp/build.gradle
+++ b/activity/integration-tests/testapp/build.gradle
@@ -22,6 +22,7 @@
}
android {
+ compileSdk 35
defaultConfig {
applicationId "androidx.activity.integration.testapp"
}
diff --git a/appcompat/appcompat-lint/integration-tests/build.gradle b/appcompat/appcompat-lint/integration-tests/build.gradle
index cd7691f..4c2adc6 100644
--- a/appcompat/appcompat-lint/integration-tests/build.gradle
+++ b/appcompat/appcompat-lint/integration-tests/build.gradle
@@ -18,6 +18,7 @@
}
android {
+ compileSdk 35
defaultConfig {
vectorDrawables.useSupportLibrary = true
}
diff --git a/appcompat/integration-tests/receive-content-testapp/build.gradle b/appcompat/integration-tests/receive-content-testapp/build.gradle
index e414862..4c0dcc7 100644
--- a/appcompat/integration-tests/receive-content-testapp/build.gradle
+++ b/appcompat/integration-tests/receive-content-testapp/build.gradle
@@ -20,6 +20,7 @@
}
android {
+ compileSdk 35
namespace "androidx.appcompat.demo.receivecontent"
}
diff --git a/appsearch/appsearch-debug-view/samples/build.gradle b/appsearch/appsearch-debug-view/samples/build.gradle
index 25b9618..3321369 100644
--- a/appsearch/appsearch-debug-view/samples/build.gradle
+++ b/appsearch/appsearch-debug-view/samples/build.gradle
@@ -29,6 +29,7 @@
}
android {
+ compileSdkVersion 35
namespace "androidx.appsearch.debugview.samples"
}
diff --git a/benchmark/integration-tests/macrobenchmark-target/build.gradle b/benchmark/integration-tests/macrobenchmark-target/build.gradle
index fbe028a..f038350 100644
--- a/benchmark/integration-tests/macrobenchmark-target/build.gradle
+++ b/benchmark/integration-tests/macrobenchmark-target/build.gradle
@@ -28,6 +28,7 @@
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
}
}
+ compileSdkVersion 35
namespace "androidx.benchmark.integration.macrobenchmark.target"
}
diff --git a/biometric/integration-tests/testapp/build.gradle b/biometric/integration-tests/testapp/build.gradle
index e36cafe..0b42c40 100644
--- a/biometric/integration-tests/testapp/build.gradle
+++ b/biometric/integration-tests/testapp/build.gradle
@@ -21,6 +21,7 @@
}
android {
+ compileSdkVersion 35
defaultConfig {
applicationId "androidx.biometric.integration.testapp"
}
diff --git a/camera/integration-tests/avsynctestapp/build.gradle b/camera/integration-tests/avsynctestapp/build.gradle
index c64700e..a515227 100644
--- a/camera/integration-tests/avsynctestapp/build.gradle
+++ b/camera/integration-tests/avsynctestapp/build.gradle
@@ -24,6 +24,8 @@
android {
namespace 'androidx.camera.integration.avsync'
+ compileSdk 35
+
defaultConfig {
applicationId "androidx.camera.integration.avsync"
}
diff --git a/camera/integration-tests/uiwidgetstestapp/build.gradle b/camera/integration-tests/uiwidgetstestapp/build.gradle
index 453f43f..33c414d 100644
--- a/camera/integration-tests/uiwidgetstestapp/build.gradle
+++ b/camera/integration-tests/uiwidgetstestapp/build.gradle
@@ -21,6 +21,8 @@
}
android {
+ compileSdk 35
+
defaultConfig {
applicationId "androidx.camera.integration.uiwidgets"
versionCode 1
diff --git a/compose/integration-tests/demos/build.gradle b/compose/integration-tests/demos/build.gradle
index 7d2fed8..8622500 100644
--- a/compose/integration-tests/demos/build.gradle
+++ b/compose/integration-tests/demos/build.gradle
@@ -46,5 +46,6 @@
ApkCopyHelperKt.setupAppApkCopy(project, "release")
android {
+ compileSdk 35
namespace "androidx.compose.integration.demos"
}
diff --git a/compose/integration-tests/demos/src/main/java/androidx/compose/integration/demos/DemoActivity.kt b/compose/integration-tests/demos/src/main/java/androidx/compose/integration/demos/DemoActivity.kt
index 5e67574..a663c70 100644
--- a/compose/integration-tests/demos/src/main/java/androidx/compose/integration/demos/DemoActivity.kt
+++ b/compose/integration-tests/demos/src/main/java/androidx/compose/integration/demos/DemoActivity.kt
@@ -161,7 +161,9 @@
SideEffect {
WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !isDarkMode
WindowCompat.getInsetsController(window, view).isAppearanceLightNavigationBars = !isDarkMode
+ @Suppress("deprecation")
window.statusBarColor = Color.Transparent.toArgb()
+ @Suppress("deprecation")
window.navigationBarColor = Color.Transparent.toArgb()
}
MaterialTheme(colorScheme = colorScheme, content = content)
diff --git a/compose/integration-tests/hero/macrobenchmark-target/build.gradle b/compose/integration-tests/hero/macrobenchmark-target/build.gradle
index 181d642..acb2d78b 100644
--- a/compose/integration-tests/hero/macrobenchmark-target/build.gradle
+++ b/compose/integration-tests/hero/macrobenchmark-target/build.gradle
@@ -22,6 +22,7 @@
}
android {
+ compileSdkVersion 35
namespace "androidx.compose.integration.hero.macrobenchmark.target"
buildTypes {
diff --git a/compose/integration-tests/macrobenchmark-target/build.gradle b/compose/integration-tests/macrobenchmark-target/build.gradle
index 8e43d97..a3da118 100644
--- a/compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/compose/integration-tests/macrobenchmark-target/build.gradle
@@ -13,6 +13,7 @@
}
android {
+ compileSdk 35
namespace "androidx.compose.integration.macrobenchmark.target"
buildTypes {
release {
diff --git a/compose/integration-tests/material-catalog/build.gradle b/compose/integration-tests/material-catalog/build.gradle
index 973f875..31e34a8 100644
--- a/compose/integration-tests/material-catalog/build.gradle
+++ b/compose/integration-tests/material-catalog/build.gradle
@@ -32,6 +32,7 @@
}
android {
+ compileSdkVersion 35
defaultConfig {
applicationId "androidx.compose.material.catalog"
versionCode 2400
diff --git a/compose/material3/integration-tests/macrobenchmark-target/build.gradle b/compose/material3/integration-tests/macrobenchmark-target/build.gradle
index 087ceb2..c19b92d 100644
--- a/compose/material3/integration-tests/macrobenchmark-target/build.gradle
+++ b/compose/material3/integration-tests/macrobenchmark-target/build.gradle
@@ -14,9 +14,10 @@
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
+ compileSdkVersion 35
}
dependencies {
implementation(project(":activity:activity-compose"))
implementation(project(":compose:material3:material3"))
-}
\ No newline at end of file
+}
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 4fd6efb..387b078 100644
--- a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
+++ b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle
@@ -33,5 +33,6 @@
}
android {
+ compileSdkVersion 35
namespace "androidx.compose.ui.test.manifest.integration.testapp"
}
diff --git a/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/build.gradle b/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/build.gradle
index 7b273f9..22a5142 100644
--- a/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/constraintlayout/constraintlayout-compose/integration-tests/macrobenchmark-target/build.gradle
@@ -22,6 +22,7 @@
}
android {
+ compileSdkVersion 35
defaultConfig {
minSdkVersion 26
}
@@ -60,4 +61,4 @@
implementation(project(":compose:ui:ui"))
implementation(project(":compose:ui:ui-tooling"))
implementation(project(":profileinstaller:profileinstaller"))
-}
\ No newline at end of file
+}
diff --git a/core/core-graphics-integration-tests/testapp/build.gradle b/core/core-graphics-integration-tests/testapp/build.gradle
index ea79373..10e75e1 100644
--- a/core/core-graphics-integration-tests/testapp/build.gradle
+++ b/core/core-graphics-integration-tests/testapp/build.gradle
@@ -21,6 +21,7 @@
}
android {
+ compileSdkVersion 35
defaultConfig {
applicationId "androidx.core.graphics.sample"
}
diff --git a/core/core-splashscreen/samples/build.gradle b/core/core-splashscreen/samples/build.gradle
index 73c9942..4fc65ad 100644
--- a/core/core-splashscreen/samples/build.gradle
+++ b/core/core-splashscreen/samples/build.gradle
@@ -31,6 +31,7 @@
}
android {
+ compileSdkVersion 35
defaultConfig {
applicationId "androidx.core.splashscreen.samples"
}
diff --git a/core/haptics/haptics/integration-tests/demos/build.gradle b/core/haptics/haptics/integration-tests/demos/build.gradle
index 9695d73..d4f87ae 100644
--- a/core/haptics/haptics/integration-tests/demos/build.gradle
+++ b/core/haptics/haptics/integration-tests/demos/build.gradle
@@ -28,6 +28,7 @@
}
android {
+ compileSdkVersion 35
defaultConfig {
applicationId "androidx.core.haptics.demos"
}
diff --git a/datastore/datastore-compose-samples/build.gradle b/datastore/datastore-compose-samples/build.gradle
index 2e5f736..07d5fe6 100644
--- a/datastore/datastore-compose-samples/build.gradle
+++ b/datastore/datastore-compose-samples/build.gradle
@@ -54,6 +54,7 @@
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1")
}
android {
+ compileSdk 35
namespace 'com.example.datastorecomposesamples'
defaultConfig {
minSdk 28
diff --git a/emoji2/emoji2-emojipicker/samples/build.gradle b/emoji2/emoji2-emojipicker/samples/build.gradle
index 6824517..3af2482 100644
--- a/emoji2/emoji2-emojipicker/samples/build.gradle
+++ b/emoji2/emoji2-emojipicker/samples/build.gradle
@@ -34,6 +34,7 @@
implementation(project(":compose:foundation:foundation"))
}
android {
+ compileSdk 35
namespace "androidx.emoji2.emojipicker.samples"
}
diff --git a/hilt/integration-tests/viewmodelapp/build.gradle b/hilt/integration-tests/viewmodelapp/build.gradle
index 0db4203..12eec0a 100644
--- a/hilt/integration-tests/viewmodelapp/build.gradle
+++ b/hilt/integration-tests/viewmodelapp/build.gradle
@@ -23,6 +23,7 @@
}
android {
+ compileSdkVersion 35
defaultConfig {
testInstrumentationRunner "androidx.hilt.integration.viewmodelapp.TestRunner"
}
diff --git a/hilt/integration-tests/workerapp/build.gradle b/hilt/integration-tests/workerapp/build.gradle
index 391f756..b277151 100644
--- a/hilt/integration-tests/workerapp/build.gradle
+++ b/hilt/integration-tests/workerapp/build.gradle
@@ -23,6 +23,7 @@
}
android {
+ compileSdk 35
defaultConfig {
testInstrumentationRunner "androidx.hilt.integration.workerapp.TestRunner"
}
diff --git a/metrics/integration-tests/janktest/build.gradle b/metrics/integration-tests/janktest/build.gradle
index da13b35..90a1980 100644
--- a/metrics/integration-tests/janktest/build.gradle
+++ b/metrics/integration-tests/janktest/build.gradle
@@ -24,6 +24,7 @@
buildFeatures {
viewBinding true
}
+ compileSdk 35
namespace "androidx.metrics.performance.janktest"
}
diff --git a/paging/integration-tests/testapp/build.gradle b/paging/integration-tests/testapp/build.gradle
index 0988655..cbd8d34 100644
--- a/paging/integration-tests/testapp/build.gradle
+++ b/paging/integration-tests/testapp/build.gradle
@@ -55,6 +55,7 @@
}
android {
+ compileSdk 35
namespace "androidx.paging.integration.testapp"
}
diff --git a/samples/AndroidXDemos/build.gradle b/samples/AndroidXDemos/build.gradle
index 519d459..048ac9c 100644
--- a/samples/AndroidXDemos/build.gradle
+++ b/samples/AndroidXDemos/build.gradle
@@ -41,6 +41,7 @@
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
}
}
+ compileSdkVersion 35
defaultConfig {
vectorDrawables.useSupportLibrary = true
}
diff --git a/samples/MediaRoutingDemo/build.gradle b/samples/MediaRoutingDemo/build.gradle
index 6da205a..617f702 100644
--- a/samples/MediaRoutingDemo/build.gradle
+++ b/samples/MediaRoutingDemo/build.gradle
@@ -28,6 +28,7 @@
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
}
}
+ compileSdk 35
defaultConfig {
vectorDrawables.useSupportLibrary = true
}
diff --git a/samples/Support4Demos/build.gradle b/samples/Support4Demos/build.gradle
index 7f821c2..061c521 100644
--- a/samples/Support4Demos/build.gradle
+++ b/samples/Support4Demos/build.gradle
@@ -30,5 +30,6 @@
}
android {
+ compileSdkVersion 35
namespace "com.example.android.supportv4"
}
diff --git a/samples/SupportContentDemos/build.gradle b/samples/SupportContentDemos/build.gradle
index d2ab9a4..c543967 100644
--- a/samples/SupportContentDemos/build.gradle
+++ b/samples/SupportContentDemos/build.gradle
@@ -31,5 +31,6 @@
}
android {
+ compileSdk 35
namespace "com.example.android.support.content.demos"
}
diff --git a/samples/SupportPreferenceDemos/build.gradle b/samples/SupportPreferenceDemos/build.gradle
index 73d482c..02d78ee 100644
--- a/samples/SupportPreferenceDemos/build.gradle
+++ b/samples/SupportPreferenceDemos/build.gradle
@@ -26,5 +26,6 @@
}
android {
+ compileSdk 35
namespace "com.example.androidx.preference"
-}
\ No newline at end of file
+}
diff --git a/samples/SupportRemoteCallbackDemos/build.gradle b/samples/SupportRemoteCallbackDemos/build.gradle
index 5864d41..7876ec4 100644
--- a/samples/SupportRemoteCallbackDemos/build.gradle
+++ b/samples/SupportRemoteCallbackDemos/build.gradle
@@ -27,6 +27,7 @@
}
android {
+ compileSdk 35
defaultConfig {
}
namespace "com.example.androidx.remotecallback.demos"
diff --git a/samples/SupportSliceDemos/build.gradle b/samples/SupportSliceDemos/build.gradle
index 007adcb..89d6061 100644
--- a/samples/SupportSliceDemos/build.gradle
+++ b/samples/SupportSliceDemos/build.gradle
@@ -32,6 +32,7 @@
}
android {
+ compileSdk 35
defaultConfig {
}
namespace "com.example.androidx.slice.demos"
diff --git a/samples/SupportTransitionDemos/build.gradle b/samples/SupportTransitionDemos/build.gradle
index 6119a42..eb68924 100644
--- a/samples/SupportTransitionDemos/build.gradle
+++ b/samples/SupportTransitionDemos/build.gradle
@@ -21,6 +21,7 @@
aaptOptions {
additionalParameters "--no-version-transitions"
}
+ compileSdk 35
namespace "com.example.android.support.transition"
}
diff --git a/samples/SupportWearDemos/build.gradle b/samples/SupportWearDemos/build.gradle
index 252fc05..3ae3154 100644
--- a/samples/SupportWearDemos/build.gradle
+++ b/samples/SupportWearDemos/build.gradle
@@ -27,6 +27,7 @@
}
android {
+ compileSdk 35
defaultConfig {
minSdkVersion 24
}
diff --git a/startup/integration-tests/test-app/build.gradle b/startup/integration-tests/test-app/build.gradle
index 93f6d4d..f7893ef 100644
--- a/startup/integration-tests/test-app/build.gradle
+++ b/startup/integration-tests/test-app/build.gradle
@@ -21,6 +21,7 @@
}
android {
+ compileSdkVersion 35
buildTypes {
getByName("release") {
minifyEnabled = true
diff --git a/test/uiautomator/integration-tests/testapp/build.gradle b/test/uiautomator/integration-tests/testapp/build.gradle
index eed2f10..80f7aa2 100644
--- a/test/uiautomator/integration-tests/testapp/build.gradle
+++ b/test/uiautomator/integration-tests/testapp/build.gradle
@@ -50,5 +50,6 @@
}
android {
+ compileSdkVersion 35
namespace "androidx.test.uiautomator.testapp"
}
diff --git a/viewpager2/integration-tests/testapp/build.gradle b/viewpager2/integration-tests/testapp/build.gradle
index bc3fc1d..ff23ca5 100644
--- a/viewpager2/integration-tests/testapp/build.gradle
+++ b/viewpager2/integration-tests/testapp/build.gradle
@@ -42,5 +42,6 @@
}
android {
+ compileSdkVersion 35
namespace "androidx.viewpager2.integration.testapp"
}
diff --git a/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle b/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle
index 54fcef0..4eacf1f 100644
--- a/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle
+++ b/wear/benchmark/integration-tests/macrobenchmark-target/build.gradle
@@ -21,6 +21,7 @@
}
android {
+ compileSdkVersion 35
defaultConfig {
minSdk 28
}
diff --git a/wear/compose/integration-tests/demos/build.gradle b/wear/compose/integration-tests/demos/build.gradle
index e43fb98..221d34e 100644
--- a/wear/compose/integration-tests/demos/build.gradle
+++ b/wear/compose/integration-tests/demos/build.gradle
@@ -22,6 +22,7 @@
}
android {
+ compileSdkVersion 35
defaultConfig {
applicationId "androidx.wear.compose.integration.demos"
minSdk 25
diff --git a/wear/compose/integration-tests/macrobenchmark-target/build.gradle b/wear/compose/integration-tests/macrobenchmark-target/build.gradle
index 96f05c4..117b475 100644
--- a/wear/compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/wear/compose/integration-tests/macrobenchmark-target/build.gradle
@@ -22,6 +22,7 @@
}
android {
+ compileSdkVersion 35
namespace "androidx.wear.compose.integration.macrobenchmark.target"
buildTypes {
@@ -53,4 +54,4 @@
implementation(project(path:':tracing:tracing-perfetto-binary'))
}
-android.defaultConfig.minSdkVersion 25
\ No newline at end of file
+android.defaultConfig.minSdkVersion 25
diff --git a/wear/compose/integration-tests/navigation/build.gradle b/wear/compose/integration-tests/navigation/build.gradle
index ca96d2b..b29b94ada 100644
--- a/wear/compose/integration-tests/navigation/build.gradle
+++ b/wear/compose/integration-tests/navigation/build.gradle
@@ -22,6 +22,7 @@
}
android {
+ compileSdkVersion 35
defaultConfig {
applicationId "androidx.wear.compose.integration.navigation"
minSdk 25
diff --git a/window/integration-tests/macrobenchmark-target/build.gradle b/window/integration-tests/macrobenchmark-target/build.gradle
index 8bec782..1631c90 100644
--- a/window/integration-tests/macrobenchmark-target/build.gradle
+++ b/window/integration-tests/macrobenchmark-target/build.gradle
@@ -21,6 +21,7 @@
}
android {
+ compileSdkVersion 35
defaultConfig {
minSdk 28
}
diff --git a/work/integration-tests/testapp/build.gradle b/work/integration-tests/testapp/build.gradle
index 7bac479..e9e5895 100644
--- a/work/integration-tests/testapp/build.gradle
+++ b/work/integration-tests/testapp/build.gradle
@@ -26,6 +26,7 @@
minifyEnabled = true
}
}
+ compileSdkVersion 35
defaultConfig {
javaCompileOptions {
annotationProcessorOptions {
