From 9f5dd1fc85d472bc9b4b6aa63a2c996e101b2bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Wed, 16 Oct 2024 17:50:45 +0200 Subject: [PATCH 1/6] chore: changed secrets name --- app/build.gradle | 11 ++++++++--- build.gradle.kts | 23 +++++++++++++++++++---- gradle/wrapper/gradle-wrapper.properties | 4 ++-- maps-rx/build.gradle | 6 ++++-- places-rx/build.gradle | 6 ++++-- shared/build.gradle | 6 ++++-- 6 files changed, 41 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 49f2af6..ac8048a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,16 +1,21 @@ plugins { id 'com.android.application' + id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' id 'kotlin-android' - id 'com.google.android.secrets-gradle-plugin' version '1.1.0' } android { - compileSdkVersion 31 + buildFeatures { + buildConfig = true + } + + compileSdk 34 + namespace = "com.google.maps.android.rx.demo" defaultConfig { applicationId "com.google.maps.android.rx.demo" minSdkVersion 24 - targetSdkVersion 31 + targetSdkVersion 35 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/build.gradle.kts b/build.gradle.kts index 5836f39..f0beb41 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,10 +23,11 @@ buildscript { maven(url = "https://plugins.gradle.org/m2/") } dependencies { - classpath("com.android.tools.build:gradle:4.2.2") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21") + classpath("com.android.tools.build:gradle:8.7.1") + classpath("com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22") classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0") - classpath("com.hiya:jacoco-android:0.2") + classpath("com.mxalbert.gradle:jacoco-android:0.2.1") } } @@ -56,7 +57,8 @@ subprojects { apply(plugin = "maven-publish") apply(plugin = "org.jetbrains.dokka") apply(plugin = "signing") - apply(plugin = "com.hiya.jacoco-android") + apply(plugin = "com.mxalbert.gradle.jacoco-android") + val sourcesJar = task("sourcesJar") { archiveClassifier.set("sources") @@ -64,6 +66,19 @@ subprojects { from(libraryExtension.sourceSets["main"].java.srcDirs) } + configure { + toolVersion = "0.8.7" + + } + + tasks.withType().configureEach { + extensions.configure { + isIncludeNoLocationClasses = true + excludes = listOf("jdk.internal.*") + } + } + + val dokkaHtml = tasks.named("dokkaHtml") val dokkaJavadoc = tasks.named("dokkaJavadoc") val javadocJar = task("javadocJar") { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 11dd81b..3f44e00 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Feb 22 14:51:15 PST 2021 +#Wed Oct 16 17:13:36 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip diff --git a/maps-rx/build.gradle b/maps-rx/build.gradle index 63f355f..941f23d 100644 --- a/maps-rx/build.gradle +++ b/maps-rx/build.gradle @@ -1,9 +1,11 @@ android { - compileSdkVersion 30 + namespace = "com.google.maps.android.rx" + + compileSdk 34 defaultConfig { minSdkVersion 24 - targetSdkVersion 30 + targetSdkVersion 35 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" } diff --git a/places-rx/build.gradle b/places-rx/build.gradle index 202405f..7c628dd 100644 --- a/places-rx/build.gradle +++ b/places-rx/build.gradle @@ -1,9 +1,11 @@ android { - compileSdkVersion 30 + namespace = "com.google.maps.android.rx" + + compileSdk 34 defaultConfig { minSdkVersion 24 - targetSdkVersion 30 + targetSdkVersion 35 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" } diff --git a/shared/build.gradle b/shared/build.gradle index f526cdb..56b3edb 100644 --- a/shared/build.gradle +++ b/shared/build.gradle @@ -4,11 +4,13 @@ plugins { } android { - compileSdkVersion 30 + namespace = "com.google.maps.android.rx.shared" + + compileSdk 34 defaultConfig { minSdkVersion 24 - targetSdkVersion 30 + targetSdkVersion 35 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" } From d46c69cf6f03738cf1c06f2e1984ed65a1d9b8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Wed, 16 Oct 2024 18:59:44 +0200 Subject: [PATCH 2/6] chore: changed secrets name --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 30d8b51..99c72b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,8 +43,8 @@ jobs: GPG_KEY_ARMOR: "${{ secrets.SYNCED_GPG_KEY_ARMOR }}" GPG_KEY_ID: ${{ secrets.SYNCED_GPG_KEY_ID }} GPG_PASSWORD: ${{ secrets.SYNCED_GPG_KEY_PASSWORD }} - SONATYPE_PASSWORD: ${{ secrets.SYNCED_SONATYPE_PASSWORD }} - SONATYPE_USERNAME: ${{ secrets.SYNCED_SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_TOKEN_PASSWORD }} + SONATYPE_USERNAME: ${{ secrets.SONATYPE_TOKEN }} - name: Semantic Release uses: cycjimmy/semantic-release-action@v3 with: From ac33f20b378978505efee8a4911f0d42ac572730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Wed, 16 Oct 2024 19:12:13 +0200 Subject: [PATCH 3/6] chore: set Java 17 --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4fc6ad0..db26846 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,10 +36,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 From f533bef4807906f496f1c82a6ddbddd017f31d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Wed, 16 Oct 2024 19:20:47 +0200 Subject: [PATCH 4/6] chore: setting T as Any --- .../java/com/google/maps/android/rx/shared/MainThreadMaybe.kt | 2 +- .../com/google/maps/android/rx/shared/MainThreadObservable.kt | 2 +- .../java/com/google/maps/android/rx/shared/MainThreadSingle.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/src/main/java/com/google/maps/android/rx/shared/MainThreadMaybe.kt b/shared/src/main/java/com/google/maps/android/rx/shared/MainThreadMaybe.kt index 2df8aa7..acdf81f 100644 --- a/shared/src/main/java/com/google/maps/android/rx/shared/MainThreadMaybe.kt +++ b/shared/src/main/java/com/google/maps/android/rx/shared/MainThreadMaybe.kt @@ -22,7 +22,7 @@ import io.reactivex.rxjava3.disposables.Disposable /** * A Single that enforces that subscriptions occur on the Android main thread. */ -public abstract class MainThreadMaybe : Maybe() { +public abstract class MainThreadMaybe : Maybe() { override fun subscribeActual(observer: MaybeObserver) { if (Looper.myLooper() != Looper.getMainLooper()) { observer.onSubscribe(Disposable.empty()) diff --git a/shared/src/main/java/com/google/maps/android/rx/shared/MainThreadObservable.kt b/shared/src/main/java/com/google/maps/android/rx/shared/MainThreadObservable.kt index 4d1b33c..2941814 100644 --- a/shared/src/main/java/com/google/maps/android/rx/shared/MainThreadObservable.kt +++ b/shared/src/main/java/com/google/maps/android/rx/shared/MainThreadObservable.kt @@ -22,7 +22,7 @@ import io.reactivex.rxjava3.disposables.Disposable /** * An Observable that enforces that subscriptions occur on the Android main thread. */ -public abstract class MainThreadObservable : Observable() { +public abstract class MainThreadObservable : Observable() { override fun subscribeActual(observer: Observer) { if (Looper.myLooper() != Looper.getMainLooper()) { observer.onSubscribe(Disposable.empty()) diff --git a/shared/src/main/java/com/google/maps/android/rx/shared/MainThreadSingle.kt b/shared/src/main/java/com/google/maps/android/rx/shared/MainThreadSingle.kt index a7f9f4a..fb5592b 100644 --- a/shared/src/main/java/com/google/maps/android/rx/shared/MainThreadSingle.kt +++ b/shared/src/main/java/com/google/maps/android/rx/shared/MainThreadSingle.kt @@ -22,7 +22,7 @@ import io.reactivex.rxjava3.disposables.Disposable /** * A Single that enforces that subscriptions occur on the Android main thread. */ -public abstract class MainThreadSingle : Single() { +public abstract class MainThreadSingle : Single() { override fun subscribeActual(observer: SingleObserver) { if (Looper.myLooper() != Looper.getMainLooper()) { From 340e732e36316d410a4a18ff84bff22bc99637ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Wed, 16 Oct 2024 19:43:22 +0200 Subject: [PATCH 5/6] chore: moved package --- maps-rx/build.gradle | 2 +- maps-rx/src/main/AndroidManifest.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/maps-rx/build.gradle b/maps-rx/build.gradle index 941f23d..73a5464 100644 --- a/maps-rx/build.gradle +++ b/maps-rx/build.gradle @@ -1,5 +1,5 @@ android { - namespace = "com.google.maps.android.rx" + namespace = "com.google.maps.android.rx.maps" compileSdk 34 diff --git a/maps-rx/src/main/AndroidManifest.xml b/maps-rx/src/main/AndroidManifest.xml index 33fdf0b..d2171c0 100644 --- a/maps-rx/src/main/AndroidManifest.xml +++ b/maps-rx/src/main/AndroidManifest.xml @@ -15,7 +15,6 @@ limitations under the License. --> - + \ No newline at end of file From 65d386385bb9874efb4c1941f1c94b09b411bab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Wed, 16 Oct 2024 19:53:35 +0200 Subject: [PATCH 6/6] chore: lint --- app/build.gradle | 2 +- places-rx/build.gradle | 2 +- places-rx/src/main/AndroidManifest.xml | 3 +-- .../maps/android/rx/places/internal/MainThreadTaskSingle.kt | 2 +- .../maps/android/rx/places/internal/TaskCompletionListener.kt | 2 +- shared/src/main/AndroidManifest.xml | 3 +-- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ac8048a..c378303 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,7 +48,7 @@ dependencies { // It is recommended to also include the latest Maps SDK, Places SDK and RxJava so you // have the latest features and bug fixes. implementation "com.google.android.gms:play-services-maps:18.0.2" - implementation 'com.google.android.libraries.places:places:2.5.0' + implementation 'com.google.android.libraries.places:places:4.0.0' implementation 'io.reactivex.rxjava3:rxjava:3.1.4' //implementation project(":maps-rx") diff --git a/places-rx/build.gradle b/places-rx/build.gradle index 7c628dd..5c981ad 100644 --- a/places-rx/build.gradle +++ b/places-rx/build.gradle @@ -1,5 +1,5 @@ android { - namespace = "com.google.maps.android.rx" + namespace = "com.google.maps.android.rx.places" compileSdk 34 diff --git a/places-rx/src/main/AndroidManifest.xml b/places-rx/src/main/AndroidManifest.xml index 2251a12..44008a4 100644 --- a/places-rx/src/main/AndroidManifest.xml +++ b/places-rx/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/places-rx/src/main/java/com/google/maps/android/rx/places/internal/MainThreadTaskSingle.kt b/places-rx/src/main/java/com/google/maps/android/rx/places/internal/MainThreadTaskSingle.kt index 1eeb4f0..2becc6d 100644 --- a/places-rx/src/main/java/com/google/maps/android/rx/places/internal/MainThreadTaskSingle.kt +++ b/places-rx/src/main/java/com/google/maps/android/rx/places/internal/MainThreadTaskSingle.kt @@ -7,7 +7,7 @@ import io.reactivex.rxjava3.core.SingleObserver /** * A subclass of [Single] to be used for wrapping a [Task] */ -internal abstract class MainThreadTaskSingle : MainThreadSingle() { +internal abstract class MainThreadTaskSingle : MainThreadSingle() { override fun subscribeMainThread(observer: SingleObserver) { val cancellationTokenSource = CancellationTokenSource() val listener = TaskCompletionListener(cancellationTokenSource, observer) diff --git a/places-rx/src/main/java/com/google/maps/android/rx/places/internal/TaskCompletionListener.kt b/places-rx/src/main/java/com/google/maps/android/rx/places/internal/TaskCompletionListener.kt index 5543944..78b1aef 100644 --- a/places-rx/src/main/java/com/google/maps/android/rx/places/internal/TaskCompletionListener.kt +++ b/places-rx/src/main/java/com/google/maps/android/rx/places/internal/TaskCompletionListener.kt @@ -9,7 +9,7 @@ import io.reactivex.rxjava3.core.SingleObserver /** * A listener for completion events from a [Task] that emits results to a [SingleObserver]. */ -internal class TaskCompletionListener( +internal class TaskCompletionListener( val cancellationTokenSource: CancellationTokenSource, private val observer: SingleObserver ) : MainThreadDisposable(), OnCompleteListener { diff --git a/shared/src/main/AndroidManifest.xml b/shared/src/main/AndroidManifest.xml index c257a51..44008a4 100644 --- a/shared/src/main/AndroidManifest.xml +++ b/shared/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file