| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788 |
- From 563526695139d07ec8192c71c99270b0de3e33ff Mon Sep 17 00:00:00 2001
- From: Georg Koppen <gk@torproject.org>
- Date: Wed, 20 May 2020 14:18:12 +0000
- Subject: [PATCH] mavenLocal() fixes
- ---
- build.gradle | 2 ++
- buildSrc/build.gradle | 2 ++
- buildSrc/settings.gradle | 7 ++++++-
- settings.gradle | 7 +++++++
- 4 files changed, 17 insertions(+), 1 deletion(-)
- diff --git a/build.gradle b/build.gradle
- index eb19f4a217..c86abd5559 100644
- --- a/build.gradle
- +++ b/build.gradle
- @@ -6,6 +6,7 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType
-
- buildscript {
- repositories {
- + mavenLocal()
- if (project.hasProperty("googleRepo")) {
- maven {
- name "Google"
- @@ -40,6 +41,7 @@ plugins {
-
- allprojects {
- repositories {
- + mavenLocal()
- if (project.hasProperty("googleRepo")) {
- maven {
- name "Google"
- diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
- index b2af6cdea2..67a25b7841 100644
- --- a/buildSrc/build.gradle
- +++ b/buildSrc/build.gradle
- @@ -7,6 +7,8 @@ plugins {
- }
-
- repositories {
- + mavenLocal()
- +
- if (project.hasProperty("centralRepo")) {
- maven {
- name "MavenCentral"
- diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
- index c31ad3840d..fb6526db30 100644
- --- a/buildSrc/settings.gradle
- +++ b/buildSrc/settings.gradle
- @@ -1,10 +1,15 @@
- /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- +pluginManagement {
- + repositories {
- + mavenLocal()
- + }
- +}
-
- buildCache {
- local {
- directory = new File(rootDir, '../.build-cache')
- removeUnusedEntriesAfterDays = 30
- }
- -}
- \ No newline at end of file
- +}
- diff --git a/settings.gradle b/settings.gradle
- index e1204312f5..428e9ddcdf 100644
- --- a/settings.gradle
- +++ b/settings.gradle
- @@ -4,8 +4,15 @@
-
- import org.yaml.snakeyaml.Yaml
-
- +pluginManagement {
- + repositories {
- + mavenLocal()
- + }
- +}
- +
- buildscript {
- repositories {
- + mavenLocal()
- if (hasProperty("centralRepo")) {
- maven {
- name "MavenCentral"
|
