diff --git a/google-services-plugin/src/main/kotlin/com/google/gms/googleservices/GoogleServicesTask.kt b/google-services-plugin/src/main/kotlin/com/google/gms/googleservices/GoogleServicesTask.kt
index 82dc26cc..606f7898 100644
--- a/google-services-plugin/src/main/kotlin/com/google/gms/googleservices/GoogleServicesTask.kt
+++ b/google-services-plugin/src/main/kotlin/com/google/gms/googleservices/GoogleServicesTask.kt
@@ -65,8 +65,8 @@ abstract class GoogleServicesTask : DefaultTask() {
if (jsonFiles.isEmpty()) {
val message =
"""
- File $JSON_FILE_NAME is missing.
- The Google Services Plugin cannot function without it.
+ File $JSON_FILE_NAME is missing.
+ The Google Services Plugin cannot function without it.
Searched locations: ${
googleServicesJsonFiles.get().joinToString { it.absolutePath }
}
@@ -109,6 +109,7 @@ abstract class GoogleServicesTask : DefaultTask() {
handleGoogleApiKey(resValues)
handleGoogleAppId(resValues)
handleWebClientId(resValues)
+ handleSiteKey(resValues)
}
?: throw GradleException(
"No matching client found for package name '${applicationId.get()}' in ${quickstartFile.path}")
@@ -208,7 +209,7 @@ abstract class GoogleServicesTask : DefaultTask() {
"""
-
+
"""
.trimIndent())
for ((name, value) in values) {
@@ -259,6 +260,12 @@ abstract class GoogleServicesTask : DefaultTask() {
}
}
+ fun FirebaseClientData.handleSiteKey(resValues: MutableMap) {
+ this.getAsJsonPrimitive("recaptcha_site_key")?.let {
+ resValues["recaptcha_site_key"] = it.asString
+ }
+ }
+
/**
* Handle a client object for analytics (@xml/global_tracker)
*
diff --git a/google-services-plugin/src/test/testData/project1-expected/processFreeOneDebugGoogleServices/values/values.xml b/google-services-plugin/src/test/testData/project1-expected/processFreeOneDebugGoogleServices/values/values.xml
index 750588dc..b5dae02d 100644
--- a/google-services-plugin/src/test/testData/project1-expected/processFreeOneDebugGoogleServices/values/values.xml
+++ b/google-services-plugin/src/test/testData/project1-expected/processFreeOneDebugGoogleServices/values/values.xml
@@ -7,4 +7,5 @@
1:123456789000:android:f1bf012572b04063
AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo
mockproject-1234
+ 6L00000sAAAAAAaaaaaAAaa00000_AAAaAaaAa00
diff --git a/google-services-plugin/src/test/testData/project1-expected/processFreeTwoDebugGoogleServices/values/values.xml b/google-services-plugin/src/test/testData/project1-expected/processFreeTwoDebugGoogleServices/values/values.xml
index 750588dc..b5dae02d 100644
--- a/google-services-plugin/src/test/testData/project1-expected/processFreeTwoDebugGoogleServices/values/values.xml
+++ b/google-services-plugin/src/test/testData/project1-expected/processFreeTwoDebugGoogleServices/values/values.xml
@@ -7,4 +7,5 @@
1:123456789000:android:f1bf012572b04063
AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo
mockproject-1234
+ 6L00000sAAAAAAaaaaaAAaa00000_AAAaAaaAa00
diff --git a/google-services-plugin/src/test/testData/project1-expected/processPaidOneDebugGoogleServices/values/values.xml b/google-services-plugin/src/test/testData/project1-expected/processPaidOneDebugGoogleServices/values/values.xml
index 750588dc..b5dae02d 100644
--- a/google-services-plugin/src/test/testData/project1-expected/processPaidOneDebugGoogleServices/values/values.xml
+++ b/google-services-plugin/src/test/testData/project1-expected/processPaidOneDebugGoogleServices/values/values.xml
@@ -7,4 +7,5 @@
1:123456789000:android:f1bf012572b04063
AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo
mockproject-1234
+ 6L00000sAAAAAAaaaaaAAaa00000_AAAaAaaAa00
diff --git a/google-services-plugin/src/test/testData/project1-expected/processPaidTwoDebugGoogleServices/values/values.xml b/google-services-plugin/src/test/testData/project1-expected/processPaidTwoDebugGoogleServices/values/values.xml
index 750588dc..b5dae02d 100644
--- a/google-services-plugin/src/test/testData/project1-expected/processPaidTwoDebugGoogleServices/values/values.xml
+++ b/google-services-plugin/src/test/testData/project1-expected/processPaidTwoDebugGoogleServices/values/values.xml
@@ -7,4 +7,5 @@
1:123456789000:android:f1bf012572b04063
AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo
mockproject-1234
+ 6L00000sAAAAAAaaaaaAAaa00000_AAAaAaaAa00
diff --git a/google-services-plugin/src/test/testData/project1/app/google-services.json b/google-services-plugin/src/test/testData/project1/app/google-services.json
index c7d5f20e..9bf24cb9 100644
--- a/google-services-plugin/src/test/testData/project1/app/google-services.json
+++ b/google-services-plugin/src/test/testData/project1/app/google-services.json
@@ -956,9 +956,10 @@
"test_banner_ad_unit_id": "ca-app-pub-3940256099942544/6300978111",
"test_interstitial_ad_unit_id": "ca-app-pub-3940256099942544/1033173712"
}
- }
+ },
+ "recaptcha_site_key": "6L00000sAAAAAAaaaaaAAaa00000_AAAaAaaAa00"
}
],
"client_info": [],
"ARTIFACT_VERSION": "1"
-}
\ No newline at end of file
+}