diff --git a/gradle.properties b/gradle.properties index ffec2b3..9f7e301 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,3 +34,4 @@ mavenCentralPassword= mavenCentralAutomaticRelease=false android.builtInKotlin=false android.newDsl=false +android.suppressUnsupportedCompileSdk=37 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 93e31f5..f5e3f7c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,8 +17,8 @@ kotlinxCoroutinesPlayServices = "1.10.2" ksp = "2.3.2" lifecycleRuntimeKtx = "2.10.0" lifecycleViewmodelCompose = "2.10.0" -mapsCompose = "8.3.0" -mapsUtilsKtx = "6.0.1" +mapsCompose = "9.0.0-rc01" +mapsUtils = "6.0.0-rc01" material-icons = "1.7.8" materialVersion = "1.13.0" navigationCompose = "2.9.8" @@ -66,7 +66,8 @@ kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "ko maps-compose = { group = "com.google.maps.android", name = "maps-compose", version.ref = "mapsCompose" } maps-compose-utils = { module = "com.google.maps.android:maps-compose-utils", version.ref = "mapsCompose" } maps-compose-widgets = { module = "com.google.maps.android:maps-compose-widgets", version.ref = "mapsCompose" } -maps-utils-ktx = { module = "com.google.maps.android:maps-utils-ktx", version.ref = "mapsUtilsKtx" } +android-maps-utils = { module = "com.google.maps.android:android-maps-utils", version.ref = "mapsUtils" } +android-maps-utils-core = { module = "com.google.maps.android:android-maps-utils-core", version.ref = "mapsUtils" } material = { group = "com.google.android.material", name = "material", version.ref = "materialVersion" } org-jacoco-core = { module = "org.jacoco:org.jacoco.core", version.ref = "org-jacoco-core" } places = { group = "com.google.android.libraries.places", name = "places", version.ref = "places" } diff --git a/places-compose-demo/build.gradle.kts b/places-compose-demo/build.gradle.kts index ca5b220..cb87880 100644 --- a/places-compose-demo/build.gradle.kts +++ b/places-compose-demo/build.gradle.kts @@ -7,13 +7,17 @@ plugins { alias(libs.plugins.compose.compiler) } +hilt { + enableAggregatingTask = false +} + android { lint { sarifOutput = layout.buildDirectory.file("reports/lint-results.sarif").get().asFile } namespace = "com.google.android.libraries.places.compose.demo" - compileSdk = 36 + compileSdk = 37 defaultConfig { applicationId = "com.google.android.libraries.places.compose.demo" @@ -109,7 +113,7 @@ dependencies { implementation(libs.maps.compose) implementation(libs.maps.compose.utils) implementation(libs.maps.compose.widgets) - implementation(libs.maps.utils.ktx) + implementation(libs.android.maps.utils) // Accompanist permission helper implementation(libs.accompanist.permissions) diff --git a/places-compose-demo/src/main/java/com/google/android/libraries/places/compose/demo/presentation/common/CommonViewModel.kt b/places-compose-demo/src/main/java/com/google/android/libraries/places/compose/demo/presentation/common/CommonViewModel.kt index dec3e9b..a371166 100644 --- a/places-compose-demo/src/main/java/com/google/android/libraries/places/compose/demo/presentation/common/CommonViewModel.kt +++ b/places-compose-demo/src/main/java/com/google/android/libraries/places/compose/demo/presentation/common/CommonViewModel.kt @@ -17,7 +17,7 @@ import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.stateIn import javax.inject.Inject import kotlin.time.Duration.Companion.seconds -import com.google.maps.android.ktx.utils.sphericalDistance +import com.google.maps.android.sphericalDistance import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filterNotNull diff --git a/places-compose-demo/src/main/java/com/google/android/libraries/places/compose/demo/presentation/minimal/PlacesAutocompleteMinimalActivity.kt b/places-compose-demo/src/main/java/com/google/android/libraries/places/compose/demo/presentation/minimal/PlacesAutocompleteMinimalActivity.kt index 70d803b..47a392e 100644 --- a/places-compose-demo/src/main/java/com/google/android/libraries/places/compose/demo/presentation/minimal/PlacesAutocompleteMinimalActivity.kt +++ b/places-compose-demo/src/main/java/com/google/android/libraries/places/compose/demo/presentation/minimal/PlacesAutocompleteMinimalActivity.kt @@ -52,7 +52,7 @@ import com.google.android.libraries.places.compose.demo.data.repositories.Geocod import com.google.android.libraries.places.compose.demo.data.repositories.LocationRepository import com.google.android.libraries.places.compose.demo.presentation.landmark.GetLocationPermission import com.google.android.libraries.places.compose.demo.ui.theme.AndroidPlacesComposeDemoTheme -import com.google.maps.android.ktx.utils.withSphericalOffset +import com.google.maps.android.withSphericalOffset import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.FlowPreview diff --git a/places-compose/build.gradle.kts b/places-compose/build.gradle.kts index ddd0ab2..15367d2 100644 --- a/places-compose/build.gradle.kts +++ b/places-compose/build.gradle.kts @@ -13,7 +13,7 @@ android { } namespace = "com.google.android.libraries.places.compose" - compileSdk = 36 + compileSdk = 37 defaultConfig { minSdk = 24 diff --git a/settings.gradle.kts b/settings.gradle.kts index 16a2f0f..352b2ce 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -18,6 +18,7 @@ plugins { dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { + mavenLocal() google() mavenCentral() }