Skip to content

Commit 778a365

Browse files
authored
feat: updated snippets (#2289)
* feat: updated snippets * feat: excluding lint errors * fix: merge commit * feat: updated versions
1 parent 379c83d commit 778a365

File tree

10 files changed

+254
-167
lines changed

10 files changed

+254
-167
lines changed

snippets/app-compose/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ dependencies {
8282
// [END_EXCLUDE]
8383

8484
// Android Maps Compose composables for the Maps SDK for Android
85-
implementation(libs.maps.compose)
85+
implementation("com.google.maps.android:maps-compose:6.12.0")
8686
}
8787
// [END maps_android_compose_dependency]
8888

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,18 @@ android {
5555
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
5656
}
5757
}
58-
58+
lint {
59+
abortOnError = false
60+
disable += setOf("NotificationPermission", "UseTomlInstead")
61+
lintConfig = file("lint.xml")
62+
}
63+
5964
java {
6065
toolchain {
6166
languageVersion.set(JavaLanguageVersion.of(21))
6267
}
6368
}
6469

65-
lint {
66-
lintConfig = file("lint.xml")
67-
}
6870
}
6971

7072
// [START places_android_ktx_install_snippet]
@@ -80,7 +82,7 @@ dependencies {
8082
// [END_EXCLUDE]
8183

8284
// KTX for the Places SDK for Android library
83-
implementation(libs.places.ktx)
85+
implementation("com.google.maps.android:places-ktx:3.5.0")
8486
}
8587
// [END places_android_ktx_install_snippet]
8688

snippets/app-rx/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ dependencies {
7373

7474
// It is recommended to also include the latest Maps SDK, Places SDK and RxJava so you
7575
// have the latest features and bug fixes.
76-
implementation(libs.play.services.maps)
77-
implementation(libs.places)
78-
implementation(libs.rxjava)
76+
implementation("com.google.android.gms:play-services-maps:19.2.0")
77+
implementation("com.google.android.libraries.places:places:4.4.1")
78+
implementation("io.reactivex.rxjava3:rxjava:3.1.12")
7979

8080
// [START_EXCLUDE silent]
8181
implementation(libs.appcompat)

snippets/app-utils/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ dependencies {
7878
// Utility Library for Maps SDK for Android
7979
// You do not need to add a separate dependency for the Maps SDK for Android
8080
// since this library builds in the compatible version of the Maps SDK.
81-
implementation(libs.android.maps.utils)
81+
implementation("com.google.maps.android:android-maps-utils:3.19.0")
8282
}
8383
// [END maps_android_utils_install_snippet]
8484

snippets/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ plugins {
2020
alias(libs.plugins.jetbrains.kotlin.android) apply false
2121
alias(libs.plugins.kotlin.compose) apply false
2222
alias(libs.plugins.secrets.gradle.plugin) apply false
23-
2423
}
2524
// [END maps_android_secrets_gradle_plugin_project_level_config]

snippets/gradle/libs.versions.toml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@ lifecycleRuntime = "2.9.4"
2222
mapsKtx = "5.2.0"
2323
material = "1.13.0"
2424
navigation = "2.9.5"
25-
places = "4.4.1"
25+
places = "5.0.0"
2626
play-services-maps = "19.2.0"
2727
rxlifecycleAndroidLifecycleKotlin = "4.0.2"
2828
secretsGradlePlugin = "2.0.1"
2929
volley = "1.2.1"
3030

3131
[libraries]
32-
android-maps-utils = { module = "com.google.maps.android:android-maps-utils", version.ref = "androidMapsUtils" }
3332
appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appCompat" }
3433
compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "composeFoundation" }
3534
compose-material = { group = "androidx.compose.material", name = "material", version.ref = "composeMaterial" }
@@ -41,23 +40,20 @@ junit = { module = "junit:junit", version.ref = "junit" }
4140
kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
4241
kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
4342
lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntime" }
44-
maps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "mapsCompose" }
4543
maps-ktx = { module = "com.google.maps.android:maps-ktx", version.ref = "mapsKtx" }
4644
maps-rx = { module = "com.google.maps.android:maps-rx", version.ref = "mapsRx" }
4745
maps-utils-ktx = { module = "com.google.maps.android:maps-utils-ktx", version.ref = "mapsKtx" }
4846
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
4947
navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigation" }
5048
navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigation" }
5149
places = { group = "com.google.android.libraries.places", name = "places", version.ref = "places" }
52-
places-ktx = { module = "com.google.maps.android:places-ktx", version.ref = "placesKtx" }
5350
places-rx = { module = "com.google.maps.android:places-rx", version.ref = "mapsRx" }
5451
play-services-maps = { module = "com.google.android.gms:play-services-maps", version.ref = "play-services-maps" }
55-
rxjava = { module = "io.reactivex.rxjava3:rxjava", version.ref = "rxjava" }
5652
rxlifecycle-android-lifecycle-kotlin = { module = "com.trello.rxlifecycle4:rxlifecycle-android-lifecycle-kotlin", version.ref = "rxlifecycleAndroidLifecycleKotlin" }
5753
volley = { group = "com.android.volley", name = "volley", version.ref = "volley" }
5854

5955
[plugins]
6056
android-application = { id = "com.android.application", version.ref = "agp" }
6157
jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
6258
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
63-
secrets-gradle-plugin = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secretsGradlePlugin" }
59+
secrets-gradle-plugin = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secretsGradlePlugin" }
-10.3 KB
Binary file not shown.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Wed Jul 10 22:14:33 CEST 2024
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)