Update Android target SDK to 35 (#5152)

Should fix ``` Dependency 'androidx.compose.foundation:foundation-android:1.8.0-alpha02' requires libraries and applications that depend on it to compile against version 35 or later of the Android APIs. ```
JetBrains · Oct 3, 2024 · 1b2669f · 1b2669f
1 parent 7b1b61f
commit 1b2669f
Show file tree

Hide file tree

Showing 30 changed files with 45 additions and 45 deletions.
diff --git a/benchmarks/ios/visual-effects-ny/androidApp/build.gradle.kts b/benchmarks/ios/visual-effects-ny/androidApp/build.gradle.kts
@@ -16,11 +16,11 @@ kotlin {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 35
     defaultConfig {
         applicationId = "org.jetbrains.VisualEffects"
         minSdk = 26
-        targetSdk = 33
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/benchmarks/ios/visual-effects-ny/shared/build.gradle.kts b/benchmarks/ios/visual-effects-ny/shared/build.gradle.kts
@@ -79,14 +79,14 @@ kotlin {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 35
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     sourceSets["main"].res.srcDirs("src/androidMain/res")
     sourceSets["main"].resources.srcDirs("src/commonMain/resources")
 
     defaultConfig {
         minSdk = 26
-        targetSdk = 33
+        targetSdk = 35
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11

diff --git a/ci/templates/multiplatform-template/android/build.gradle.kts b/ci/templates/multiplatform-template/android/build.gradle.kts
@@ -6,12 +6,12 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "com.myapplication"
 
     defaultConfig {
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/ci/templates/multiplatform-template/common/build.gradle.kts b/ci/templates/multiplatform-template/common/build.gradle.kts
@@ -29,7 +29,7 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "com.myapplication.common"
 
     defaultConfig {

diff --git a/components/resources/demo/androidApp/build.gradle.kts b/components/resources/demo/androidApp/build.gradle.kts
@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.jetbrains.compose.resources.demo"
     defaultConfig {
         applicationId = "me.user.androidApp"
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/components/resources/demo/shared/build.gradle.kts b/components/resources/demo/shared/build.gradle.kts
@@ -68,7 +68,7 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.jetbrains.compose.resources.demo.shared"
     defaultConfig {
         minSdk = 21

diff --git a/components/resources/library/build.gradle.kts b/components/resources/library/build.gradle.kts
@@ -160,7 +160,7 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.jetbrains.compose.components.resources"
     defaultConfig {
         minSdk = 21

diff --git a/components/ui-tooling-preview/demo/shared/build.gradle.kts b/components/ui-tooling-preview/demo/shared/build.gradle.kts
@@ -57,7 +57,7 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.jetbrains.compose.ui.tooling.preview.demo.shared"
     defaultConfig {
         minSdk = 21

diff --git a/components/ui-tooling-preview/library/build.gradle.kts b/components/ui-tooling-preview/library/build.gradle.kts
@@ -34,7 +34,7 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.jetbrains.compose.ui.tooling.preview"
     defaultConfig {
         minSdk = 21

diff --git a/examples/chat/androidApp/build.gradle.kts b/examples/chat/androidApp/build.gradle.kts
@@ -17,12 +17,12 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.jetbrains.chat"
     defaultConfig {
         applicationId = "org.jetbrains.Chat"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/examples/chat/shared/build.gradle.kts b/examples/chat/shared/build.gradle.kts
@@ -99,7 +99,7 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.jetbrains.chat"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
 

diff --git a/examples/codeviewer/androidApp/build.gradle.kts b/examples/codeviewer/androidApp/build.gradle.kts
@@ -17,12 +17,12 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.jetbrains.codeviewer"
     defaultConfig {
         applicationId = "org.jetbrains.Codeviewer"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/examples/codeviewer/shared/build.gradle.kts b/examples/codeviewer/shared/build.gradle.kts
@@ -70,7 +70,7 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.jetbrains.codeviewer.common"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {

diff --git a/examples/graphics-2d/androidApp/build.gradle.kts b/examples/graphics-2d/androidApp/build.gradle.kts
@@ -17,12 +17,12 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.jetbrains.graphics2d"
     defaultConfig {
         applicationId = "org.jetbrains.Graphics2D"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/examples/graphics-2d/shared/build.gradle.kts b/examples/graphics-2d/shared/build.gradle.kts
@@ -68,7 +68,7 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.jetbrains.Graphics2D"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
 

diff --git a/examples/imageviewer/androidApp/build.gradle.kts b/examples/imageviewer/androidApp/build.gradle.kts
@@ -18,12 +18,12 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "example.imageviewer"
     defaultConfig {
         applicationId = "org.jetbrains.Imageviewer"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/examples/imageviewer/shared/build.gradle.kts b/examples/imageviewer/shared/build.gradle.kts
@@ -90,7 +90,7 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "example.imageviewer.shared"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     sourceSets["main"].res.srcDirs("src/androidMain/res")

diff --git a/examples/issues/android/build.gradle.kts b/examples/issues/android/build.gradle.kts
@@ -6,12 +6,12 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "com.example.myapplication"
 
     defaultConfig {
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 35
         applicationId = "org.jetbrains.Issues"
         versionCode = 1
         versionName = "1.0"

diff --git a/examples/issues/common/build.gradle.kts b/examples/issues/common/build.gradle.kts
@@ -40,7 +40,7 @@ apollo {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "com.example.myapplication.common"
 
     defaultConfig {

diff --git a/examples/jetsnack/android/build.gradle.kts b/examples/jetsnack/android/build.gradle.kts
@@ -18,12 +18,12 @@ dependencies {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "example.jetsnack"
     defaultConfig {
         applicationId = "org.jetbrains.Jetsnack"
         minSdk = 24
-        targetSdk = 33
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0-SNAPSHOT"
     }

diff --git a/examples/jetsnack/common/build.gradle.kts b/examples/jetsnack/common/build.gradle.kts
@@ -95,12 +95,12 @@ kotlin {
 
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "com.example.jetsnack"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 24
-        targetSdk = 33
+        targetSdk = 35
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17

diff --git a/examples/todoapp-lite/androidApp/build.gradle.kts b/examples/todoapp-lite/androidApp/build.gradle.kts
@@ -18,12 +18,12 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "example.todoapp.lite"
     defaultConfig {
         applicationId = "org.jetbrains.TodoAppLite"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/examples/todoapp-lite/shared/build.gradle.kts b/examples/todoapp-lite/shared/build.gradle.kts
@@ -61,7 +61,7 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "example.todoapp.lite.common"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     sourceSets["main"].res.srcDirs("src/androidMain/res")

diff --git a/examples/widgets-gallery/androidApp/build.gradle.kts b/examples/widgets-gallery/androidApp/build.gradle.kts
@@ -17,12 +17,12 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.jetbrains.compose.demo.widgets"
     defaultConfig {
         applicationId = "org.jetbrains.WidgetsGallery"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/examples/widgets-gallery/shared/build.gradle.kts b/examples/widgets-gallery/shared/build.gradle.kts
@@ -77,7 +77,7 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.jetbrains.compose.demo.widgets.platform"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
 

diff --git a/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle
@@ -10,7 +10,7 @@ kotlin {
 
     androidLibrary {
         namespace = "com.google.samples.apps.diceroller.shared"
-        compileSdk = 34
+        compileSdk = 35
     }
 
     jvm()

diff --git a/gradle-plugins/compose/src/test/test-projects/misc/commonResources/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/commonResources/build.gradle.kts
@@ -33,13 +33,13 @@ kotlin {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.jetbrains.compose.resources.test"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         applicationId = "org.example.project"
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/...ins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts b/...ins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts
@@ -45,12 +45,12 @@ kotlin {
 
 android {
     namespace = "me.sample.app"
-    compileSdk = 34
+    compileSdk = 35
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         applicationId = "org.example.project"
         minSdk = 24
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/...lugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts b/...lugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts
@@ -41,7 +41,7 @@ kotlin {
 
 android {
     namespace = "me.sample.library"
-    compileSdk = 34
+    compileSdk = 35
     defaultConfig {
         minSdk = 24
     }

diff --git a/...compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts b/...compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts
@@ -30,7 +30,7 @@ kotlin {
 
 android {
     namespace = "me.sample.feature"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 24