github/cordova-android
github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-04-05 22:41:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: rename gradle plugin google services preference options (#898)

Browse Source
This commit is contained in:
エリス 2020-01-17 08:22:06 +09:00 committed by GitHub
parent a951793431
commit 09256b766f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bin/templates/project/app/build.gradle
View File

@ -31,23 +31,23 @@ buildscript {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:3.3.0'
if(cdvHelpers.getConfigPreference('GoogleServicesEnabled', 'false').toBoolean()) { if(cdvHelpers.getConfigPreference('GradlePluginGoogleServicesEnabled', 'false').toBoolean()) {
String defaultGoogleServiceVersion = '4.2.0' String defaultGradlePluginGoogleServicesVersion = '4.2.0'
/** /**
* Fetches the user's defined Google Services Plugin Version from config.xml. * Fetches the user's defined Google Services Plugin Version from config.xml.
* If the version is not set or invalid, it will default to the ${defaultGoogleServiceVersion} * If the version is not set or invalid, it will default to the ${defaultGradlePluginGoogleServicesVersion}
*/ */
String googleServicesVersion = cdvHelpers.getConfigPreference('GoogleServicesVersion', defaultGoogleServiceVersion) String gradlePluginGoogleServicesVersion = cdvHelpers.getConfigPreference('GradlePluginGoogleServicesVersion', defaultGradlePluginGoogleServicesVersion)
if(!cdvHelpers.isVersionValid(googleServicesVersion)) { if(!cdvHelpers.isVersionValid(gradlePluginGoogleServicesVersion)) {
println("The defined Google Services plugin version (${googleServicesVersion}) does not appear to be a valid version. Falling back to version: ${defaultGoogleServiceVersion}.") println("The defined Google Services plugin version (${gradlePluginGoogleServicesVersion}) does not appear to be a valid version. Falling back to version: ${defaultGradlePluginGoogleServicesVersion}.")
googleServicesVersion = defaultGoogleServiceVersion gradlePluginGoogleServicesVersion = defaultGradlePluginGoogleServicesVersion
} }
// Create the Google Services classpath and set it. // Create the Google Services classpath and set it.
String googleServicesClassPath = "com.google.gms:google-services:${googleServicesVersion}" String gradlePluginGoogleServicesClassPath = "com.google.gms:google-services:${gradlePluginGoogleServicesVersion}"
println "Adding classpath: ${googleServicesClassPath}" println "Adding classpath: ${gradlePluginGoogleServicesClassPath}"
classpath googleServicesClassPath classpath gradlePluginGoogleServicesClassPath
} }
} }
} }
@ -378,6 +378,6 @@ if (hasProperty('postBuildExtras')) {
postBuildExtras() postBuildExtras()
} }
if (cdvHelpers.getConfigPreference('GoogleServicesEnabled', 'false').toBoolean()) { if (cdvHelpers.getConfigPreference('GradlePluginGoogleServicesEnabled', 'false').toBoolean()) {
apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.gms.google-services'
} }