Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion ApiDemos/project/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ buildscript {

allprojects {
repositories {
mavenLocal()
if (providers.gradleProperty("useMavenLocal").orNull == "true" ||
providers.environmentVariable("USE_MAVEN_LOCAL").orNull == "true") {
mavenLocal()
}
google()
mavenCentral()
}
Expand Down
1 change: 1 addition & 0 deletions FireMarkers/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
// providing dependencies to different parts of the application.
// ---------------------------------------------------------------------------------------------
implementation(libs.dagger)
ksp("org.jetbrains.kotlin:kotlin-metadata-jvm:2.4.0")
ksp(libs.hilt.android.compiler)
implementation(libs.hilt.android)

Expand Down
11 changes: 6 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# Project Configuration
androidGradlePlugin = "8.13.2"
minSdk = "24"
compileSdk = "36"
targetSdk = "36"
compileSdk = "37"
targetSdk = "37"
versionCode = "1"
versionName = "2.0.2" # {x-release-please-version}
javaVersion = "17"

# Kotlin & Coroutines
kotlin = "2.2.0"
kotlin = "2.3.21"
kotlinxCoroutinesTest = "1.10.2"
kotlinxDatetime = "0.7.1"
ksp = "2.2.20-2.0.4"
Expand All @@ -36,8 +36,9 @@
materialIconsExtended = "1.7.8"

# Google Maps & Places
mapsCompose = "7.0.0"
mapsKtx = "6.0.0"
androidMapsUtils = "5.0.0"
mapsCompose = "8.3.1"
mapsKtx = "6.1.0"
places = "5.1.1"
playServicesMaps = "20.0.0"
secretsGradlePlugin = "2.0.1"
Expand Down
4 changes: 4 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ pluginManagement {
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
repositories {
if (providers.gradleProperty("useMavenLocal").orNull == "true" ||
providers.environmentVariable("USE_MAVEN_LOCAL").orNull == "true") {
mavenLocal()
}
google()
mavenCentral()
}
Expand Down
6 changes: 3 additions & 3 deletions snippets/app-utils-ktx/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ plugins {

android {
namespace = "com.example.app_utils_ktx"
compileSdk = 36
compileSdk = libs.versions.compileSdk.get().toInt()

defaultConfig {
applicationId = "com.example.app_utils_ktx"
minSdk = 23
targetSdk = 36
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
versionCode = 1
versionName = libs.versions.versionName.get()

Expand Down
2 changes: 1 addition & 1 deletion snippets/app-utils/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
// Utility Library for Maps SDK for Android
// You do not need to add a separate dependency for the Maps SDK for Android
// since this library builds in the compatible version of the Maps SDK.
implementation("com.google.maps.android:android-maps-utils:3.19.0")
implementation("com.google.maps.android:android-maps-utils:5.0.0")
}
// [END maps_android_utils_install_snippet]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
class GeoJSON {
private GoogleMap map;

private void addGeoJsonLayerJsonObject() {
private void addGeoJsonLayerJsonObject() throws JSONException {
// [START maps_android_util_geojson_add_jsonobject]
JSONObject geoJsonData = // JSONObject containing the GeoJSON data
// [START_EXCLUDE silent]
Expand Down