fix(tutorials): include MapWithMarker in root build and update Gradle config (#2458)

Include :tutorials:java:MapWithMarker and :tutorials:kotlin:MapWithMarker in settings.gradle.kts, the build-tutorials CI job, and verify_all.sh. Update both app/build.gradle.kts files to use the root version catalog, proguard-android-optimize.txt, AndroidX test runner, and Java 17 compileOptions, and refresh the tutorial READMEs.

Author: dkhawk

.github/workflows/build.yml

@@ -145,6 +145,8 @@ jobs:
         ./gradlew :tutorials:kotlin:Polygons:assembleDebug
         ./gradlew :tutorials:java:CurrentPlaceDetailsOnMap:assembleDebug
         ./gradlew :tutorials:kotlin:CurrentPlaceDetailsOnMap:assembleDebug
+        ./gradlew :tutorials:java:MapWithMarker:assembleDebug
+        ./gradlew :tutorials:kotlin:MapWithMarker:assembleDebug
 
   test:
     runs-on: ubuntu-latest

scripts/verify_all.sh

@@ -49,6 +49,8 @@ MODULES=(
     ":tutorials:kotlin:Polygons"
     ":tutorials:java:CurrentPlaceDetailsOnMap"
     ":tutorials:kotlin:CurrentPlaceDetailsOnMap"
+    ":tutorials:java:MapWithMarker"
+    ":tutorials:kotlin:MapWithMarker"
 )
 
 # Parse arguments

settings.gradle.kts

@@ -73,6 +73,10 @@ include(":tutorials:java:CurrentPlaceDetailsOnMap")
 project(":tutorials:java:CurrentPlaceDetailsOnMap").projectDir = file("tutorials/java/CurrentPlaceDetailsOnMap/app")
 include(":tutorials:kotlin:CurrentPlaceDetailsOnMap")
 project(":tutorials:kotlin:CurrentPlaceDetailsOnMap").projectDir = file("tutorials/kotlin/CurrentPlaceDetailsOnMap/app")
+include(":tutorials:java:MapWithMarker")
+project(":tutorials:java:MapWithMarker").projectDir = file("tutorials/java/MapWithMarker/app")
+include(":tutorials:kotlin:MapWithMarker")
+project(":tutorials:kotlin:MapWithMarker").projectDir = file("tutorials/kotlin/MapWithMarker/app")
 // Add others as needed, starting with these for now
 
 // Visual Testing

tutorials/java/MapWithMarker/README.md

@@ -7,25 +7,32 @@ This sample goes hand in hand with a tutorial for the Google Maps Android API:
 Prerequisites
 --------------
 
-- Android API level 21+
+- Android API level 24+
 - Latest Android Build Tools
 - Google Repository
 - Google Play Services
 
 Getting started
 ---------------
 
-This sample uses the Gradle build system.
+This sample uses the Gradle build system and is part of the root `android-samples` Gradle build.
 
 1. Download the samples by cloning this repository or downloading an archived
   snapshot. (See the options at the top of the page.)
-1. In Android Studio, use "Open an existing Android Studio project". Next select the
-  `tutorials/java/MapWithMarker` directory that you downloaded
-1. If prompted for a gradle configuration, accept the default settings.
-  Alternatively use the `gradlew build` command to build the project directly.
+1. In Android Studio, select "Open" (or "Open an existing Android Studio project") and choose the
+  root `android-samples` directory that you downloaded.
+1. Select the `tutorials.java.MapWithMarker` run configuration in Android Studio, or build the
+  module from the root of this repository using Gradle.
 
 This demo app requires that you add your own Google Maps API key. See [Get an API key](https://developers.google.com/maps/documentation/android-sdk/get-api-key) for more instructions.
 
+From the root of this repository, add your key to `secrets.properties` (see
+`local.defaults.properties` for the format) and run:
+
+```
+./gradlew :tutorials:java:MapWithMarker:assembleDebug
+```
+
 Support
 -------
 
@@ -35,11 +42,11 @@ If you have discovered an issue with the Google Maps Android API v2, please see
 the resources here: https://developers.google.com/maps/documentation/android-sdk/support
 
 If you've found an error in these samples, please file an issue:
-https://github.com/googlemaps/android-samples/issues
+https://github.com/googlemaps-samples/android-samples/issues
 
 ![Analytics](https://ga-beacon.appspot.com/UA-12846745-20/android-samples-apidemos/readme?pixel)
 
 License
 -------
 
-Please refer to the [LICENSE](https://github.com/googlemaps/android-samples/blob/main/LICENSE) at the root of this repo.
+Please refer to the [LICENSE](https://github.com/googlemaps-samples/android-samples/blob/main/LICENSE) at the root of this repo.

tutorials/java/MapWithMarker/app/build.gradle.kts

@@ -28,7 +28,7 @@ android {
         targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = libs.versions.versionCode.get().toInt()
         versionName = libs.versions.versionName.get()
-        testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildFeatures {
@@ -38,20 +38,25 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
+        targetCompatibility = JavaVersion.toVersion(libs.versions.javaVersion.get())
+    }
+
     namespace = "com.example.mapwithmarker"
 }
 
 dependencies {
-    implementation(libs.playServicesMaps)
-    implementation(platform(libs.kotlinBom))
+    implementation(libs.play.services.maps)
+    implementation(platform(libs.kotlin.bom))
     implementation(libs.appcompat)
     testImplementation(libs.junit)
-    androidTestImplementation(libs.androidxTestExtJunit)
-    androidTestImplementation(libs.espressoCore)
+    androidTestImplementation(libs.ext.junit)
+    androidTestImplementation(libs.espresso.core)
 }
 
 secrets {

tutorials/java/MapWithMarker/local.defaults.properties

@@ -1,8 +1 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Mon Apr 06 10:50:09 PDT 2020
 MAPS_API_KEY=DEFAULT_API_KEY

tutorials/kotlin/MapWithMarker/README.md

@@ -7,7 +7,7 @@ This sample goes hand in hand with a tutorial for the Google Maps Android API:
 Prerequisites
 --------------
 
-- Android API level 21+
+- Android API level 24+
 - Latest Android Build Tools
 - Android Support Repository
 - Google Repository
@@ -16,17 +16,24 @@ Prerequisites
 Getting started
 ---------------
 
-This sample uses the Gradle build system.
+This sample uses the Gradle build system and is part of the root `android-samples` Gradle build.
 
 1. Download the samples by cloning this repository or downloading an archived
   snapshot. (See the options at the top of the page.)
-1. In Android Studio, use "Open an existing Android Studio project". Next select the
-  `tutorials/kotlin/MapWithMarker` directory that you downloaded
-1. If prompted for a gradle configuration, accept the default settings.
-  Alternatively use the `gradlew build` command to build the project directly.
+1. In Android Studio, select "Open" (or "Open an existing Android Studio project") and choose the
+  root `android-samples` directory that you downloaded.
+1. Select the `tutorials.kotlin.MapWithMarker` run configuration in Android Studio, or build the
+  module from the root of this repository using Gradle.
 
 This demo app requires that you add your own Google Maps API key. See [Get an API key](https://developers.google.com/maps/documentation/android-sdk/get-api-key) for more instructions.
 
+From the root of this repository, add your key to `secrets.properties` (see
+`local.defaults.properties` for the format) and run:
+
+```
+./gradlew :tutorials:kotlin:MapWithMarker:assembleDebug
+```
+
 Support
 -------
 
@@ -36,11 +43,11 @@ If you have discovered an issue with the Google Maps Android API v2, please see
 the resources here: https://developers.google.com/maps/documentation/android-sdk/support
 
 If you've found an error in these samples, please file an issue:
-https://github.com/googlemaps/android-samples/issues
+https://github.com/googlemaps-samples/android-samples/issues
 
 ![Analytics](https://ga-beacon.appspot.com/UA-12846745-20/android-samples-apidemos/readme?pixel)
 
 License
 -------
 
-Please refer to the [LICENSE](https://github.com/googlemaps/android-samples/blob/main/LICENSE) at the root of this repo.
+Please refer to the [LICENSE](https://github.com/googlemaps-samples/android-samples/blob/main/LICENSE) at the root of this repo.

tutorials/kotlin/MapWithMarker/app/build.gradle.kts

@@ -1,6 +1,6 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
- 
- /*
+
+/*
  * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +30,7 @@ android {
         targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = libs.versions.versionCode.get().toInt()
         versionName = libs.versions.versionName.get()
-        testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildFeatures {
@@ -40,7 +40,7 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
 
@@ -59,15 +59,15 @@ kotlin {
 }
 
 dependencies {
-    implementation(libs.coreKtx)
-    implementation(libs.kotlinStdlib)
+    implementation(libs.core.ktx)
+    implementation(libs.kotlin.stdlib)
     implementation(libs.appcompat)
-    implementation(libs.playServicesMaps)
+    implementation(libs.play.services.maps)
 
     // Tests
     testImplementation(libs.junit)
-    androidTestImplementation(libs.androidxTestExtJunit)
-    androidTestImplementation(libs.espressoCore)
+    androidTestImplementation(libs.ext.junit)
+    androidTestImplementation(libs.espresso.core)
 }
 
 secrets {
@@ -80,4 +80,4 @@ secrets {
     // A properties file containing default secret values. This file can be
     // checked in version control.
     defaultPropertiesFileName = "local.defaults.properties"
-}
+}

tutorials/kotlin/MapWithMarker/app/src/main/java/com/example/mapwithmarker/MapsMarkerActivity.kt

@@ -15,7 +15,6 @@
 package com.example.mapwithmarker
 
 import android.os.Bundle
-import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.gms.maps.CameraUpdateFactory
 import com.google.android.gms.maps.GoogleMap