From f0e73cf0c7f550314b127278e2318da24bfaf4ec Mon Sep 17 00:00:00 2001 From: hansemannn Date: Tue, 4 Feb 2020 06:20:55 +0100 Subject: [PATCH 1/3] chore(android): handle google-services.json --- android/build.gradle | 1 + android/cli/commands/_build.js | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/android/build.gradle b/android/build.gradle index ca04f15b356..dad15a9082b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -13,6 +13,7 @@ buildscript { jcenter() } dependencies { + classpath 'com.google.gms:google-services:4.3.3' classpath 'com.android.tools.build:gradle:3.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js index 5963f256325..79db7c12d19 100644 --- a/android/cli/commands/_build.js +++ b/android/cli/commands/_build.js @@ -2244,6 +2244,13 @@ AndroidBuilder.prototype.generateAppProject = async function generateAppProject( } } + const googleServicesFile = path.join(this.projectDir, 'platform', 'android', 'google-services.json'); + if (await fs.exists(googleServicesFile)) { + afs.copyFileSync(googleServicesFile, path.join(this.buildAppDir, 'google-services.json'), { + logger: this.logger.debug + }); + } + // Copy Titanium project's "./platform/android" directory tree to "app" project's "./src/main". // Android build tools auto-grabs folders named "assets", "res", "aidl", etc. in this folder. // Note: Our "build.gradle" is configured to look for JAR/AAR files here too. (Needed by hyperloop.) From 77f74e4184e1df50cd689a051c59293903e978be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= Date: Tue, 11 Feb 2020 10:09:42 +0100 Subject: [PATCH 2/3] chore: add gradle plugin condition --- android/templates/build/app.build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android/templates/build/app.build.gradle b/android/templates/build/app.build.gradle index 43663f6ddd7..718dc3733c0 100644 --- a/android/templates/build/app.build.gradle +++ b/android/templates/build/app.build.gradle @@ -1,6 +1,11 @@ apply plugin: 'com.android.application' +// Apply the Google Services plugin if included +if (file("${projectDir}/google-services.json").exists()) { + apply plugin: 'com.google.gms.google-services' +} + repositories { <% if (mavenRepositoryUrls) { for (let nextUrl of mavenRepositoryUrls) { %> maven { url '<%- nextUrl %>' } From bcc1997dd9e2fe8cc76f9dc8a78aaf33c2e705ca Mon Sep 17 00:00:00 2001 From: Joshua Quick Date: Tue, 3 Mar 2020 14:35:16 -0800 Subject: [PATCH 3/3] chore(android): add google-services.json support to app template --- android/templates/build/root.build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/android/templates/build/root.build.gradle b/android/templates/build/root.build.gradle index 0e1a24bc614..ea377909ed9 100644 --- a/android/templates/build/root.build.gradle +++ b/android/templates/build/root.build.gradle @@ -8,6 +8,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.google.gms:google-services:4.3.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } }