refactor: Centralize SDK versions in libs.versions.toml (#2294)

* refactor: Centralize SDK versions in libs.versions.toml

Moved compileSdk, minSdk, and targetSdk to libs.versions.toml for ApiDemos and snippets projects to ensure consistency and ease of maintenance.

fix: Corrected top bar layout in Kotlin Advanced Markers demo

The Kotlin version of the Advanced Markers demo was missing a call to applyInsets, causing the top bar to overlap with the system UI. This has been corrected to match the behavior of the Java version.

* refactor: Modernize Gradle scripts and update dependencies

This commit refactors the Gradle build scripts for all snippet modules to align with modern Android development practices.

Key changes include:
- Migrating all plugin and dependency declarations to use the version catalog (`libs.versions.toml`).
- Replacing `id("...")` with `alias(libs.plugins...)` for applying plugins.
- Updating numerous library versions, including AGP, Kotlin, and various Jetpack and Google Maps libraries.
- Setting a `namespace` in all module-level `build.gradle.kts` files.
- Enabling Compose and setting the Java toolchain to version 21 across all modules.
- Enabling minification for release builds.
- Removing the legacy `buildscript` block from the root `build.gradle.kts`.

* refactor: removed coreKtx

* refactor: fix build

* refactor: fix build

* refactor: Remove unused Compose configuration from snippet modules

Removed the Jetpack Compose plugin and `compose = true` build feature from all snippet modules as it was not being used.

fix: Update maps-utils snippets

Corrected several issues in the `app-utils` Java snippets:
- Replaced the deprecated `setWeightedData` method with `updateData` in the Heatmaps demo.
- Initialized an empty list in the Heatmaps demo to prevent a potential NullPointerException.
- Added missing R class imports.

---------

Co-authored-by: Enrique López-Mañas <eenriquelopez@gmail.com>

Author: dkhawk

ApiDemos/project/common-ui/build.gradle.kts

@@ -23,10 +23,10 @@ plugins {
 
 android {
     namespace = "com.example.common_ui"
-    compileSdk = 35
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = 21
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

ApiDemos/project/gradle/libs.versions.toml

@@ -1,8 +1,14 @@
 [versions]
+minSdk = "21"
+compileSdk = "36"
+targetSdk = "36"
+
 activity = "1.11.0"
+activityKtx = "1.11.0"
 androidxJunit = "1.3.0"
 appcompat = "1.7.1"
 cardview = "1.0.0"
+coreKtx = "1.17.0"
 easypermissions = "3.0.0"
 espresso = "3.7.0"
 gradle = "8.13.0"
@@ -16,13 +22,13 @@ playServicesMaps = "19.2.0"
 recyclerview = "1.4.0"
 secretsGradlePlugin = "2.0.1"
 volley = "1.2.1"
-coreKtx = "1.17.0"
 
 [libraries]
 activity = { module = "androidx.activity:activity", version.ref = "activity" }
 androidxJunit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxJunit" }
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 cardview = { group = "androidx.cardview", name = "cardview", version.ref = "cardview" }
+coreKtx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 easypermissions = { group = "pub.devrel", name = "easypermissions", version.ref = "easypermissions" }
 espressoCore = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
 gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
@@ -37,4 +43,3 @@ playServicesMaps = { group = "com.google.android.gms", name = "play-services-map
 recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
 secretsGradlePlugin = { module = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin", version.ref = "secretsGradlePlugin" }
 volley = { group = "com.android.volley", name = "volley", version.ref = "volley" }
-coreKtx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }

ApiDemos/project/java-app/build.gradle.kts

@@ -21,12 +21,12 @@ plugins {
 }
 
 android {
-    compileSdk = 36
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "com.example.mapdemo"
-        minSdk = 21
-        targetSdk = 36
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.16.0"
         multiDexEnabled = true
@@ -40,7 +40,10 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
 

ApiDemos/project/kotlin-app/build.gradle.kts

@@ -24,15 +24,15 @@ plugins {
 }
 
 android {
-    compileSdk = 36
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "com.example.kotlindemos"
-        minSdk = 21
-        targetSdk = 36
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.16.0"
-        testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled = true
     }
 
@@ -42,16 +42,16 @@ android {
 
     buildTypes {
         getByName("release") {
-            isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
 
     flavorDimensions.add("version")
 
-    compileOptions {
-    }
-
     lint {
         abortOnError = false
     }
@@ -64,6 +64,9 @@ kotlin {
         jvmTarget.set(JvmTarget.JVM_21)
     }
     jvmToolchain(21) // Specify the JVM toolchain version
+    compilerOptions {
+        freeCompilerArgs.add("-Xopt-in=kotlin.RequiresOptIn")
+    }
 }
 
 dependencies {

ApiDemos/project/kotlin-app/src/main/java/com/example/kotlindemos/AdvancedMarkersDemoActivity.kt

@@ -54,6 +54,7 @@ class AdvancedMarkersDemoActivity : SamplesBaseActivity(), OnMapReadyCallback {
         setContentView(com.example.common_ui.R.layout.advanced_markers_demo)
         val mapFragment = supportFragmentManager.findFragmentById(com.example.common_ui.R.id.map) as SupportMapFragment?
         mapFragment?.getMapAsync(this)
+        applyInsets(findViewById(com.example.common_ui.R.id.map_container))
     }
 
     override fun onMapReady(map: GoogleMap) {

snippets/.gitignore

@@ -12,3 +12,4 @@
 /captures
 .externalNativeBuild
 .cxx
+.kotlin

snippets/app-compose/build.gradle.kts

@@ -15,20 +15,19 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    alias(libs.plugins.compose.compiler)
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.secrets.gradle.plugin)
 }
 
 android {
-    namespace = "com.example.app_compose"
-    compileSdk = 36
-
+    namespace = "com.google.maps.example.compose"
+    compileSdk = libs.versions.compileSdk.get().toInt()
     defaultConfig {
-        applicationId = "com.example.app_compose"
-        minSdk = 23
-        targetSdk = 36
+        applicationId = "com.google.maps.example.compose"
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
 
@@ -37,8 +36,11 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
 
@@ -55,6 +57,12 @@ android {
             jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
         }
     }
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(21))
+        }
+    }
 }
 
 // [START maps_android_compose_dependency]
@@ -74,7 +82,7 @@ dependencies {
     // [END_EXCLUDE]
 
     // Android Maps Compose composables for the Maps SDK for Android
-    implementation("com.google.maps.android:maps-compose:6.7.1")
+    implementation(libs.maps.compose)
 }
 // [END maps_android_compose_dependency]
 

snippets/app-ktx/build.gradle.kts

@@ -15,19 +15,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.secrets.gradle.plugin)
 }
 
 android {
-    namespace = "com.example.app_ktx"
-    compileSdk = 36
-
+    namespace = "com.google.maps.example.ktx"
+    compileSdk = libs.versions.compileSdk.get().toInt()
     defaultConfig {
-        applicationId = "com.example.app_ktx"
-        minSdk = 23
-        targetSdk = 36
+        applicationId = "com.google.maps.example.ktx"
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
 
@@ -43,8 +42,11 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
     compileOptions {
@@ -56,6 +58,12 @@ android {
             jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
         }
     }
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(21))
+        }
+    }
 }
 
 // [START maps_android_ktx_install_snippet]
@@ -68,7 +76,7 @@ dependencies {
     // [END_EXCLUDE]
 
     // KTX for the Maps SDK for Android library
-    implementation("com.google.maps.android:maps-ktx:5.2.0")
+    implementation(libs.maps.ktx)
 }
 // [END maps_android_ktx_install_snippet]
 

snippets/app-ktx/src/main/java/com/example/app_ktx/KTX.kt

@@ -27,6 +27,7 @@ import com.google.android.gms.maps.model.LatLng
 import com.google.maps.android.ktx.addMarker
 import com.google.maps.android.ktx.awaitMap
 import com.google.maps.android.ktx.cameraMoveEvents
+import com.google.maps.example.ktx.R
 import kotlinx.coroutines.launch
 
 internal class KTX : AppCompatActivity() {

snippets/app-places-ktx/build.gradle.kts

@@ -15,19 +15,18 @@
  */
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.secrets.gradle.plugin)
 }
 
 android {
-    namespace = "com.example.app_places_ktx"
-    compileSdk = 36
-
+    namespace = "com.google.maps.example.placesktx"
+    compileSdk = libs.versions.compileSdk.get().toInt()
     defaultConfig {
-        applicationId = "com.example.app_places_ktx"
-        minSdk = 23
-        targetSdk = 36
+        applicationId = "com.google.maps.example.placesktx"
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
 
@@ -40,8 +39,11 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
     compileOptions {
@@ -53,6 +55,16 @@ android {
             jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
         }
     }
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(21))
+        }
+    }
+
+    lint {
+        lintConfig = file("lint.xml")
+    }
 }
 
 // [START places_android_ktx_install_snippet]
@@ -68,7 +80,7 @@ dependencies {
     // [END_EXCLUDE]
 
     // KTX for the Places SDK for Android library
-    implementation("com.google.maps.android:places-ktx:3.3.1")
+    implementation(libs.places.ktx)
 }
 // [END places_android_ktx_install_snippet]