refactor: Modernize build, enhance demo app, and prepare for archival by dkhawk · Pull Request #158 · googlemaps/android-maps-rx

dkhawk · 2025-12-22T21:23:20Z

This pull request introduces a series of significant updates to modernize the project, improve the demo application, and streamline the library structure in preparation for archiving.

Key Changes:

Build Modernization:
- Upgraded Gradle to 8.13.2 and Kotlin to 2.3.0.
- Standardized compileSdk (36) and minSdk across all modules using the version catalog.
- Resolved various build deprecation warnings.
- Added a basic testing infrastructure with dependencies for JUnit, Mockito, and Mockk.
Demo App UI/UX Enhancements:
- Implemented a sticky immersive, edge-to-edge display for a more modern user experience.
- Added UI components to demonstrate "Find Current Place" and "Fetch Photo" functionality from the Places SDK.
Breaking Change: Internalized Shared Code:
- The shared module has been removed. Its utility classes (like MainThreadObservable) have been copied directly into the maps-rx and places-rx modules as internal classes.
- Reasoning: This eliminates the need for a separate Maven artifact for the shared code, simplifying the dependency graph for consumers who might install the AARs manually. This structural change is a prerequisite for archiving the repository.

This prepares the repository for its final, archived state by ensuring the libraries are self-contained and the demo app is a robust example of their usage.

- Extract `compileSdk`, `minSdk`, `targetSdk` to version catalog and set `compileSdk`/`targetSdk` to 36. - Fix build deprecations: replace `buildDir` with `layout.buildDirectory` and move `kotlinOptions` to `compilerOptions`. - Update Kotlin to 2.3.0 and Gradle to 8.13.2. - Switch app module to use local project dependencies (`:maps-rx`, `:places-rx`) instead of version catalog artifacts. - Remove unused `ExampleInstrumentedTest`. - Update .gitignore to exclude secrets.properties.

- Fix lint/deprecation warnings in MainActivity and PlacesRx - Expand demo app with FindCurrentPlace and FetchPhoto UI - Update build files to JDK 17 - Add testing dependencies (JUnit, Mockito, Mockk) - Add initial (ignored) unit tests for maps-rx and places-rx

…rCompat

Removes the 'shared' module and duplicates its utility classes into 'maps-rx' and 'places-rx' as internal extensions. This change eliminates the need for a separate 'shared' Maven artifact, allowing 'maps-rx' and 'places-rx' to be used as standalone libraries without complex transitive dependencies for manual AAR consumers. Code duplication was chosen over a shared artifact to simplify distribution as we prepare to archive these libraries. Key changes: - Deleted 'shared' module and updated settings.gradle. - Copied MainThreadObservable and related utilities to 'com.google.maps.android.rx.maps.internal' and 'com.google.maps.android.rx.places.internal'. - Updated all imports to use the local internal versions. - Removed project dependency on ':shared' from build files. - Marked all duplicated code as 'internal' to prevent binary compatibility issues or duplicate class definitions if both libraries are used together. This refactoring streamlines the project structure in anticipation of archiving the repository.

kikoso · 2025-12-22T21:38:04Z

app/build.gradle.kts

-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"


Should we keep the previous Java version, to avoid any issues?

kikoso · 2025-12-22T21:58:10Z

We would need to mark this PR as fix to trigger a new build.

app/src/main/java/com/google/maps/android/rx/demo/MainActivity.kt

+        placesClient.findCurrentPlace(fields)
+            .compose(provider.bindToLifecycle())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ response ->
+                val place = response.placeLikelihoods.firstOrNull()?.place
+                place?.let {
+                    val message = "You are at ${it.displayName} (ID: ${it.id})"
+                    Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+                    Log.d(TAG, message)
+                } ?: run {
+                    Toast.makeText(this, "No place found", Toast.LENGTH_SHORT).show()
+                }
+            }, { error ->
+                Log.e(TAG, "Error finding place", error)
+                Toast.makeText(this, "Error: ${error.message}", Toast.LENGTH_SHORT).show()
+            })


app/src/main/java/com/google/maps/android/rx/demo/MainActivity.kt

+        placesClient.findCurrentPlace(fields)
+             .flatMap { response ->
+                 val photoMetadata = response.placeLikelihoods.firstOrNull()?.place?.photoMetadatas?.firstOrNull()
+                 if (photoMetadata != null) {
+                     placesClient.fetchPhoto(photoMetadata)
+                 } else {
+                     io.reactivex.rxjava3.core.Single.error(Exception("No photos found"))
+                 }
+             }
+             .compose(provider.bindToLifecycle())
+             .observeOn(AndroidSchedulers.mainThread())
+             .subscribe({ response ->
+                 val message = "Photo fetched! Size: ${response.bitmap.width}x${response.bitmap.height}"
+                 Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+                 Log.d(TAG, message)
+                 // Ideally show the bitmap in a dialog
+             }, { error ->
+                 val msg = "Error fetching photo: ${error.message}"
+                 Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
+                 Log.e(TAG, msg)
+             })


app/src/main/res/layout/activity_main.xml

+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Current Place" />


app/src/main/res/layout/activity_main.xml

+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Fetch Photo" />


gradle/libs.versions.toml

+jacoco-android = "0.2.1"
+kotlin = "2.3.0"
 lifecycleRuntimeKtx = "2.10.0"
+mapsKtx = "5.2.1"


kikoso · 2025-12-22T22:14:47Z

places-rx/src/main/java/com/google/maps/android/rx/places/internal/MainThreadCompletable.kt

@@ -0,0 +1,39 @@
+// Copyright 2021 Google LLC


What about renaming this module to places/internal? We need a different name to avoid conflicts with the maps-rx module.

kikoso · 2025-12-23T15:31:49Z

places-rx/build.gradle.kts

    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17


What about keeping the previous Java version?

kikoso · 2025-12-23T15:31:58Z

places-rx/build.gradle.kts

-        freeCompilerArgs += "-Xexplicit-api=strict"
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)


Previous Java version.

kikoso

Some minor comments, most specifically about keeping the previous Java version. This seems to work if packed as an aar.

gradle/libs.versions.toml

+minSdk = "24"
+targetSdk = "36"
+
+activity = "1.12.2"


gradle/libs.versions.toml

+activity = "1.12.2"
 appCompat = "1.7.1"
+dokka-gradle-plugin = "2.1.0"
+gradle = "8.13.2"


gradle/libs.versions.toml

 appCompat = "1.7.1"
+dokka-gradle-plugin = "2.1.0"
+gradle = "8.13.2"
+gradleMavenPublishPlugin = "0.35.0"


gradle/libs.versions.toml

+mapsKtx = "5.2.1"
 material = "1.13.0"
+places = "5.1.1"
+playServicesMaps = "19.2.0"


dkhawk · 2026-03-07T00:04:11Z

Addressed the review comments:

Reverted sourceCompatibility, targetCompatibility, and Kotlin jvmTarget back to Java 1.8 in app, maps-rx, and places-rx to maintain stability.
Verified that MainThreadCompletable in places-rx is correctly isolated inside com.google.maps.android.rx.places.internal, meaning no collision exists with maps-rx.
Tests and connected tests confirmed passing.

dkhawk added 6 commits December 22, 2025 10:43

fix(ui): enforce edge-to-edge with NoActionBar theme

761e6c8

feat(ui): implement sticky immersive mode using WindowInsetsControlle…

a0a2ebb

…rCompat

refactor: use clean imports in MainActivity

c80f074

dkhawk requested a review from kikoso December 22, 2025 21:24

kikoso reviewed Dec 22, 2025

View reviewed changes

app/build.gradle.kts

}

kotlinOptions {

jvmTarget = "1.8"

Copy link

Collaborator

kikoso Dec 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we keep the previous Java version, to avoid any issues?

chore: removed lint from old module

1b7214f

github-advanced-security bot found potential problems Dec 22, 2025

View reviewed changes

kikoso reviewed Dec 22, 2025

View reviewed changes

kikoso reviewed Dec 23, 2025

View reviewed changes

kikoso approved these changes Dec 23, 2025

View reviewed changes

Revert Java version bump back to Java 8

1e7cff7

dkhawk requested a review from kikoso March 6, 2026 23:52

github-advanced-security bot found potential problems Mar 6, 2026

View reviewed changes

dkhawk merged commit f9ff359 into main Mar 7, 2026
8 checks passed

dkhawk deleted the refactor/version-catalog-sdk branch March 7, 2026 00:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: Modernize build, enhance demo app, and prepare for archival#158

refactor: Modernize build, enhance demo app, and prepare for archival#158
dkhawk merged 8 commits intomainfrom
refactor/version-catalog-sdk

dkhawk commented Dec 22, 2025

Uh oh!

kikoso Dec 22, 2025

Uh oh!

kikoso commented Dec 22, 2025

Uh oh!

Uh oh!

Check warning

Check warning

Check warning

Check warning

Check warning

kikoso Dec 22, 2025

Uh oh!

kikoso Dec 23, 2025

Uh oh!

kikoso Dec 23, 2025

Uh oh!

kikoso left a comment

Uh oh!

Check warning

Check warning

Check warning

Check warning

dkhawk commented Mar 7, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

dkhawk commented Dec 22, 2025

Key Changes:

Uh oh!

kikoso Dec 22, 2025

Choose a reason for hiding this comment

Uh oh!

kikoso commented Dec 22, 2025

Uh oh!

Uh oh!

Check warning

Check warning

Check warning

Check warning

Check warning

kikoso Dec 22, 2025

Choose a reason for hiding this comment

Uh oh!

kikoso Dec 23, 2025

Choose a reason for hiding this comment

Uh oh!

kikoso Dec 23, 2025

Choose a reason for hiding this comment

Uh oh!

kikoso left a comment

Choose a reason for hiding this comment

Uh oh!

Check warning

Check warning

Check warning

Check warning

dkhawk commented Mar 7, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants