mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-23 04:41:11 +00:00
Bug 1894704 - Check if the gradle extension mozconfig property is set and only apply mozconfig.gradle when it is not available. r=gl,geckoview-reviewers,android-reviewers,ohall
Differential Revision: https://phabricator.services.mozilla.com/D217170
This commit is contained in:
parent
8abdfca977
commit
4ca584e36d
@ -4,7 +4,9 @@
|
||||
|
||||
// Prevents gradle builds from looking for a root settings.gradle
|
||||
pluginManagement {
|
||||
apply from: file('../../../gradle/mozconfig.gradle')
|
||||
if (!gradle.hasProperty("mozconfig")){
|
||||
apply from: file('../../../gradle/mozconfig.gradle')
|
||||
}
|
||||
|
||||
repositories {
|
||||
gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
|
||||
|
@ -4,7 +4,9 @@
|
||||
|
||||
// Prevents gradle builds from looking for a root settings.gradle
|
||||
pluginManagement {
|
||||
apply from: file('../../../gradle/mozconfig.gradle')
|
||||
if (!gradle.hasProperty("mozconfig")){
|
||||
apply from: file('../../../gradle/mozconfig.gradle')
|
||||
}
|
||||
|
||||
repositories {
|
||||
gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
|
||||
|
@ -5,7 +5,9 @@
|
||||
// Prevents gradle builds from looking for a root settings.gradle
|
||||
|
||||
pluginManagement {
|
||||
apply from: file('../../../gradle/mozconfig.gradle')
|
||||
if (!gradle.hasProperty("mozconfig")){
|
||||
apply from: file('../../../gradle/mozconfig.gradle')
|
||||
}
|
||||
|
||||
repositories {
|
||||
gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
|
||||
|
@ -3,7 +3,9 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
pluginManagement {
|
||||
apply from: file('../gradle/mozconfig.gradle')
|
||||
if (!gradle.hasProperty("mozconfig")){
|
||||
apply from: file('../gradle/mozconfig.gradle')
|
||||
}
|
||||
|
||||
repositories {
|
||||
gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
|
||||
|
@ -4,7 +4,9 @@
|
||||
|
||||
// Prevents gradle builds from looking for a root settings.gradle
|
||||
pluginManagement {
|
||||
apply from: file('../../../gradle/mozconfig.gradle')
|
||||
if (!gradle.hasProperty("mozconfig")){
|
||||
apply from: file('../../../gradle/mozconfig.gradle')
|
||||
}
|
||||
|
||||
repositories {
|
||||
gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
|
||||
|
@ -4,7 +4,9 @@
|
||||
|
||||
// Prevents gradle builds from looking for a root settings.gradle
|
||||
pluginManagement {
|
||||
apply from: file('../../../gradle/mozconfig.gradle')
|
||||
if (!gradle.hasProperty("mozconfig")){
|
||||
apply from: file('../../../gradle/mozconfig.gradle')
|
||||
}
|
||||
|
||||
repositories {
|
||||
gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
|
||||
|
@ -3,7 +3,9 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
pluginManagement {
|
||||
apply from: file('../gradle/mozconfig.gradle')
|
||||
if (!gradle.hasProperty("mozconfig")){
|
||||
apply from: file('../gradle/mozconfig.gradle')
|
||||
}
|
||||
|
||||
repositories {
|
||||
gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
|
||||
|
@ -4,7 +4,9 @@
|
||||
|
||||
// Prevents gradle builds from looking for a root settings.gradle
|
||||
pluginManagement {
|
||||
apply from: file('../../../gradle/mozconfig.gradle')
|
||||
if (!gradle.hasProperty("mozconfig")){
|
||||
apply from: file('../../../gradle/mozconfig.gradle')
|
||||
}
|
||||
|
||||
repositories {
|
||||
gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
|
||||
|
@ -3,7 +3,9 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
pluginManagement {
|
||||
apply from: file('../gradle/mozconfig.gradle')
|
||||
if (!gradle.hasProperty("mozconfig")){
|
||||
apply from: file('../gradle/mozconfig.gradle')
|
||||
}
|
||||
|
||||
repositories {
|
||||
gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
|
||||
|
@ -5,7 +5,9 @@
|
||||
import org.yaml.snakeyaml.Yaml
|
||||
|
||||
buildscript {
|
||||
apply from: file('./gradle/mozconfig.gradle')
|
||||
if (!gradle.hasProperty("mozconfig")){
|
||||
apply from: file('./gradle/mozconfig.gradle')
|
||||
}
|
||||
|
||||
repositories {
|
||||
gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
|
||||
@ -23,7 +25,9 @@ buildscript {
|
||||
}
|
||||
}
|
||||
|
||||
apply from: file('./gradle/mozconfig.gradle')
|
||||
if (!gradle.hasProperty("mozconfig")){
|
||||
apply from: file('./gradle/mozconfig.gradle')
|
||||
}
|
||||
|
||||
// Synchronized library configuration for all modules
|
||||
// This "componentsVersion" number is defined in "version.txt" and should follow
|
||||
|
@ -1,5 +1,7 @@
|
||||
pluginManagement {
|
||||
apply from: file('mobile/android/gradle/mozconfig.gradle')
|
||||
if (!gradle.hasProperty("mozconfig")){
|
||||
apply from: file('mobile/android/gradle/mozconfig.gradle')
|
||||
}
|
||||
|
||||
repositories {
|
||||
gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
|
||||
|
Loading…
Reference in New Issue
Block a user