From 99da3d7c5f7d0ea781764832ab79fc686f7e7112 Mon Sep 17 00:00:00 2001
From: Chris Arriola <carriola@google.com>
Date: Wed, 27 Jan 2021 13:30:29 -0800
Subject: [PATCH] chore: Using secrets-gradle-plugin (#432)

* chore: Using secrets-gradle-plugin

* Using secrets-gradle-plugin in all projects.

* Using 0.4 version of secrets-gradle-plugin
---
 ApiDemos/java/app/build.gradle                | 35 ++++++------------
 .../java/app/src/main/AndroidManifest.xml     |  2 +-
 ApiDemos/java/build.gradle                    |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  4 +-
 ApiDemos/java/local.defaults.properties       |  1 +
 ApiDemos/kotlin/app/build.gradle              | 37 +++++++------------
 .../kotlin/app/src/main/AndroidManifest.xml   |  2 +-
 ApiDemos/kotlin/local.defaults.properties     |  1 +
 .../CurrentPlaceDetailsOnMap/app/build.gradle | 29 ++++++---------
 .../app/src/main/AndroidManifest.xml          |  2 +-
 .../MapsActivityCurrentPlace.java             |  2 +-
 .../CurrentPlaceDetailsOnMap/build.gradle     |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  4 +-
 .../local.defaults.properties                 |  1 +
 tutorials/java/MapWithMarker/app/build.gradle | 29 ++++++---------
 .../app/src/main/AndroidManifest.xml          |  2 +-
 tutorials/java/MapWithMarker/build.gradle     |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  4 +-
 .../MapWithMarker/local.defaults.properties   |  9 +++++
 tutorials/java/Polygons/app/build.gradle      | 29 ++++++---------
 .../Polygons/app/src/main/AndroidManifest.xml |  2 +-
 tutorials/java/Polygons/build.gradle          |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  4 +-
 .../java/Polygons/local.defaults.properties   |  1 +
 .../CurrentPlaceDetailsOnMap/app/build.gradle | 34 +++++++----------
 .../app/src/main/AndroidManifest.xml          |  2 +-
 .../MapsActivityCurrentPlace.kt               |  2 +-
 .../CurrentPlaceDetailsOnMap/build.gradle     |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  4 +-
 .../local.defaults.properties                 |  1 +
 .../kotlin/MapWithMarker/app/build.gradle     | 32 +++++++---------
 .../app/src/main/AndroidManifest.xml          |  2 +-
 .../MapWithMarker/local.defaults.properties   |  1 +
 tutorials/kotlin/Polygons/app/build.gradle    | 32 +++++++---------
 .../Polygons/app/src/main/AndroidManifest.xml |  2 +-
 tutorials/kotlin/Polygons/build.gradle        |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  4 +-
 .../kotlin/Polygons/local.defaults.properties |  1 +
 38 files changed, 142 insertions(+), 187 deletions(-)
 create mode 100644 ApiDemos/java/local.defaults.properties
 create mode 100644 ApiDemos/kotlin/local.defaults.properties
 create mode 100644 tutorials/java/CurrentPlaceDetailsOnMap/local.defaults.properties
 create mode 100644 tutorials/java/MapWithMarker/local.defaults.properties
 create mode 100644 tutorials/java/Polygons/local.defaults.properties
 create mode 100644 tutorials/kotlin/CurrentPlaceDetailsOnMap/local.defaults.properties
 create mode 100644 tutorials/kotlin/MapWithMarker/local.defaults.properties
 create mode 100644 tutorials/kotlin/Polygons/local.defaults.properties

diff --git a/ApiDemos/java/app/build.gradle b/ApiDemos/java/app/build.gradle
index fc4aa965..98a8da48 100644
--- a/ApiDemos/java/app/build.gradle
+++ b/ApiDemos/java/app/build.gradle
@@ -1,16 +1,10 @@
 import org.apache.tools.ant.filters.ConcatFilter
 
-apply plugin: 'com.android.application'
-apply plugin: 'project-report'
-
-// Set the properties within `local.properties` into a `Properties` class so
-// that values within `local.properties` (e.g. Maps API key) are accessible in
-// this file.
-Properties properties = new Properties()
-if (rootProject.file("local.properties").exists()) {
-    properties.load(rootProject.file("local.properties").newDataInputStream())
+plugins {
+    id 'com.android.application'
+    id 'project-report'
+    id 'com.google.secrets_gradle_plugin' version '0.4'
 }
-def mapsApiKey = properties.getProperty("MAPS_API_KEY", "")
 
 android {
     compileSdkVersion 30
@@ -22,19 +16,6 @@ android {
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
-
-        // Inject the Maps API key into the manifest
-        manifestPlaceholders = [ mapsApiKey : mapsApiKey ]
-
-        // Reading the Maps API key into a BuildConfig value. This is only
-        // necessary so that the sample app can display a toast message if the
-        // API key was not set, otherwise, this can be skipped.
-        buildConfigField("String", "MAPS_API_KEY", "\"$mapsApiKey\"" )
-
-        // 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
     }
     buildTypes {
         release {
@@ -100,3 +81,11 @@ task generateV3Layout(type: Copy) {
         line.replace('com.google.android.gms.maps', 'com.google.android.libraries.maps')
     }
 }
+
+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'
+}
diff --git a/ApiDemos/java/app/src/main/AndroidManifest.xml b/ApiDemos/java/app/src/main/AndroidManifest.xml
index e5cd8c3b..0a30ad9d 100644
--- a/ApiDemos/java/app/src/main/AndroidManifest.xml
+++ b/ApiDemos/java/app/src/main/AndroidManifest.xml
@@ -58,7 +58,7 @@
         -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="${mapsApiKey}" />
+            android:value="${MAPS_API_KEY}" />
 
     </application>
 
diff --git a/ApiDemos/java/build.gradle b/ApiDemos/java/build.gradle
index 6175513d..bb5db035 100644
--- a/ApiDemos/java/build.gradle
+++ b/ApiDemos/java/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties b/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties
index 97c63228..4c0b9b2f 100644
--- a/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties
+++ b/ApiDemos/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 27 14:56:43 PDT 2020
+#Wed Jan 27 10:05:54 PST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/ApiDemos/java/local.defaults.properties b/ApiDemos/java/local.defaults.properties
new file mode 100644
index 00000000..b4dc1ed7
--- /dev/null
+++ b/ApiDemos/java/local.defaults.properties
@@ -0,0 +1 @@
+MAPS_API_KEY=""
\ No newline at end of file
diff --git a/ApiDemos/kotlin/app/build.gradle b/ApiDemos/kotlin/app/build.gradle
index cbb0a95b..930e06d8 100644
--- a/ApiDemos/kotlin/app/build.gradle
+++ b/ApiDemos/kotlin/app/build.gradle
@@ -1,17 +1,11 @@
 import org.apache.tools.ant.filters.ConcatFilter
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
-// Set the properties within `local.properties` into a `Properties` class so
-// that values within `local.properties` (e.g. Maps API key) are accessible in
-// this file.
-Properties properties = new Properties()
-if (rootProject.file("local.properties").exists()) {
-    properties.load(rootProject.file("local.properties").newDataInputStream())
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'com.google.secrets_gradle_plugin' version '0.4'
 }
-def mapsApiKey = properties.getProperty("MAPS_API_KEY", "")
 
 android {
     compileSdkVersion 30
@@ -23,19 +17,6 @@ android {
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
-
-        // Inject the Maps API key into the manifest
-        manifestPlaceholders = [ mapsApiKey : mapsApiKey ]
-
-        // Reading the Maps API key into a BuildConfig value. This is only
-        // necessary so that the sample app can display a toast message if the
-        // API key was not set, otherwise, this can be skipped.
-        buildConfigField("String", "MAPS_API_KEY", "\"$mapsApiKey\"" )
-
-        // 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
     }
     buildTypes {
         release {
@@ -110,3 +91,11 @@ task generateV3Layout(type: Copy) {
         line.replace('com.google.android.gms.maps', 'com.google.android.libraries.maps')
     }
 }
+
+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'
+}
diff --git a/ApiDemos/kotlin/app/src/main/AndroidManifest.xml b/ApiDemos/kotlin/app/src/main/AndroidManifest.xml
index d0639b6c..22fb3697 100644
--- a/ApiDemos/kotlin/app/src/main/AndroidManifest.xml
+++ b/ApiDemos/kotlin/app/src/main/AndroidManifest.xml
@@ -49,7 +49,7 @@
         -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="${mapsApiKey}" />
+            android:value="${MAPS_API_KEY}" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/ApiDemos/kotlin/local.defaults.properties b/ApiDemos/kotlin/local.defaults.properties
new file mode 100644
index 00000000..9e0d438a
--- /dev/null
+++ b/ApiDemos/kotlin/local.defaults.properties
@@ -0,0 +1 @@
+MAPS_API_KEY=""
diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/app/build.gradle b/tutorials/java/CurrentPlaceDetailsOnMap/app/build.gradle
index 0426de3d..3dc616f7 100644
--- a/tutorials/java/CurrentPlaceDetailsOnMap/app/build.gradle
+++ b/tutorials/java/CurrentPlaceDetailsOnMap/app/build.gradle
@@ -1,13 +1,7 @@
-apply plugin: 'com.android.application'
-
-// Set the properties within `local.properties` into a `Properties` class so
-// that values within `local.properties` (e.g. Maps API key) are accessible in
-// this file.
-Properties properties = new Properties()
-if (rootProject.file("local.properties").exists()) {
-    properties.load(rootProject.file("local.properties").newDataInputStream())
+plugins {
+    id 'com.android.application'
+    id 'com.google.secrets_gradle_plugin' version '0.4'
 }
-def mapsApiKey = properties.getProperty("MAPS_API_KEY", "")
 
 android {
     compileSdkVersion 30
@@ -19,15 +13,6 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
-        // Read the API key from local.properties into R.string.maps_api_key
-        resValue "string", "maps_api_key", mapsApiKey
-
-        // 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
-
     }
     buildTypes {
         debug {
@@ -50,3 +35,11 @@ dependencies {
     implementation 'com.google.android.libraries.places:places:2.4.0'
     testImplementation'junit:junit:4.12'
 }
+
+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'
+}
diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml
index 68906fce..e2b5ec79 100644
--- a/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml
+++ b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml
@@ -35,7 +35,7 @@
         -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/maps_api_key" />
+            android:value="${MAPS_API_KEY}" />
 
         <activity
             android:name="com.example.currentplacedetailsonmap.MapsActivityCurrentPlace"
diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.java b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.java
index 13148d1a..a17f59be 100644
--- a/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.java
+++ b/tutorials/java/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.java
@@ -115,7 +115,7 @@ public class MapsActivityCurrentPlace extends AppCompatActivity
 
         // [START_EXCLUDE silent]
         // Construct a PlacesClient
-        Places.initialize(getApplicationContext(), getString(R.string.maps_api_key));
+        Places.initialize(getApplicationContext(), BuildConfig.MAPS_API_KEY);
         placesClient = Places.createClient(this);
 
         // Construct a FusedLocationProviderClient.
diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/build.gradle b/tutorials/java/CurrentPlaceDetailsOnMap/build.gradle
index c13d4717..65e0922f 100644
--- a/tutorials/java/CurrentPlaceDetailsOnMap/build.gradle
+++ b/tutorials/java/CurrentPlaceDetailsOnMap/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties
index 76613236..b662545e 100644
--- a/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties
+++ b/tutorials/java/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 27 14:05:56 PDT 2020
+#Wed Jan 27 11:30:57 PST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/tutorials/java/CurrentPlaceDetailsOnMap/local.defaults.properties b/tutorials/java/CurrentPlaceDetailsOnMap/local.defaults.properties
new file mode 100644
index 00000000..b4dc1ed7
--- /dev/null
+++ b/tutorials/java/CurrentPlaceDetailsOnMap/local.defaults.properties
@@ -0,0 +1 @@
+MAPS_API_KEY=""
\ No newline at end of file
diff --git a/tutorials/java/MapWithMarker/app/build.gradle b/tutorials/java/MapWithMarker/app/build.gradle
index f6fa332c..811c708f 100644
--- a/tutorials/java/MapWithMarker/app/build.gradle
+++ b/tutorials/java/MapWithMarker/app/build.gradle
@@ -1,13 +1,7 @@
-apply plugin: 'com.android.application'
-
-// Set the properties within `local.properties` into a `Properties` class so
-// that values within `local.properties` (e.g. Maps API key) are accessible in
-// this file.
-Properties properties = new Properties()
-if (rootProject.file("local.properties").exists()) {
-    properties.load(rootProject.file("local.properties").newDataInputStream())
+plugins {
+    id 'com.android.application'
+    id 'com.google.secrets_gradle_plugin' version '0.4'
 }
-def mapsApiKey = properties.getProperty("MAPS_API_KEY", "")
 
 android {
     compileSdkVersion 29
@@ -19,15 +13,6 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
-        // Read the API key from local.properties into R.string.maps_api_key
-        resValue "string", "maps_api_key", mapsApiKey
-
-        // 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
-
     }
     buildTypes {
         release {
@@ -49,3 +34,11 @@ dependencies {
     // [END_EXCLUDE]
 }
 // [END maps_android_play_services_maps_dependency]
+
+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'
+}
diff --git a/tutorials/java/MapWithMarker/app/src/main/AndroidManifest.xml b/tutorials/java/MapWithMarker/app/src/main/AndroidManifest.xml
index d824f1da..c43c91ac 100644
--- a/tutorials/java/MapWithMarker/app/src/main/AndroidManifest.xml
+++ b/tutorials/java/MapWithMarker/app/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
         -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/maps_api_key" />
+            android:value="${MAPS_API_KEY}" />
 
         <activity
             android:name=".MapsMarkerActivity"
diff --git a/tutorials/java/MapWithMarker/build.gradle b/tutorials/java/MapWithMarker/build.gradle
index b7caacb5..84f82593 100644
--- a/tutorials/java/MapWithMarker/build.gradle
+++ b/tutorials/java/MapWithMarker/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties
index 76613236..adcc99a1 100644
--- a/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties
+++ b/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 27 14:05:56 PDT 2020
+#Wed Jan 27 11:31:25 PST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/tutorials/java/MapWithMarker/local.defaults.properties b/tutorials/java/MapWithMarker/local.defaults.properties
new file mode 100644
index 00000000..f9b3e374
--- /dev/null
+++ b/tutorials/java/MapWithMarker/local.defaults.properties
@@ -0,0 +1,9 @@
+## 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
+sdk.dir=/Users/chrisarriola/Library/Android/sdk
+MAPS_API_KEY=AIzaSyBri0nHwJxuIs8KgdsGXdJLFvg1vviUMfo
diff --git a/tutorials/java/Polygons/app/build.gradle b/tutorials/java/Polygons/app/build.gradle
index 48ff2bb8..b5680506 100644
--- a/tutorials/java/Polygons/app/build.gradle
+++ b/tutorials/java/Polygons/app/build.gradle
@@ -1,13 +1,7 @@
-apply plugin: 'com.android.application'
-
-// Set the properties within `local.properties` into a `Properties` class so
-// that values within `local.properties` (e.g. Maps API key) are accessible in
-// this file.
-Properties properties = new Properties()
-if (rootProject.file("local.properties").exists()) {
-    properties.load(rootProject.file("local.properties").newDataInputStream())
+plugins {
+    id 'com.android.application'
+    id 'com.google.secrets_gradle_plugin' version '0.4'
 }
-def mapsApiKey = properties.getProperty("MAPS_API_KEY", "")
 
 android {
     compileSdkVersion 29
@@ -19,15 +13,6 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
-        // Read the API key from local.properties into R.string.maps_api_key
-        resValue "string", "maps_api_key", mapsApiKey
-
-        // 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
-
     }
     buildTypes {
         release {
@@ -45,3 +30,11 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
+
+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'
+}
diff --git a/tutorials/java/Polygons/app/src/main/AndroidManifest.xml b/tutorials/java/Polygons/app/src/main/AndroidManifest.xml
index b9e95ef5..c7538fa1 100644
--- a/tutorials/java/Polygons/app/src/main/AndroidManifest.xml
+++ b/tutorials/java/Polygons/app/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
         -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/maps_api_key" />
+            android:value="${MAPS_API_KEY}" />
 
         <activity
             android:name="com.example.polygons.PolyActivity"
diff --git a/tutorials/java/Polygons/build.gradle b/tutorials/java/Polygons/build.gradle
index a6ad4908..84f82593 100644
--- a/tutorials/java/Polygons/build.gradle
+++ b/tutorials/java/Polygons/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties
index 76613236..e5b2ccad 100644
--- a/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties
+++ b/tutorials/java/Polygons/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 27 14:05:56 PDT 2020
+#Wed Jan 27 11:34:55 PST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/tutorials/java/Polygons/local.defaults.properties b/tutorials/java/Polygons/local.defaults.properties
new file mode 100644
index 00000000..b4dc1ed7
--- /dev/null
+++ b/tutorials/java/Polygons/local.defaults.properties
@@ -0,0 +1 @@
+MAPS_API_KEY=""
\ No newline at end of file
diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/build.gradle b/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/build.gradle
index 940913a7..14923b68 100644
--- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/build.gradle
+++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/build.gradle
@@ -1,15 +1,9 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-android'
-
-// Set the properties within `local.properties` into a `Properties` class so
-// that values within `local.properties` (e.g. Maps API key) are accessible in
-// this file.
-Properties properties = new Properties()
-if (rootProject.file("local.properties").exists()) {
-    properties.load(rootProject.file("local.properties").newDataInputStream())
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'com.google.secrets_gradle_plugin' version '0.4'
 }
-def mapsApiKey = properties.getProperty("MAPS_API_KEY", "")
 
 android {
     compileSdkVersion 29
@@ -21,15 +15,6 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
-        // Read the API key from local.properties into R.string.maps_api_key
-        resValue "string", "maps_api_key", mapsApiKey
-
-        // 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
-
     }
     buildTypes {
         debug {
@@ -55,3 +40,12 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
+
+secrets {
+    defaultPropertiesFileName 'local.defaults.properties'
+    // 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
+}
+
diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml b/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml
index 82a30742..09b6b05f 100644
--- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml
+++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/AndroidManifest.xml
@@ -35,7 +35,7 @@
         -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/maps_api_key" />
+            android:value="${MAPS_API_KEY}" />
 
         <activity
             android:name="com.example.currentplacedetailsonmap.MapsActivityCurrentPlace"
diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.kt b/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.kt
index 92590a7a..b97ec431 100644
--- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.kt
+++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/app/src/main/java/com/example/currentplacedetailsonmap/MapsActivityCurrentPlace.kt
@@ -90,7 +90,7 @@ class MapsActivityCurrentPlace : AppCompatActivity(), OnMapReadyCallback {
 
         // [START_EXCLUDE silent]
         // Construct a PlacesClient
-        Places.initialize(applicationContext, getString(R.string.maps_api_key))
+        Places.initialize(applicationContext, BuildConfig.MAPS_API_KEY)
         placesClient = Places.createClient(this)
 
         // Construct a FusedLocationProviderClient.
diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/build.gradle b/tutorials/kotlin/CurrentPlaceDetailsOnMap/build.gradle
index 4e8ddfeb..f8a0377a 100644
--- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/build.gradle
+++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties
index 76613236..4f050eda 100644
--- a/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties
+++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 27 14:05:56 PDT 2020
+#Wed Jan 27 11:35:42 PST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/tutorials/kotlin/CurrentPlaceDetailsOnMap/local.defaults.properties b/tutorials/kotlin/CurrentPlaceDetailsOnMap/local.defaults.properties
new file mode 100644
index 00000000..b4dc1ed7
--- /dev/null
+++ b/tutorials/kotlin/CurrentPlaceDetailsOnMap/local.defaults.properties
@@ -0,0 +1 @@
+MAPS_API_KEY=""
\ No newline at end of file
diff --git a/tutorials/kotlin/MapWithMarker/app/build.gradle b/tutorials/kotlin/MapWithMarker/app/build.gradle
index 9a51ac11..9c464e87 100644
--- a/tutorials/kotlin/MapWithMarker/app/build.gradle
+++ b/tutorials/kotlin/MapWithMarker/app/build.gradle
@@ -1,15 +1,9 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
-// Set the properties within `local.properties` into a `Properties` class so
-// that values within `local.properties` (e.g. Maps API key) are accessible in
-// this file.
-Properties properties = new Properties()
-if (rootProject.file("local.properties").exists()) {
-    properties.load(rootProject.file("local.properties").newDataInputStream())
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'com.google.secrets_gradle_plugin' version '0.4'
 }
-def mapsApiKey = properties.getProperty("MAPS_API_KEY", "")
 
 android {
     compileSdkVersion 29
@@ -21,14 +15,6 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
-        // Read the API key from local.properties into R.string.maps_api_key
-        resValue "string", "maps_api_key", mapsApiKey
-
-        // 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
     }
     buildTypes {
         release {
@@ -50,3 +36,11 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
+
+secrets {
+    defaultPropertiesFileName 'local.defaults.properties'
+    // 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
+}
diff --git a/tutorials/kotlin/MapWithMarker/app/src/main/AndroidManifest.xml b/tutorials/kotlin/MapWithMarker/app/src/main/AndroidManifest.xml
index d824f1da..c43c91ac 100644
--- a/tutorials/kotlin/MapWithMarker/app/src/main/AndroidManifest.xml
+++ b/tutorials/kotlin/MapWithMarker/app/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
         -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/maps_api_key" />
+            android:value="${MAPS_API_KEY}" />
 
         <activity
             android:name=".MapsMarkerActivity"
diff --git a/tutorials/kotlin/MapWithMarker/local.defaults.properties b/tutorials/kotlin/MapWithMarker/local.defaults.properties
new file mode 100644
index 00000000..9e0d438a
--- /dev/null
+++ b/tutorials/kotlin/MapWithMarker/local.defaults.properties
@@ -0,0 +1 @@
+MAPS_API_KEY=""
diff --git a/tutorials/kotlin/Polygons/app/build.gradle b/tutorials/kotlin/Polygons/app/build.gradle
index ec7756b1..9bac1f9b 100644
--- a/tutorials/kotlin/Polygons/app/build.gradle
+++ b/tutorials/kotlin/Polygons/app/build.gradle
@@ -1,15 +1,9 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-android'
-
-// Set the properties within `local.properties` into a `Properties` class so
-// that values within `local.properties` (e.g. Maps API key) are accessible in
-// this file.
-Properties properties = new Properties()
-if (rootProject.file("local.properties").exists()) {
-    properties.load(rootProject.file("local.properties").newDataInputStream())
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'com.google.secrets_gradle_plugin' version '0.4'
 }
-def mapsApiKey = properties.getProperty("MAPS_API_KEY", "")
 
 android {
     compileSdkVersion 29
@@ -21,14 +15,6 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
-        // Read the API key from local.properties into R.string.maps_api_key
-        resValue "string", "maps_api_key", mapsApiKey
-
-        // 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
     }
     buildTypes {
         release {
@@ -48,3 +34,11 @@ dependencies {
     implementation "androidx.core:core-ktx:1.3.2"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
+
+secrets {
+    defaultPropertiesFileName 'local.defaults.properties'
+    // 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
+}
diff --git a/tutorials/kotlin/Polygons/app/src/main/AndroidManifest.xml b/tutorials/kotlin/Polygons/app/src/main/AndroidManifest.xml
index b9e95ef5..c7538fa1 100644
--- a/tutorials/kotlin/Polygons/app/src/main/AndroidManifest.xml
+++ b/tutorials/kotlin/Polygons/app/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
         -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/maps_api_key" />
+            android:value="${MAPS_API_KEY}" />
 
         <activity
             android:name="com.example.polygons.PolyActivity"
diff --git a/tutorials/kotlin/Polygons/build.gradle b/tutorials/kotlin/Polygons/build.gradle
index 2fedabca..f1c995e0 100644
--- a/tutorials/kotlin/Polygons/build.gradle
+++ b/tutorials/kotlin/Polygons/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties b/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties
index 76613236..5335cf10 100644
--- a/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties
+++ b/tutorials/kotlin/Polygons/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 27 14:05:56 PDT 2020
+#Wed Jan 27 11:41:00 PST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/tutorials/kotlin/Polygons/local.defaults.properties b/tutorials/kotlin/Polygons/local.defaults.properties
new file mode 100644
index 00000000..b4dc1ed7
--- /dev/null
+++ b/tutorials/kotlin/Polygons/local.defaults.properties
@@ -0,0 +1 @@
+MAPS_API_KEY=""
\ No newline at end of file