Browse Source

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.
```
pull/511/merge v1.8.0-dev1873
Ivan Matkov 2 months ago committed by GitHub
parent
commit
1b2669f59d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      benchmarks/ios/visual-effects-ny/androidApp/build.gradle.kts
  2. 4
      benchmarks/ios/visual-effects-ny/shared/build.gradle.kts
  3. 4
      ci/templates/multiplatform-template/android/build.gradle.kts
  4. 2
      ci/templates/multiplatform-template/common/build.gradle.kts
  5. 4
      components/resources/demo/androidApp/build.gradle.kts
  6. 2
      components/resources/demo/shared/build.gradle.kts
  7. 2
      components/resources/library/build.gradle.kts
  8. 2
      components/ui-tooling-preview/demo/shared/build.gradle.kts
  9. 2
      components/ui-tooling-preview/library/build.gradle.kts
  10. 4
      examples/chat/androidApp/build.gradle.kts
  11. 2
      examples/chat/shared/build.gradle.kts
  12. 4
      examples/codeviewer/androidApp/build.gradle.kts
  13. 2
      examples/codeviewer/shared/build.gradle.kts
  14. 4
      examples/graphics-2d/androidApp/build.gradle.kts
  15. 2
      examples/graphics-2d/shared/build.gradle.kts
  16. 4
      examples/imageviewer/androidApp/build.gradle.kts
  17. 2
      examples/imageviewer/shared/build.gradle.kts
  18. 4
      examples/issues/android/build.gradle.kts
  19. 2
      examples/issues/common/build.gradle.kts
  20. 4
      examples/jetsnack/android/build.gradle.kts
  21. 4
      examples/jetsnack/common/build.gradle.kts
  22. 4
      examples/todoapp-lite/androidApp/build.gradle.kts
  23. 2
      examples/todoapp-lite/shared/build.gradle.kts
  24. 4
      examples/widgets-gallery/androidApp/build.gradle.kts
  25. 2
      examples/widgets-gallery/shared/build.gradle.kts
  26. 2
      gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle
  27. 4
      gradle-plugins/compose/src/test/test-projects/misc/commonResources/build.gradle.kts
  28. 4
      gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts
  29. 2
      gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts
  30. 2
      gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts

4
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"
}

4
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

4
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"
}

2
ci/templates/multiplatform-template/common/build.gradle.kts

@ -29,7 +29,7 @@ kotlin {
}
android {
compileSdk = 34
compileSdk = 35
namespace = "com.myapplication.common"
defaultConfig {

4
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"
}

2
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

2
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

2
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

2
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

4
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"
}

2
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")

4
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"
}

2
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 {

4
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"
}

2
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")

4
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"
}

2
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")

4
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"

2
examples/issues/common/build.gradle.kts

@ -40,7 +40,7 @@ apollo {
}
android {
compileSdk = 34
compileSdk = 35
namespace = "com.example.myapplication.common"
defaultConfig {

4
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"
}

4
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

4
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"
}

2
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")

4
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"
}

2
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")

2
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()

4
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"
}

4
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"
}

2
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
}

2
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

Loading…
Cancel
Save