You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by br...@apache.org on 2018/11/14 13:00:40 UTC

[cordova-android] branch master updated: GH-552 (android) check for build-extras.gradle in the app-parent directory (#553)

This is an automated email from the ASF dual-hosted git repository.

brodybits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git


The following commit(s) were added to refs/heads/master by this push:
     new 7eed65e  GH-552 (android) check for build-extras.gradle in the app-parent directory (#553)
7eed65e is described below

commit 7eed65e9b4652cd5ef3afb163690aab940095fe2
Author: David Boho <Da...@users.noreply.github.com>
AuthorDate: Wed Nov 14 14:00:36 2018 +0100

    GH-552 (android) check for build-extras.gradle in the app-parent directory (#553)
    
    as documented in https://cordova.apache.org/docs/en/latest/guide/platforms/android/?#extending-buildgradle
    
    and deal with multiple build-extras.gradle locations
    
    Co-authored-by: David Boho <da...@tu-ilmenau.de>
    Co-authored-by: Christopher J. Brody <ch...@gmail.com>
---
 bin/templates/project/app/build.gradle | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/templates/project/app/build.gradle b/bin/templates/project/app/build.gradle
index 87bf049..016c0b3 100644
--- a/bin/templates/project/app/build.gradle
+++ b/bin/templates/project/app/build.gradle
@@ -93,11 +93,16 @@ ext {
 // PLUGIN GRADLE EXTENSIONS START
 // PLUGIN GRADLE EXTENSIONS END
 
-def hasBuildExtras = file('build-extras.gradle').exists()
-if (hasBuildExtras) {
+def hasBuildExtras1 = file('build-extras.gradle').exists()
+if (hasBuildExtras1) {
     apply from: 'build-extras.gradle'
 }
 
+def hasBuildExtras2 = file('../build-extras.gradle').exists()
+if (hasBuildExtras2) {
+    apply from: '../build-extras.gradle'
+}
+
 // Set property defaults after extension .gradle files.
 if (ext.cdvCompileSdkVersion == null) {
     ext.cdvCompileSdkVersion = privateHelpers.getProjectTarget()


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org