mavenLocal.patch 1.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384
  1. From 6a88b59457dd38f0e8d69f0c2988bb2952075536 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. diff --git a/build.gradle b/build.gradle
  6. index 9f298887a..278245d30 100644
  7. --- a/build.gradle
  8. +++ b/build.gradle
  9. @@ -6,6 +6,7 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType
  10. buildscript {
  11. repositories {
  12. + mavenLocal()
  13. if (project.hasProperty("googleRepo")) {
  14. maven {
  15. name "Google"
  16. @@ -48,6 +49,7 @@ plugins {
  17. allprojects {
  18. repositories {
  19. + mavenLocal()
  20. if (project.hasProperty("googleRepo")) {
  21. maven {
  22. name "Google"
  23. diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
  24. index 9f05b8434..f97029ccf 100644
  25. --- a/buildSrc/build.gradle
  26. +++ b/buildSrc/build.gradle
  27. @@ -7,6 +7,7 @@ plugins {
  28. }
  29. repositories {
  30. + mavenLocal()
  31. jcenter()
  32. }
  33. diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
  34. index c31ad3840..fb6526db3 100644
  35. --- a/buildSrc/settings.gradle
  36. +++ b/buildSrc/settings.gradle
  37. @@ -1,10 +1,15 @@
  38. /* This Source Code Form is subject to the terms of the Mozilla Public
  39. * License, v. 2.0. If a copy of the MPL was not distributed with this
  40. * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  41. +pluginManagement {
  42. + repositories {
  43. + mavenLocal()
  44. + }
  45. +}
  46. buildCache {
  47. local {
  48. directory = new File(rootDir, '../.build-cache')
  49. removeUnusedEntriesAfterDays = 30
  50. }
  51. -}
  52. \ No newline at end of file
  53. +}
  54. diff --git a/settings.gradle b/settings.gradle
  55. index a6e8dfa49..049fa29d6 100644
  56. --- a/settings.gradle
  57. +++ b/settings.gradle
  58. @@ -4,8 +4,15 @@
  59. import org.yaml.snakeyaml.Yaml
  60. +pluginManagement {
  61. + repositories {
  62. + mavenLocal()
  63. + }
  64. +}
  65. +
  66. buildscript {
  67. repositories {
  68. + mavenLocal()
  69. jcenter()
  70. }
  71. --
  72. 2.28.0