From 1b2669f59d8f9a5cda1a26388a51e8c6793981c8 Mon Sep 17 00:00:00 2001
From: Ivan Matkov <ivan.matkov@jetbrains.com>
Date: Thu, 3 Oct 2024 11:18:40 +0200
Subject: [PATCH] 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.
```
---
 benchmarks/ios/visual-effects-ny/androidApp/build.gradle.kts  | 4 ++--
 benchmarks/ios/visual-effects-ny/shared/build.gradle.kts      | 4 ++--
 ci/templates/multiplatform-template/android/build.gradle.kts  | 4 ++--
 ci/templates/multiplatform-template/common/build.gradle.kts   | 2 +-
 components/resources/demo/androidApp/build.gradle.kts         | 4 ++--
 components/resources/demo/shared/build.gradle.kts             | 2 +-
 components/resources/library/build.gradle.kts                 | 2 +-
 components/ui-tooling-preview/demo/shared/build.gradle.kts    | 2 +-
 components/ui-tooling-preview/library/build.gradle.kts        | 2 +-
 examples/chat/androidApp/build.gradle.kts                     | 4 ++--
 examples/chat/shared/build.gradle.kts                         | 2 +-
 examples/codeviewer/androidApp/build.gradle.kts               | 4 ++--
 examples/codeviewer/shared/build.gradle.kts                   | 2 +-
 examples/graphics-2d/androidApp/build.gradle.kts              | 4 ++--
 examples/graphics-2d/shared/build.gradle.kts                  | 2 +-
 examples/imageviewer/androidApp/build.gradle.kts              | 4 ++--
 examples/imageviewer/shared/build.gradle.kts                  | 2 +-
 examples/issues/android/build.gradle.kts                      | 4 ++--
 examples/issues/common/build.gradle.kts                       | 2 +-
 examples/jetsnack/android/build.gradle.kts                    | 4 ++--
 examples/jetsnack/common/build.gradle.kts                     | 4 ++--
 examples/todoapp-lite/androidApp/build.gradle.kts             | 4 ++--
 examples/todoapp-lite/shared/build.gradle.kts                 | 2 +-
 examples/widgets-gallery/androidApp/build.gradle.kts          | 4 ++--
 examples/widgets-gallery/shared/build.gradle.kts              | 2 +-
 .../test-projects/application/newAndroidTarget/build.gradle   | 2 +-
 .../test/test-projects/misc/commonResources/build.gradle.kts  | 4 ++--
 .../misc/kmpResourcePublication/appModule/build.gradle.kts    | 4 ++--
 .../misc/kmpResourcePublication/cmplib/build.gradle.kts       | 2 +-
 .../kmpResourcePublication/featureModule/build.gradle.kts     | 2 +-
 30 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/benchmarks/ios/visual-effects-ny/androidApp/build.gradle.kts b/benchmarks/ios/visual-effects-ny/androidApp/build.gradle.kts
index 61a9bd4d72..962ab31289 100644
--- 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
index 48f2c79381..5ac6adeadb 100644
--- 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
index 3b8151dac1..f3acdfa1cb 100644
--- 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
index 255c9058ef..3aa4081566 100644
--- 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
index bf0d6c00a0..7e2bee232d 100644
--- 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
index 5dc1580b80..ec50b1e233 100644
--- 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
index 088f94323d..68c2b48fcc 100644
--- 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
index 754457c4b0..a029b500ad 100644
--- 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
index 1007eadc3b..3aa2dca631 100644
--- 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
index a7edbd975e..d2a0c56653 100644
--- 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
index a54ffe5228..c37c93f1d2 100644
--- 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
index d314ebb40b..4fb5295d46 100644
--- 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
index 233239f707..2670d7ce73 100644
--- 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
index 900e901eba..fd5a2d40ab 100644
--- 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
index 176594ed84..8005b00f94 100644
--- 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
index c091007983..e080c5f3f2 100755
--- 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
index 32e94f66f5..b9d7966c5d 100755
--- 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
index 156819f33b..2baa1b784b 100644
--- 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
index ebc6eef1b4..8d97331448 100644
--- 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
index 9a3e0bf130..b8904fd7ec 100644
--- 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
index 1b493a005b..08100273ed 100644
--- 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
index a132898a20..deb82658af 100755
--- 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
index 0208a8b722..1371124e9f 100755
--- 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
index 1b91eecaa7..58d9fcd38e 100644
--- 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
index 00b6b2dac5..33f6e137cd 100644
--- 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
index ef45b4a99e..9faff0a6f6 100644
--- 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
index 5629e0ad3e..26a21ee7e9 100644
--- 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/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts
index aac9ee2149..2c3b6955ef 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts
+++ b/gradle-plugins/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/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts
index ed9522a57c..cc5a941daf 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts
+++ b/gradle-plugins/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/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts
index 3d239458d8..bd92b891d6 100644
--- a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts
+++ b/gradle-plugins/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