From 16cd89e4ed0823930f971297c74a6f1f3114259e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20L=C3=B3pez=20Ma=C3=B1as?= Date: Wed, 27 Sep 2023 21:45:01 +0200 Subject: [PATCH] chore: update dependencies (#377) * chore: updating libraries * chore: changed coroutines version * chore: rename dependency, remove unnecessary dependencies * chore: updated Java version * chore: increased targetSdk --- .github/workflows/docs.yml | 4 +-- .github/workflows/instrumentation-test.yml | 4 +-- .github/workflows/test.yml | 4 +-- app/build.gradle | 5 ++- .../android/compose/MapClusteringActivity.kt | 6 +++- build.gradle | 2 +- gradle.properties | 6 +++- gradle/libs.versions.toml | 33 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- maps-compose-utils/build.gradle | 4 +-- maps-compose-widgets/build.gradle | 4 +-- maps-compose/build.gradle | 4 +-- .../google/maps/android/compose/MapApplier.kt | 3 +- 13 files changed, 43 insertions(+), 38 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 4a9bcc33..767576ea 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -34,10 +34,10 @@ jobs: - name: Gradle Wrapper Validation uses: gradle/wrapper-validation-action@v1.0.4 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v2.3.1 with: - java-version: '11' + java-version: '17' distribution: 'adopt' # Run dokka and create tar diff --git a/.github/workflows/instrumentation-test.yml b/.github/workflows/instrumentation-test.yml index 6d98e2e4..966ceb78 100644 --- a/.github/workflows/instrumentation-test.yml +++ b/.github/workflows/instrumentation-test.yml @@ -35,10 +35,10 @@ jobs: - name: Gradle Wrapper Validation uses: gradle/wrapper-validation-action@v1.0.4 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v2.3.1 with: - java-version: '11' + java-version: '17' distribution: 'adopt' - name: Inject Maps API Key diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8c64172d..0e20193f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,10 +37,10 @@ jobs: - name: Gradle Wrapper Validation uses: gradle/wrapper-validation-action@v1.0.4 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' - name: Build modules diff --git a/app/build.gradle b/app/build.gradle index 80dfba4a..c823a2ee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,11 +6,11 @@ plugins { android { namespace "com.google.maps.android.compose" - compileSdk 33 + compileSdk 34 defaultConfig { minSdk 21 - targetSdk 33 + targetSdk 34 versionCode 1 versionName "1.0" @@ -45,7 +45,6 @@ dependencies { implementation libs.kotlin implementation libs.material implementation libs.maps.ktx.std - implementation libs.maps.utils implementation libs.androidx.compose.ui.preview.tooling debugImplementation libs.androidx.compose.ui.tooling diff --git a/app/src/main/java/com/google/maps/android/compose/MapClusteringActivity.kt b/app/src/main/java/com/google/maps/android/compose/MapClusteringActivity.kt index 8c0c487b..d545dd8e 100644 --- a/app/src/main/java/com/google/maps/android/compose/MapClusteringActivity.kt +++ b/app/src/main/java/com/google/maps/android/compose/MapClusteringActivity.kt @@ -48,7 +48,7 @@ fun GoogleMapClustering() { singapore2.latitude + Random.nextFloat(), singapore2.longitude + Random.nextFloat(), ) - items.add(MyItem(position, "Marker", "Snippet")) + items.add(MyItem(position, "Marker", "Snippet", 0f)) } } GoogleMapClustering(items = items) @@ -113,6 +113,7 @@ data class MyItem( val itemPosition: LatLng, val itemTitle: String, val itemSnippet: String, + val itemZIndex: Float, ) : ClusterItem { override fun getPosition(): LatLng = itemPosition @@ -122,4 +123,7 @@ data class MyItem( override fun getSnippet(): String = itemSnippet + + override fun getZIndex(): Float = + itemZIndex } diff --git a/build.gradle b/build.gradle index 503e9d46..02b6cded 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ subprojects { project -> if (project.ext.artifactId == null) return apply plugin: 'com.android.library' - apply plugin: 'com.hiya.jacoco-android' + apply plugin: 'com.mxalbert.gradle.jacoco-android' apply plugin: 'maven-publish' apply plugin: 'org.jetbrains.dokka' apply plugin: 'signing' diff --git a/gradle.properties b/gradle.properties index 9bff6491..9b719907 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,4 +28,8 @@ signing.password= signing.secretKeyRingFile= sonatypeUsername= -sonatypePassword= \ No newline at end of file +sonatypePassword= + +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cdbb794c..80f80357 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,19 +1,19 @@ [versions] -activitycompose = "1.6.1" -agp = "7.3.1" +activitycompose = "1.7.2" +agp = "8.1.1" androidxtest = "1.5.0" -compose-bom = "2022.11.00" -composecompiler = "1.3.2" -coroutines = "1.6.0" +compose-bom = "2023.09.01" +composecompiler = "1.5.3" +coroutines = "1.6.4" dokka = "1.9.0" -espresso = "3.4.0" -jacoco-plugin = "0.2" +espresso = "3.5.1" +jacoco-plugin = "0.2.1" jacoco-tool-plugin = "0.8.7" -junitktx = "1.1.3" +junitktx = "1.1.5" junit = "4.13.2" -kotlin = "1.7.20" -material = "1.5.0" -maps = "3.4.0" +kotlin = "1.9.10" +material = "1.9.0" +mapsktx = "4.0.0" mapsecrets = "2.0.1" [libraries] @@ -25,7 +25,7 @@ androidx-compose-material = { module = "androidx.compose.material:material" } androidx-compose-ui = { module = "androidx.compose.ui:ui" } androidx-compose-ui-preview-tooling = { module = "androidx.compose.ui:ui-tooling-preview" } androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } -androidx-core = { module = "androidx.core:core-ktx", version.require = "1.7.0" } +androidx-core = { module = "androidx.core:core-ktx", version.require = "1.12.0" } androidx-test-compose-ui = { module = "androidx.compose.ui:ui-test-junit4" } androidx-test-core = { module = "androidx.test:core", version.ref = "androidxtest" } androidx-test-espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" } @@ -34,16 +34,15 @@ androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxt androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidxtest" } coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" } -jacoco-android-plugin = { module = "com.hiya:jacoco-android", version.ref = "jacoco-plugin" } +jacoco-android-plugin = { module = "com.mxalbert.gradle:jacoco-android", version.ref = "jacoco-plugin", version.require = "0.2.1" } kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" } kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } -maps-ktx-std = { module = "com.google.maps.android:maps-ktx", version.ref = "maps" } -maps-ktx-utils = { module = "com.google.maps.android:maps-utils-ktx", version.ref = "maps" } -maps-utils = { module = "com.google.maps.android:android-maps-utils", version.require = "2.3.0" } +maps-ktx-std = { module = "com.google.maps.android:maps-ktx", version.ref = "mapsktx" } +maps-ktx-utils = { module = "com.google.maps.android:maps-utils-ktx", version.ref = "mapsktx" } maps-playservice = { module = "com.google.android.gms:play-services-maps", version.require = "18.1.0" } maps-secrets-plugin = { module = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin", version.ref = "mapsecrets" } material = { module = "com.google.android.material:material", version.ref = "material" } test-junit = { module = "junit:junit", version.ref = "junit" } [plugins] -dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } +dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca147a95..f2696e7c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Nov 17 17:56:49 EST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/maps-compose-utils/build.gradle b/maps-compose-utils/build.gradle index 730827bd..2febaa60 100644 --- a/maps-compose-utils/build.gradle +++ b/maps-compose-utils/build.gradle @@ -4,11 +4,11 @@ plugins { android { namespace "com.google.maps.android.compose.utils" - compileSdk 33 + compileSdk 34 defaultConfig { minSdk 21 - targetSdk 33 + targetSdk 34 versionCode 1 versionName "1.0" } diff --git a/maps-compose-widgets/build.gradle b/maps-compose-widgets/build.gradle index 985721fb..ecd945fc 100644 --- a/maps-compose-widgets/build.gradle +++ b/maps-compose-widgets/build.gradle @@ -4,11 +4,11 @@ plugins { android { namespace "com.google.maps.android.compose.widgets" - compileSdk 33 + compileSdk 34 defaultConfig { minSdk 21 - targetSdk 33 + targetSdk 34 versionCode 1 versionName "1.0" } diff --git a/maps-compose/build.gradle b/maps-compose/build.gradle index f068d5cc..5da3074a 100644 --- a/maps-compose/build.gradle +++ b/maps-compose/build.gradle @@ -4,11 +4,11 @@ plugins { android { namespace "com.google.maps.android.compose" - compileSdk 33 + compileSdk 34 defaultConfig { minSdk 21 - targetSdk 33 + targetSdk 34 versionCode 1 versionName "1.0" } diff --git a/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt b/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt index a1df579b..37452efe 100644 --- a/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt +++ b/maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2023 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -110,7 +110,6 @@ internal class MapApplier( nodeInputCallback = { onMarkerClick }, inputHandlerCallback = { onMarkerClick } ) - ?: false } map.setOnInfoWindowClickListener { marker -> decorations.findInputCallback(