Skip to content

Commit c8959f5

Browse files
Christopher J. Brodyfriederbluemle
Christopher J. Brody
and
friederbluemle
committed
update Android build tools Gradle classpath
* update to `com.android.tools.build:gradle:3.5.0` * update comments * remove the useless `safeExtGet` call Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Frieder Bluemle <[email protected]>
1 parent 22100b5 commit c8959f5

File tree

24 files changed

+96
-72
lines changed

24 files changed

+96
-72
lines changed

‎templates/android.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ module.exports = platform => [{
1010
}
1111
1212
dependencies {
13-
// Matches recent template from React Native (0.60)
14-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
15-
classpath("com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}")
13+
// ref:
14+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
15+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
16+
classpath 'com.android.tools.build:gradle:3.5.0'
1617
}
1718
}
1819

‎tests/integration/cli/create/view/__snapshots__/cli-create-with-view.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,10 @@ sdk.dir=/Users/{username}/Library/Android/sdk
134134
}
135135
136136
dependencies {
137-
// Matches recent template from React Native (0.60)
138-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
139-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
137+
// ref:
138+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
139+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
140+
classpath 'com.android.tools.build:gradle:3.5.0'
140141
}
141142
}
142143

‎tests/integration/cli/create/with-defaults/__snapshots__/cli-create-with-defaults.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,10 @@ sdk.dir=/Users/{username}/Library/Android/sdk
134134
}
135135
136136
dependencies {
137-
// Matches recent template from React Native (0.60)
138-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
139-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
137+
// ref:
138+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
139+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
140+
classpath 'com.android.tools.build:gradle:3.5.0'
140141
}
141142
}
142143

‎tests/with-injection/create/view/with-defaults/__snapshots__/create-view-with-defaults.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,10 @@ buildscript {
209209
}
210210
211211
dependencies {
212-
// Matches recent template from React Native (0.60)
213-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
214-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
212+
// ref:
213+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
214+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
215+
classpath 'com.android.tools.build:gradle:3.5.0'
215216
}
216217
}
217218

‎tests/with-injection/create/view/with-example/with-defaults/__snapshots__/create-view-with-example-with-defaults.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,10 @@ buildscript {
214214
}
215215
216216
dependencies {
217-
// Matches recent template from React Native (0.60)
218-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
219-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
217+
// ref:
218+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
219+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
220+
classpath 'com.android.tools.build:gradle:3.5.0'
220221
}
221222
}
222223

‎tests/with-injection/create/view/with-example/with-options/__snapshots__/create-view-with-example-with-options.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,10 @@ buildscript {
214214
}
215215
216216
dependencies {
217-
// Matches recent template from React Native (0.60)
218-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
219-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
217+
// ref:
218+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
219+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
220+
classpath 'com.android.tools.build:gradle:3.5.0'
220221
}
221222
}
222223

‎tests/with-injection/create/view/with-options/for-android/__snapshots__/lib-view-android-config-options.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,10 @@ buildscript {
171171
}
172172
173173
dependencies {
174-
// Matches recent template from React Native (0.60)
175-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
176-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
174+
// ref:
175+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
176+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
177+
classpath 'com.android.tools.build:gradle:3.5.0'
177178
}
178179
}
179180

‎tests/with-injection/create/with-defaults/__snapshots__/create-with-defaults.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,10 @@ buildscript {
209209
}
210210
211211
dependencies {
212-
// Matches recent template from React Native (0.60)
213-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
214-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
212+
// ref:
213+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
214+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
215+
classpath 'com.android.tools.build:gradle:3.5.0'
215216
}
216217
}
217218

‎tests/with-injection/create/with-example/with-defaults/__snapshots__/create-with-example-with-defaults.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,10 @@ buildscript {
214214
}
215215
216216
dependencies {
217-
// Matches recent template from React Native (0.60)
218-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
219-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
217+
// ref:
218+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
219+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
220+
classpath 'com.android.tools.build:gradle:3.5.0'
220221
}
221222
}
222223

‎tests/with-injection/create/with-example/with-missing-package-scripts/__snapshots__/recover-from-missing-package-scripts.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,10 @@ buildscript {
214214
}
215215
216216
dependencies {
217-
// Matches recent template from React Native (0.60)
218-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
219-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
217+
// ref:
218+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
219+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
220+
classpath 'com.android.tools.build:gradle:3.5.0'
220221
}
221222
}
222223

‎tests/with-injection/create/with-example/with-null-options/with-null-prefix/__snapshots__/create-with-example-with-null-prefix.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,10 @@ buildscript {
214214
}
215215
216216
dependencies {
217-
// Matches recent template from React Native (0.60)
218-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
219-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
217+
// ref:
218+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
219+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
220+
classpath 'com.android.tools.build:gradle:3.5.0'
220221
}
221222
}
222223

‎tests/with-injection/create/with-example/with-options/__snapshots__/create-with-example-with-options.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,10 @@ buildscript {
214214
}
215215
216216
dependencies {
217-
// Matches recent template from React Native (0.60)
218-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
219-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
217+
// ref:
218+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
219+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
220+
classpath 'com.android.tools.build:gradle:3.5.0'
220221
}
221222
}
222223

‎tests/with-injection/create/with-name-in-camel-case/__snapshots__/create-with-name-in-camel-case.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,10 @@ buildscript {
209209
}
210210
211211
dependencies {
212-
// Matches recent template from React Native (0.60)
213-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
214-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
212+
// ref:
213+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
214+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
215+
classpath 'com.android.tools.build:gradle:3.5.0'
215216
}
216217
}
217218

‎tests/with-injection/create/with-options/for-android/__snapshots__/create-with-options-for-android.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,10 @@ buildscript {
171171
}
172172
173173
dependencies {
174-
// Matches recent template from React Native (0.60)
175-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
176-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
174+
// ref:
175+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
176+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
177+
classpath 'com.android.tools.build:gradle:3.5.0'
177178
}
178179
}
179180

‎tests/with-injection/create/with-options/platforms-array/__snapshots__/platforms-array.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,10 @@ buildscript {
209209
}
210210
211211
dependencies {
212-
// Matches recent template from React Native (0.60)
213-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
214-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
212+
// ref:
213+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
214+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
215+
classpath 'com.android.tools.build:gradle:3.5.0'
215216
}
216217
}
217218

‎tests/with-injection/create/with-options/platforms-comma-separated/__snapshots__/platforms-comma-separated.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,10 @@ buildscript {
209209
}
210210
211211
dependencies {
212-
// Matches recent template from React Native (0.60)
213-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
214-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
212+
// ref:
213+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
214+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
215+
classpath 'com.android.tools.build:gradle:3.5.0'
215216
}
216217
}
217218

‎tests/with-injection/create/with-options/with-custom-module-prefix/__snapshots__/create-with-custom-module-prefix.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,10 @@ buildscript {
209209
}
210210
211211
dependencies {
212-
// Matches recent template from React Native (0.60)
213-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
214-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
212+
// ref:
213+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
214+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
215+
classpath 'com.android.tools.build:gradle:3.5.0'
215216
}
216217
}
217218

‎tests/with-injection/create/with-options/with-module-name/__snapshots__/create-with-module-name.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,10 @@ buildscript {
209209
}
210210
211211
dependencies {
212-
// Matches recent template from React Native (0.60)
213-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
214-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
212+
// ref:
213+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
214+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
215+
classpath 'com.android.tools.build:gradle:3.5.0'
215216
}
216217
}
217218

‎tests/with-mocks/cli/command/func/with-options/__snapshots__/cli-command-func-with-options.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,10 @@ buck-out/
213213
}
214214
215215
dependencies {
216-
// Matches recent template from React Native (0.60)
217-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
218-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
216+
// ref:
217+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
218+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
219+
classpath 'com.android.tools.build:gradle:3.5.0'
219220
}
220221
}
221222

‎tests/with-mocks/cli/program/with-defaults/for-android/__snapshots__/cli-program-with-defaults-for-android.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,9 +336,10 @@ buck-out/
336336
}
337337
338338
dependencies {
339-
// Matches recent template from React Native (0.60)
340-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
341-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
339+
// ref:
340+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
341+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
342+
classpath 'com.android.tools.build:gradle:3.5.0'
342343
}
343344
}
344345

‎tests/with-mocks/lib/create/with-example/with-logging/with-defaults/__snapshots__/create-with-example-with-defaults.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,10 @@ buck-out/
278278
}
279279
280280
dependencies {
281-
// Matches recent template from React Native (0.60)
282-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
283-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
281+
// ref:
282+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
283+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
284+
classpath 'com.android.tools.build:gradle:3.5.0'
284285
}
285286
}
286287

‎tests/with-mocks/lib/create/with-example/with-logging/with-error/__snapshots__/with-yarn-error-logging.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,10 @@ buck-out/
278278
}
279279
280280
dependencies {
281-
// Matches recent template from React Native (0.60)
282-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
283-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
281+
// ref:
282+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
283+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
284+
classpath 'com.android.tools.build:gradle:3.5.0'
284285
}
285286
}
286287

‎tests/with-mocks/lib/create/with-example/with-logging/with-null-options/with-null-prefix/__snapshots__/create-with-example-with-options.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,10 @@ buck-out/
278278
}
279279
280280
dependencies {
281-
// Matches recent template from React Native (0.60)
282-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
283-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
281+
// ref:
282+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
283+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
284+
classpath 'com.android.tools.build:gradle:3.5.0'
284285
}
285286
}
286287

‎tests/with-mocks/lib/create/with-example/with-logging/with-options/__snapshots__/create-with-example-with-options.test.js.snap

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,10 @@ buck-out/
272272
}
273273
274274
dependencies {
275-
// Matches recent template from React Native (0.60)
276-
// https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
277-
classpath(\\"com.android.tools.build:gradle:\${safeExtGet('gradlePluginVersion', '3.4.1')}\\")
275+
// ref:
276+
// * https://github.com/facebook/react-native/blob/0.61-stable/template/android/build.gradle#L15
277+
// * https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
278+
classpath 'com.android.tools.build:gradle:3.5.0'
278279
}
279280
}
280281

0 commit comments

Comments
 (0)