Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Android target SDK to 35 #5152

Merged
merged 1 commit into from
Oct 3, 2024
Merged

Update Android target SDK to 35 #5152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions benchmarks/ios/visual-effects-ny/androidApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/ios/visual-effects-ny/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/templates/multiplatform-template/android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion ci/templates/multiplatform-template/common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ kotlin {
}

android {
compileSdk = 34
compileSdk = 35
namespace = "com.myapplication.common"

defaultConfig {
Expand Down
4 changes: 2 additions & 2 deletions components/resources/demo/androidApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion components/resources/demo/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ kotlin {
}

android {
compileSdk = 34
compileSdk = 35
namespace = "org.jetbrains.compose.resources.demo.shared"
defaultConfig {
minSdk = 21
Expand Down
2 changes: 1 addition & 1 deletion components/resources/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ kotlin {
}

android {
compileSdk = 34
compileSdk = 35
namespace = "org.jetbrains.compose.components.resources"
defaultConfig {
minSdk = 21
Expand Down
2 changes: 1 addition & 1 deletion components/ui-tooling-preview/demo/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ kotlin {
}

android {
compileSdk = 34
compileSdk = 35
namespace = "org.jetbrains.compose.ui.tooling.preview.demo.shared"
defaultConfig {
minSdk = 21
Expand Down
2 changes: 1 addition & 1 deletion components/ui-tooling-preview/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ kotlin {
}

android {
compileSdk = 34
compileSdk = 35
namespace = "org.jetbrains.compose.ui.tooling.preview"
defaultConfig {
minSdk = 21
Expand Down
4 changes: 2 additions & 2 deletions examples/chat/androidApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/chat/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ kotlin {
}

android {
compileSdk = 34
compileSdk = 35
namespace = "org.jetbrains.chat"
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")

Expand Down
4 changes: 2 additions & 2 deletions examples/codeviewer/androidApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/codeviewer/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ kotlin {
}

android {
compileSdk = 34
compileSdk = 35
namespace = "org.jetbrains.codeviewer.common"
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
defaultConfig {
Expand Down
4 changes: 2 additions & 2 deletions examples/graphics-2d/androidApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/graphics-2d/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ kotlin {
}

android {
compileSdk = 34
compileSdk = 35
namespace = "org.jetbrains.Graphics2D"
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")

Expand Down
4 changes: 2 additions & 2 deletions examples/imageviewer/androidApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/imageviewer/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions examples/issues/android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion examples/issues/common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ apollo {
}

android {
compileSdk = 34
compileSdk = 35
namespace = "com.example.myapplication.common"

defaultConfig {
Expand Down
4 changes: 2 additions & 2 deletions examples/jetsnack/android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/jetsnack/common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/todoapp-lite/androidApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/todoapp-lite/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions examples/widgets-gallery/androidApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/widgets-gallery/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kotlin {

androidLibrary {
namespace = "com.google.samples.apps.diceroller.shared"
compileSdk = 34
compileSdk = 35
}

jvm()
Expand Down
4 changes: 2 additions & 2 deletions gradle-plugins/compose/src/test/test-projects/misc/commonResources/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions ...ins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion ...lugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ kotlin {

android {
namespace = "me.sample.library"
compileSdk = 34
compileSdk = 35
defaultConfig {
minSdk = 24
}
Expand Down
2 changes: 1 addition & 1 deletion ...compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ kotlin {

android {
namespace = "me.sample.feature"
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 24
Expand Down
Loading