From cf74be5bc26982e6f28ca3727056b432a695ab06 Mon Sep 17 00:00:00 2001 From: Angela Yu <5506675+wangela@users.noreply.github.com> Date: Wed, 24 Apr 2024 17:23:01 -0700 Subject: [PATCH] chore: add region tag to basic map demo and upgrade gradle (#1551) * chore: add region tag to basic map demo * chore: update gradle verison --- ApiDemos/java/app/build.gradle | 14 ++++++++------ .../com/example/mapdemo/BasicMapDemoActivity.java | 2 ++ .../java/gradle/wrapper/gradle-wrapper.properties | 4 ++-- ApiDemos/kotlin/app/build.gradle | 12 +++++++----- .../example/kotlindemos/BasicMapDemoActivity.kt | 2 ++ .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- WearOS/gradle/wrapper/gradle-wrapper.properties | 6 +++--- snippets/gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 15 files changed, 42 insertions(+), 34 deletions(-) diff --git a/ApiDemos/java/app/build.gradle b/ApiDemos/java/app/build.gradle index b47beaf84..6c952d20c 100644 --- a/ApiDemos/java/app/build.gradle +++ b/ApiDemos/java/app/build.gradle @@ -58,9 +58,11 @@ dependencies { } secrets { - // To add your Maps API key to this project: - // 1. Open the root project's local.properties file - // 2. Add this line, where YOUR_API_KEY is your API key: - // MAPS_API_KEY=YOUR_API_KEY - defaultPropertiesFileName 'local.defaults.properties' -} + // Optionally specify a different file name containing your secrets. + // The plugin defaults to "local.properties" + propertiesFileName = "secrets.properties" + + // A properties file containing default secret values. This file can be + // checked in version control. + defaultPropertiesFileName = "local.defaults.properties" +} \ No newline at end of file diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/BasicMapDemoActivity.java b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/BasicMapDemoActivity.java index b93f2c92d..807d3b9f3 100755 --- a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/BasicMapDemoActivity.java +++ b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/BasicMapDemoActivity.java @@ -27,6 +27,7 @@ /** * This shows how to create a simple activity with a map and a marker on the map. */ +// [START maps_android_sample_basic_map] public class BasicMapDemoActivity extends AppCompatActivity implements OnMapReadyCallback { @Override @@ -49,3 +50,4 @@ public void onMapReady(GoogleMap map) { map.addMarker(new MarkerOptions().position(new LatLng(0, 0)).title("Marker")); } } +// [END maps_android_sample_basic_map] \ No newline at end of file diff --git a/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties b/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties index db39b1786..ff6f5228f 100644 --- a/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties +++ b/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Oct 28 04:52:41 PDT 2023 +#Wed Apr 24 16:52:26 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ApiDemos/kotlin/app/build.gradle b/ApiDemos/kotlin/app/build.gradle index 98b53eecc..0f65fc68c 100644 --- a/ApiDemos/kotlin/app/build.gradle +++ b/ApiDemos/kotlin/app/build.gradle @@ -72,9 +72,11 @@ dependencies { } secrets { - // To add your Maps API key to this project: - // 1. Open the root project's local.properties file - // 2. Add this line, where YOUR_API_KEY is your API key: - // MAPS_API_KEY=YOUR_API_KEY - defaultPropertiesFileName 'local.defaults.properties' + // Optionally specify a different file name containing your secrets. + // The plugin defaults to "local.properties" + propertiesFileName = "secrets.properties" + + // A properties file containing default secret values. This file can be + // checked in version control. + defaultPropertiesFileName = "local.defaults.properties" } diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/BasicMapDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/BasicMapDemoActivity.kt index aea0570f8..a75d45398 100644 --- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/BasicMapDemoActivity.kt +++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/BasicMapDemoActivity.kt @@ -28,6 +28,7 @@ import com.google.android.gms.maps.model.MarkerOptions /** * This shows how to create a simple activity with a map and a marker on the map. */ +// [START maps_android_sample_basic_map] class BasicMapDemoActivity : AppCompatActivity(), OnMapReadyCallback { val SYDNEY = LatLng(-33.862, 151.21) @@ -52,3 +53,4 @@ class BasicMapDemoActivity : AppCompatActivity(), OnMapReadyCallback { } } } +// [END maps_android_sample_basic_map] diff --git a/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties b/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties index 222321394..7a4b38f7e 100644 --- a/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/ApiDemos/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Oct 28 04:47:14 PDT 2023 +#Wed Apr 24 16:50:10 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/WearOS/gradle/wrapper/gradle-wrapper.properties b/WearOS/gradle/wrapper/gradle-wrapper.properties index 8ff59b818..42bdd0717 100644 --- a/WearOS/gradle/wrapper/gradle-wrapper.properties +++ b/WearOS/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 22 15:50:30 PDT 2022 +#Wed Apr 24 17:08:14 PDT 2024 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/snippets/gradle/wrapper/gradle-wrapper.properties b/snippets/gradle/wrapper/gradle-wrapper.properties index 72514b25f..176cc42c0 100644 --- a/snippets/gradle/wrapper/gradle-wrapper.properties +++ b/snippets/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Oct 16 15:40:50 PDT 2023 +#Wed Apr 24 16:53:30 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties index 8194c0755..a1a6fcbd9 100644 --- a/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Oct 28 04:41:41 PDT 2023 +#Wed Apr 24 17:05:07 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties index 337619852..2d76e0395 100644 --- a/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Oct 28 04:43:28 PDT 2023 +#Wed Apr 24 17:05:38 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties index 6a2e707af..002a5f54b 100644 --- a/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Oct 28 04:44:41 PDT 2023 +#Wed Apr 24 17:06:19 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties index 1b74f7293..1b650d3a7 100644 --- a/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/java/StyledMap/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Oct 28 04:46:02 PDT 2023 +#Wed Apr 24 17:07:25 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties index 40e8f7868..2323d5270 100644 --- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Oct 28 04:37:14 PDT 2023 +#Wed Apr 24 17:04:17 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties index 3ed0ecbcc..f8d339a7a 100644 --- a/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/kotlin/MapWithMarker/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Oct 28 04:34:41 PDT 2023 +#Wed Apr 24 17:03:43 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties index cca149168..2b40d8b6b 100644 --- a/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties +++ b/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -#Sat Oct 28 04:40:09 PDT 2023 +#Wed Apr 24 17:03:17 PDT 2024 distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists