From 4f9bce1686528182d624dd9b47fef353d809d5f3 Mon Sep 17 00:00:00 2001
From: mcilwain <mcilwain@google.com>
Date: Wed, 13 Feb 2019 12:01:04 -0800
Subject: [PATCH] Automated g4 rollback of changelist 233778270

*** Reason for rollback ***

Breaks the build.

*** Original change description ***

Fix overrides of plugin repository

The correct way to override the plugins repo is through the pluginManagement
section in the gradle settings file.  Also make use of the gradle.properties
file to initialize repositoryUrl and also publishUrl so we don't have to mess
around with finding and assigning them in the main gradle file.

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=233801411
---
 gradle/build.gradle      | 22 ++++++++++++++++++----
 gradle/gradle.properties |  2 --
 gradle/settings.gradle   | 13 -------------
 3 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 gradle/gradle.properties

diff --git a/gradle/build.gradle b/gradle/build.gradle
index 343a25bcb..c60ea9ce1 100644
--- a/gradle/build.gradle
+++ b/gradle/build.gradle
@@ -1,4 +1,18 @@
 buildscript {
+  ext.repositoryUrl = project.findProperty('repositoryUrl')
+  ext.publishUrl = project.findProperty('publishUrl')
+  repositories {
+    if (repositoryUrl == null) {
+      println "Using Maven central..."
+      mavenCentral()
+    } else {
+      maven {
+        println "Using GCS Maven repo..."
+        url repositoryUrl
+      }
+    }
+  }
+
   // Lock buildscript dependencies.
   configurations.classpath {
     resolutionStrategy.activateDependencyLocking()
@@ -57,7 +71,7 @@ task stage {
 }
 
 
-if (publishUrl) {
+if (publishUrl != null) {
   publishing {
     repositories {
       maven {
@@ -115,12 +129,12 @@ allprojects {
   if (project.name == 'services') return
 
   repositories {
-    if (rootProject.repositoryUrl) {
+    if (rootProject.repositoryUrl == null) {
+      mavenCentral()
+    } else {
       maven {
         url rootProject.repositoryUrl
       }
-    } else {
-      mavenCentral()
     }
   }
 
diff --git a/gradle/gradle.properties b/gradle/gradle.properties
deleted file mode 100644
index 8035c0843..000000000
--- a/gradle/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-repositoryUrl=
-publishUrl=
diff --git a/gradle/settings.gradle b/gradle/settings.gradle
index cb3438ba0..30879379f 100644
--- a/gradle/settings.gradle
+++ b/gradle/settings.gradle
@@ -1,16 +1,3 @@
-if (repositoryUrl) {
-  println "Using repository $repositoryUrl for plugins"
-  pluginManagement {
-    repositories {
-      maven {
-        url repositoryUrl
-      }
-    }
-  }
-} else {
-  println "Using default repository for plugins"
-}
-
 rootProject.name = 'nomulus'
 
 include 'core'