Skip to content

Commit e0b85bc

Browse files
authored
build: update Android to 35, kotlin to 2.0.21, lifecycle to 2.8.7 (#1931)
* build: update Android to 35, kotlin to 2.0.21, lifecycle to 2.8.7 * chore: update snippets to target android-35. Update snippets libraries * chore: Update minSdk to 23 for the snippets
1 parent 55c6297 commit e0b85bc

File tree

11 files changed

+30
-30
lines changed

11 files changed

+30
-30
lines changed

ApiDemos/kotlin/app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ plugins {
2222
}
2323

2424
android {
25-
compileSdk = 34
25+
compileSdk = 35
2626

2727
defaultConfig {
2828
applicationId = "com.example.kotlindemos"
2929
minSdk = 21
30-
targetSdk = 34
30+
targetSdk = 35
3131
versionCode = 1
3232
versionName = "1.0"
3333
testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"

ApiDemos/kotlin/gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[versions]
22
gradle = "8.5.2"
3-
kotlin = "2.0.0"
3+
kotlin = "2.0.21"
44
appcompat = "1.7.0"
55
cardview = "1.0.0"
66
recyclerview = "1.3.2"
77
multidex = "2.0.1"
88
secretsGradlePlugin = "2.0.1"
99
volley = "1.2.1"
10-
lifecycle = "2.8.4"
10+
lifecycle = "2.8.7"
1111
mapsKtx = "5.1.1"
1212
easypermissions = "3.0.0"
1313
junit = "4.13.2"

snippets/app-compose/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
plugins {
1818
id("com.android.application")
1919
id("org.jetbrains.kotlin.android")
20-
id("org.jetbrains.kotlin.plugin.compose") version "2.0.0"
20+
id("org.jetbrains.kotlin.plugin.compose") version "2.0.21"
2121
id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
2222
}
2323

2424
android {
2525
namespace = "com.example.app_compose"
26-
compileSdk = 34
26+
compileSdk = 35
2727

2828
defaultConfig {
2929
applicationId = "com.example.app_compose"
30-
minSdk = 21
31-
targetSdk = 34
30+
minSdk = 23
31+
targetSdk = 35
3232
versionCode = 1
3333
versionName = "1.0"
3434

@@ -72,7 +72,7 @@ dependencies {
7272
// [END_EXCLUDE]
7373

7474
// Android Maps Compose composables for the Maps SDK for Android
75-
implementation("com.google.maps.android:maps-compose:6.2.1")
75+
implementation("com.google.maps.android:maps-compose:6.4.0")
7676
}
7777
// [END maps_android_compose_dependency]
7878

snippets/app-ktx/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ plugins {
2222

2323
android {
2424
namespace = "com.example.app_ktx"
25-
compileSdk = 34
25+
compileSdk = 35
2626

2727
defaultConfig {
2828
applicationId = "com.example.app_ktx"
29-
minSdk = 21
30-
targetSdk = 34
29+
minSdk = 23
30+
targetSdk = 35
3131
versionCode = 1
3232
versionName = "1.0"
3333

snippets/app-places-ktx/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ plugins {
2222

2323
android {
2424
namespace = "com.example.app_places_ktx"
25-
compileSdk = 34
25+
compileSdk = 35
2626

2727
defaultConfig {
2828
applicationId = "com.example.app_places_ktx"
29-
minSdk = 21
30-
targetSdk = 34
29+
minSdk = 23
30+
targetSdk = 35
3131
versionCode = 1
3232
versionName = "1.0"
3333

@@ -66,7 +66,7 @@ dependencies {
6666
// [END_EXCLUDE]
6767

6868
// KTX for the Places SDK for Android library
69-
implementation("com.google.maps.android:places-ktx:3.2.0")
69+
implementation("com.google.maps.android:places-ktx:3.3.1")
7070
}
7171
// [END places_android_ktx_install_snippet]
7272

snippets/app-rx/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ plugins {
2222

2323
android {
2424
namespace = "com.example.app_maps_rx"
25-
compileSdk = 34
25+
compileSdk = 35
2626

2727
defaultConfig {
2828
applicationId = "com.example.app_maps_rx"
2929
minSdk = 24
30-
targetSdk = 34
30+
targetSdk = 35
3131
versionCode = 1
3232
versionName = "1.0"
3333

@@ -64,7 +64,7 @@ dependencies {
6464
// It is recommended to also include the latest Maps SDK, Places SDK and RxJava so you
6565
// have the latest features and bug fixes.
6666
implementation("com.google.android.gms:play-services-maps:19.0.0")
67-
implementation("com.google.android.libraries.places:places:3.5.0")
67+
implementation("com.google.android.libraries.places:places:4.1.0")
6868
implementation("io.reactivex.rxjava3:rxjava:3.1.8")
6969

7070
// [START_EXCLUDE silent]

snippets/app-utils-ktx/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ plugins {
2222

2323
android {
2424
namespace = "com.example.app_utils_ktx"
25-
compileSdk = 34
25+
compileSdk = 35
2626

2727
defaultConfig {
2828
applicationId = "com.example.app_utils_ktx"
29-
minSdk = 21
30-
targetSdk = 34
29+
minSdk = 23
30+
targetSdk = 35
3131
versionCode = 1
3232
versionName = "1.0"
3333

snippets/app-utils/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ plugins {
2222

2323
android {
2424
namespace = "com.example.app_utils"
25-
compileSdk = 34
25+
compileSdk = 35
2626

2727
defaultConfig {
2828
applicationId = "com.example.app_utils"
29-
minSdk = 21
30-
targetSdk = 34
29+
minSdk = 23
30+
targetSdk = 35
3131
versionCode = 1
3232
versionName = "1.0"
3333

@@ -68,7 +68,7 @@ dependencies {
6868
// Utility Library for Maps SDK for Android
6969
// You do not need to add a separate dependency for the Maps SDK for Android
7070
// since this library builds in the compatible version of the Maps SDK.
71-
implementation("com.google.maps.android:android-maps-utils:3.8.2")
71+
implementation("com.google.maps.android:android-maps-utils:3.9.0")
7272
}
7373
// [END maps_android_utils_install_snippet]
7474

snippets/app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ plugins {
2525
// [END maps_android_secrets_gradle_plugin]
2626

2727
android {
28-
compileSdk = 34
28+
compileSdk = 35
2929
defaultConfig {
3030
applicationId = "com.google.maps.example"
3131
minSdk = 24
32-
targetSdk = 34
32+
targetSdk = 35
3333
versionCode = 1
3434
versionName = "1.0"
3535
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

snippets/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ buildscript {
2323
// [END maps_android_secrets_gradle_plugin_project_level_config]
2424

2525
plugins {
26-
id("com.android.application") version "8.5.0" apply false
26+
id("com.android.application") version "8.7.3" apply false
2727
id("org.jetbrains.kotlin.android") version "2.0.0" apply false
2828
}
2929

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Wed Jul 10 22:14:33 CEST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)