From 241cb43683e6f290eacb2ba32212d5831598e14e Mon Sep 17 00:00:00 2001
From: Agi Sferro <agi@mozilla.com>
Date: Mon, 19 Nov 2018 16:03:33 +0000
Subject: [PATCH] Bug 1506267 - Add plugins.gradle.com to Nexus. r=nalexander.

Differential Revision: https://phabricator.services.mozilla.com/D12047
---
 build.gradle                                  |  4 ---
 .../nightly                                   |  2 +-
 mobile/android/config/mozconfigs/common       |  2 +-
 mobile/android/gradle.configure               |  1 +
 mobile/android/gradle/m2repo/README           |  1 -
 .../misc/android-gradle-dependencies/after.sh |  1 +
 .../android-gradle-dependencies/nexus.xml     | 31 +++++++++++++++++++
 7 files changed, 35 insertions(+), 7 deletions(-)
 delete mode 100644 mobile/android/gradle/m2repo/README

diff --git a/build.gradle b/build.gradle
index 28f72df38995..245aa05a4a9f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,10 +44,6 @@ buildscript {
                 url repository
             }
         }
-        // For in tree plugins.
-        maven {
-            url "file://${gradle.mozconfig.topsrcdir}/mobile/android/gradle/m2repo"
-        }
     }
 
     ext.kotlin_version = '1.2.41'
diff --git a/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly b/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
index 01f5e0b2d1f6..e3fc5ed2840f 100644
--- a/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
+++ b/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
@@ -14,7 +14,7 @@ NO_NDK=1
 # We want to download Gradle.
 ac_add_options --with-gradle
 # We want to use (and populate!) the local Nexus repositories.
-export GRADLE_MAVEN_REPOSITORIES="http://localhost:8081/nexus/content/repositories/google/","http://localhost:8081/nexus/content/repositories/jcenter/"
+export GRADLE_MAVEN_REPOSITORIES="http://localhost:8081/nexus/content/repositories/google/","http://localhost:8081/nexus/content/repositories/jcenter/","http://localhost:8081/nexus/content/repositories/gradle-plugins/"
 
 # From here on, just like ../android-api-16-frontend/nightly.
 
diff --git a/mobile/android/config/mozconfigs/common b/mobile/android/config/mozconfigs/common
index 916f60783ad4..27114faeee8b 100644
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -21,7 +21,7 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux"
 
 ac_add_options --with-gradle="$topsrcdir/android-gradle-dependencies/gradle-dist/bin/gradle"
-export GRADLE_MAVEN_REPOSITORIES="file://$topsrcdir/android-gradle-dependencies/google","file://$topsrcdir/android-gradle-dependencies/jcenter"
+export GRADLE_MAVEN_REPOSITORIES="file://$topsrcdir/android-gradle-dependencies/google","file://$topsrcdir/android-gradle-dependencies/jcenter","file://$topsrcdir/android-gradle-dependencies/gradle-plugins"
 
 if [ -z "$NO_NDK" ]; then
     # We use our own clang instead of the NDK's clang.
diff --git a/mobile/android/gradle.configure b/mobile/android/gradle.configure
index 60275235d7d4..f0337982879d 100644
--- a/mobile/android/gradle.configure
+++ b/mobile/android/gradle.configure
@@ -317,6 +317,7 @@ option(env='GRADLE_MAVEN_REPOSITORIES',
        nargs='+',
        default=('https://maven.google.com/',
                 'https://jcenter.bintray.com/',
+                'https://plugins.gradle.org/m2/',
        ),
        help='Comma-separated URLs of Maven repositories containing Gradle dependencies.')
 
diff --git a/mobile/android/gradle/m2repo/README b/mobile/android/gradle/m2repo/README
deleted file mode 100644
index af854ef5f53e..000000000000
--- a/mobile/android/gradle/m2repo/README
+++ /dev/null
@@ -1 +0,0 @@
-In tree Gradle packages and plugins go here.
\ No newline at end of file
diff --git a/taskcluster/scripts/misc/android-gradle-dependencies/after.sh b/taskcluster/scripts/misc/android-gradle-dependencies/after.sh
index 0a38571e579b..d6e0ed3d091c 100755
--- a/taskcluster/scripts/misc/android-gradle-dependencies/after.sh
+++ b/taskcluster/scripts/misc/android-gradle-dependencies/after.sh
@@ -15,6 +15,7 @@ mkdir -p android-gradle-dependencies /builds/worker/artifacts
 
 cp -R ${NEXUS_WORK}/storage/jcenter android-gradle-dependencies
 cp -R ${NEXUS_WORK}/storage/google android-gradle-dependencies
+cp -R ${NEXUS_WORK}/storage/gradle-plugins android-gradle-dependencies
 
 # The Gradle wrapper will have downloaded and verified the hash of exactly one
 # Gradle distribution.  It will be located in $GRADLE_USER_HOME, like
diff --git a/taskcluster/scripts/misc/android-gradle-dependencies/nexus.xml b/taskcluster/scripts/misc/android-gradle-dependencies/nexus.xml
index b1e9a161c4ac..b1a81bfdf03d 100644
--- a/taskcluster/scripts/misc/android-gradle-dependencies/nexus.xml
+++ b/taskcluster/scripts/misc/android-gradle-dependencies/nexus.xml
@@ -50,6 +50,37 @@
         <autoBlockActive>true</autoBlockActive>
       </externalConfiguration>
     </repository>
+    <repository>
+      <id>gradle-plugins</id>
+      <name>Gradle Plugins</name>
+      <providerRole>org.sonatype.nexus.proxy.repository.Repository</providerRole>
+      <providerHint>maven2</providerHint>
+      <localStatus>IN_SERVICE</localStatus>
+      <notFoundCacheActive>true</notFoundCacheActive>
+      <notFoundCacheTTL>1440</notFoundCacheTTL>
+      <userManaged>true</userManaged>
+      <exposed>true</exposed>
+      <browseable>true</browseable>
+      <writePolicy>READ_ONLY</writePolicy>
+      <indexable>true</indexable>
+      <searchable>true</searchable>
+      <localStorage>
+        <provider>file</provider>
+      </localStorage>
+      <remoteStorage>
+        <url>https://plugins.gradle.org/m2/</url>
+      </remoteStorage>
+      <externalConfiguration>
+        <repositoryPolicy>RELEASE</repositoryPolicy>
+        <checksumPolicy>STRICT</checksumPolicy>
+        <fileTypeValidation>true</fileTypeValidation>
+        <downloadRemoteIndex>false</downloadRemoteIndex>
+        <artifactMaxAge>-1</artifactMaxAge>
+        <metadataMaxAge>1440</metadataMaxAge>
+        <itemMaxAge>1440</itemMaxAge>
+        <autoBlockActive>true</autoBlockActive>
+      </externalConfiguration>
+    </repository>
     <repository>
       <id>google</id>
       <name>google</name>