a-s-localize_maven.patch raw
1 diff --git a/components/ads-client/android/build.gradle b/components/ads-client/android/build.gradle
2 index 52e4c5da3..7f8e87d9c 100644
3 --- a/components/ads-client/android/build.gradle
4 +++ b/components/ads-client/android/build.gradle
5 @@ -1,14 +1,7 @@
6 buildscript {
7 if (gradle.hasProperty("mozconfig")) {
8 repositories {
9 - gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
10 - maven {
11 - url = repository
12 - if (gradle.mozconfig.substs.ALLOW_INSECURE_GRADLE_REPOSITORIES) {
13 - allowInsecureProtocol = true
14 - }
15 - }
16 - }
17 + mavenLocal()
18 }
19
20 dependencies {
21 diff --git a/components/fxa-client/android/build.gradle b/components/fxa-client/android/build.gradle
22 index 88709f675..165ed22f2 100644
23 --- a/components/fxa-client/android/build.gradle
24 +++ b/components/fxa-client/android/build.gradle
25 @@ -2,14 +2,7 @@ buildscript {
26 // in mozilla-central there's no build.gradle suitable for the maven/glean config, so each component gets it.
27 if (gradle.hasProperty("mozconfig")) {
28 repositories {
29 - gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
30 - maven {
31 - url = repository
32 - if (gradle.mozconfig.substs.ALLOW_INSECURE_GRADLE_REPOSITORIES) {
33 - allowInsecureProtocol = true
34 - }
35 - }
36 - }
37 + mavenLocal()
38 }
39
40 dependencies {
41 diff --git a/components/logins/android/build.gradle b/components/logins/android/build.gradle
42 index 748c8fc02..aaa73f6e4 100644
43 --- a/components/logins/android/build.gradle
44 +++ b/components/logins/android/build.gradle
45 @@ -2,14 +2,7 @@ buildscript {
46 // in mozilla-central there's no build.gradle suitable for the maven/glean config, so each component gets it.
47 if (gradle.hasProperty("mozconfig")) {
48 repositories {
49 - gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
50 - maven {
51 - url = repository
52 - if (gradle.mozconfig.substs.ALLOW_INSECURE_GRADLE_REPOSITORIES) {
53 - allowInsecureProtocol = true
54 - }
55 - }
56 - }
57 + mavenLocal()
58 }
59
60 dependencies {
61 diff --git a/components/nimbus/android/build.gradle b/components/nimbus/android/build.gradle
62 index 915abb43f..f4aa47d21 100644
63 --- a/components/nimbus/android/build.gradle
64 +++ b/components/nimbus/android/build.gradle
65 @@ -2,14 +2,7 @@ buildscript {
66 // in mozilla-central there's no build.gradle suitable for the maven/glean config, so each component gets it.
67 if (gradle.hasProperty("mozconfig")) {
68 repositories {
69 - gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
70 - maven {
71 - url = repository
72 - if (gradle.mozconfig.substs.ALLOW_INSECURE_GRADLE_REPOSITORIES) {
73 - allowInsecureProtocol = true
74 - }
75 - }
76 - }
77 + mavenLocal()
78 }
79
80 dependencies {
81 diff --git a/components/places/android/build.gradle b/components/places/android/build.gradle
82 index be15dd740..47afad31d 100644
83 --- a/components/places/android/build.gradle
84 +++ b/components/places/android/build.gradle
85 @@ -2,14 +2,7 @@ buildscript {
86 // in mozilla-central there's no build.gradle suitable for the maven/glean config, so each component gets it.
87 if (gradle.hasProperty("mozconfig")) {
88 repositories {
89 - gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
90 - maven {
91 - url = repository
92 - if (gradle.mozconfig.substs.ALLOW_INSECURE_GRADLE_REPOSITORIES) {
93 - allowInsecureProtocol = true
94 - }
95 - }
96 - }
97 + mavenLocal()
98 }
99
100 dependencies {
101 diff --git a/components/support/error/android/build.gradle b/components/support/error/android/build.gradle
102 index 9d97dc2c2..ea10793d3 100644
103 --- a/components/support/error/android/build.gradle
104 +++ b/components/support/error/android/build.gradle
105 @@ -2,14 +2,7 @@ buildscript {
106 // in mozilla-central there's no build.gradle suitable for the maven/glean config, so each component gets it.
107 if (gradle.hasProperty("mozconfig")) {
108 repositories {
109 - gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
110 - maven {
111 - url = repository
112 - if (gradle.mozconfig.substs.ALLOW_INSECURE_GRADLE_REPOSITORIES) {
113 - allowInsecureProtocol = true
114 - }
115 - }
116 - }
117 + mavenLocal()
118 }
119
120 dependencies {
121 diff --git a/components/sync_manager/android/build.gradle b/components/sync_manager/android/build.gradle
122 index 48d962f38..6bff91c91 100644
123 --- a/components/sync_manager/android/build.gradle
124 +++ b/components/sync_manager/android/build.gradle
125 @@ -2,14 +2,7 @@ buildscript {
126 // in mozilla-central there's no build.gradle suitable for the maven/glean config, so each component gets it.
127 if (gradle.hasProperty("mozconfig")) {
128 repositories {
129 - gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
130 - maven {
131 - url = repository
132 - if (gradle.mozconfig.substs.ALLOW_INSECURE_GRADLE_REPOSITORIES) {
133 - allowInsecureProtocol = true
134 - }
135 - }
136 - }
137 + mavenLocal()
138 }
139
140 dependencies {
141 diff --git a/settings.gradle b/settings.gradle
142 index c891c8ac1..a7741776b 100644
143 --- a/settings.gradle
144 +++ b/settings.gradle
145 @@ -22,14 +22,7 @@ buildscript {
146 gradle.ext.mozconfig = gradle.root.mozconfig
147
148 repositories {
149 - gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
150 - maven {
151 - url = repository
152 - if (gradle.mozconfig.substs.ALLOW_INSECURE_GRADLE_REPOSITORIES) {
153 - allowInsecureProtocol = true
154 - }
155 - }
156 - }
157 + mavenLocal()
158 }
159 }
160 }
161