mavenLocal.patch 2.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687
  1. From d1263dbcc33e3f587abbc4bbf8c24c0bb567f194 Mon Sep 17 00:00:00 2001
  2. From: Georg Koppen <gk@torproject.org>
  3. Date: Wed, 20 May 2020 14:18:12 +0000
  4. Subject: [PATCH] mavenLocal() fixes
  5. ---
  6. build.gradle | 2 ++
  7. buildSrc/build.gradle | 1 +
  8. buildSrc/settings.gradle | 7 ++++++-
  9. settings.gradle | 7 +++++++
  10. 4 files changed, 16 insertions(+), 1 deletion(-)
  11. diff --git a/build.gradle b/build.gradle
  12. index f412f91f4..944a19e9a 100644
  13. --- a/build.gradle
  14. +++ b/build.gradle
  15. @@ -6,6 +6,7 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType
  16. buildscript {
  17. repositories {
  18. + mavenLocal()
  19. if (project.hasProperty("googleRepo")) {
  20. maven {
  21. name "Google"
  22. @@ -39,6 +40,7 @@ plugins {
  23. allprojects {
  24. repositories {
  25. + mavenLocal()
  26. if (project.hasProperty("googleRepo")) {
  27. maven {
  28. name "Google"
  29. diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
  30. index c9f83be52..c01e9ab01 100644
  31. --- a/buildSrc/build.gradle
  32. +++ b/buildSrc/build.gradle
  33. @@ -7,6 +7,7 @@ plugins {
  34. }
  35. repositories {
  36. + mavenLocal()
  37. mavenCentral()
  38. if (project.hasProperty("centralRepo")) {
  39. diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
  40. index c31ad3840..fb6526db3 100644
  41. --- a/buildSrc/settings.gradle
  42. +++ b/buildSrc/settings.gradle
  43. @@ -1,10 +1,15 @@
  44. /* This Source Code Form is subject to the terms of the Mozilla Public
  45. * License, v. 2.0. If a copy of the MPL was not distributed with this
  46. * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  47. +pluginManagement {
  48. + repositories {
  49. + mavenLocal()
  50. + }
  51. +}
  52. buildCache {
  53. local {
  54. directory = new File(rootDir, '../.build-cache')
  55. removeUnusedEntriesAfterDays = 30
  56. }
  57. -}
  58. \ No newline at end of file
  59. +}
  60. diff --git a/settings.gradle b/settings.gradle
  61. index e1204312f..428e9ddcd 100644
  62. --- a/settings.gradle
  63. +++ b/settings.gradle
  64. @@ -4,8 +4,15 @@
  65. import org.yaml.snakeyaml.Yaml
  66. +pluginManagement {
  67. + repositories {
  68. + mavenLocal()
  69. + }
  70. +}
  71. +
  72. buildscript {
  73. repositories {
  74. + mavenLocal()
  75. if (hasProperty("centralRepo")) {
  76. maven {
  77. name "MavenCentral"