You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by er...@apache.org on 2021/08/02 05:19:50 UTC

[cordova-android] branch master updated: fix: fall back to project root repositories.gradle (#1300)

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

erisu 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 565ac9c  fix: fall back to project root repositories.gradle (#1300)
565ac9c is described below

commit 565ac9c7b1b9a086b9bbd2a75b8ef94a5357dd5d
Author: エリス <er...@users.noreply.github.com>
AuthorDate: Mon Aug 2 14:19:40 2021 +0900

    fix: fall back to project root repositories.gradle (#1300)
---
 framework/build.gradle             | 8 +++++++-
 templates/project/app/build.gradle | 8 +++++++-
 templates/project/build.gradle     | 8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/framework/build.gradle b/framework/build.gradle
index 8ee8ca0..38cd42d 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -29,7 +29,13 @@ buildscript {
 }
 
 allprojects {
-    apply from: 'repositories.gradle'
+    def hasRepositoriesGradle = file('repositories.gradle').exists()
+    if (hasRepositoriesGradle) {
+        apply from: 'repositories.gradle'
+    } else {
+        apply from: "${project.rootDir}/repositories.gradle"
+    }
+
     repositories repos
 }
 
diff --git a/templates/project/app/build.gradle b/templates/project/app/build.gradle
index f1b41d7..08959e0 100644
--- a/templates/project/app/build.gradle
+++ b/templates/project/app/build.gradle
@@ -60,7 +60,13 @@ buildscript {
 
 // Allow plugins to declare Maven dependencies via build-extras.gradle.
 allprojects {
-    apply from: 'repositories.gradle'
+    def hasRepositoriesGradle = file('repositories.gradle').exists()
+    if (hasRepositoriesGradle) {
+        apply from: 'repositories.gradle'
+    } else {
+        apply from: "${project.rootDir}/repositories.gradle"
+    }
+
     repositories repos
 }
 
diff --git a/templates/project/build.gradle b/templates/project/build.gradle
index 1e01f06..949bc3f 100644
--- a/templates/project/build.gradle
+++ b/templates/project/build.gradle
@@ -30,7 +30,13 @@ buildscript {
 }
 
 allprojects {
-    apply from: 'repositories.gradle'
+    def hasRepositoriesGradle = file('repositories.gradle').exists()
+    if (hasRepositoriesGradle) {
+        apply from: 'repositories.gradle'
+    } else {
+        apply from: "${project.rootDir}/repositories.gradle"
+    }
+
     repositories repos
 }
 

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