Skip to content
This repository has been archived by the owner on Aug 4, 2022. It is now read-only.

Commit

Permalink
Bug 1506267 - Add plugins.gradle.com to Nexus. r=nalexander.
Browse files Browse the repository at this point in the history
  • Loading branch information
agi committed Nov 19, 2018
1 parent e173c6b commit 241cb43
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 7 deletions.
4 changes: 0 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion mobile/android/config/mozconfigs/common
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions mobile/android/gradle.configure
Original file line number Diff line number Diff line change
Expand Up @@ -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.')

Expand Down
1 change: 0 additions & 1 deletion mobile/android/gradle/m2repo/README

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
31 changes: 31 additions & 0 deletions taskcluster/scripts/misc/android-gradle-dependencies/nexus.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 241cb43

Please sign in to comment.