Skip to content

Commit 7678250

Browse files
Chris Brodyfriederbluemle
Chris Brody
and
friederbluemle
authored
cleanup generated android/build.gradle artifact (#138)
* cleanup generated android/build.gradle artifact * and update the react-native Gradle reference * with an additional comment * and a reference for the Gradle build hooks * with comment at beginning of android/build.gradle Co-authored-by: Frieder Bluemle <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
1 parent 22100b5 commit 7678250

File tree

24 files changed

+465
-369
lines changed

24 files changed

+465
-369
lines changed

‎templates/android.js

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module.exports = platform => [{
22
name: () => `${platform}/build.gradle`,
3-
content: ({ packageIdentifier }) => `buildscript {
3+
content: ({ packageIdentifier }) => `// ${platform}/build.gradle
4+
5+
buildscript {
46
ext.safeExtGet = {prop, fallback ->
57
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
68
}
@@ -28,18 +30,17 @@ def DEFAULT_MIN_SDK_VERSION = 16
2830
def DEFAULT_TARGET_SDK_VERSION = 28
2931
3032
android {
31-
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
32-
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
33-
34-
defaultConfig {
35-
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
36-
targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
37-
versionCode 1
38-
versionName "1.0"
39-
}
40-
lintOptions {
41-
abortOnError false
42-
}
33+
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
34+
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
35+
defaultConfig {
36+
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
37+
targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
38+
versionCode 1
39+
versionName "1.0"
40+
}
41+
lintOptions {
42+
abortOnError false
43+
}
4344
}
4445
4546
repositories {
@@ -54,7 +55,10 @@ repositories {
5455
}
5556
5657
dependencies {
57-
implementation "com.facebook.react:react-native:\${safeExtGet('reactnativeVersion', '+')}"
58+
// ref:
59+
// https://github.com/facebook/react-native/blob/0.61-stable/template/android/app/build.gradle#L192
60+
//noinspection GradleDynamicVersion
61+
implementation 'com.facebook.react:react-native:+' // From node_modules
5862
}
5963
6064
def configureReactNativePom(def pom) {
@@ -86,7 +90,8 @@ def configureReactNativePom(def pom) {
8690
}
8791
8892
afterEvaluate { project ->
89-
93+
// some Gradle build hooks ref:
94+
// https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
9095
task androidJavadoc(type: Javadoc) {
9196
source = android.sourceSets.main.java.srcDirs
9297
classpath += files(android.bootClasspath)
@@ -122,7 +127,6 @@ afterEvaluate { project ->
122127
repositories.mavenDeployer {
123128
// Deploy to react-native-event-bridge/maven, ready to publish to npm
124129
repository url: "file://\${projectDir}/../android/maven"
125-
126130
configureReactNativePom pom
127131
}
128132
}

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

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,9 @@ sdk.dir=/Users/{username}/Library/Android/sdk
124124
},
125125
Object {
126126
"name": "react-native-integration-view-test-package/android/build.gradle",
127-
"theContent": "buildscript {
127+
"theContent": "// android/build.gradle
128+
129+
buildscript {
128130
ext.safeExtGet = {prop, fallback ->
129131
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
130132
}
@@ -152,18 +154,17 @@ def DEFAULT_MIN_SDK_VERSION = 16
152154
def DEFAULT_TARGET_SDK_VERSION = 28
153155
154156
android {
155-
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
156-
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
157-
158-
defaultConfig {
159-
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
160-
targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
161-
versionCode 1
162-
versionName \\"1.0\\"
163-
}
164-
lintOptions {
165-
abortOnError false
166-
}
157+
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
158+
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
159+
defaultConfig {
160+
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
161+
targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
162+
versionCode 1
163+
versionName \\"1.0\\"
164+
}
165+
lintOptions {
166+
abortOnError false
167+
}
167168
}
168169
169170
repositories {
@@ -178,7 +179,10 @@ repositories {
178179
}
179180
180181
dependencies {
181-
implementation \\"com.facebook.react:react-native:\${safeExtGet('reactnativeVersion', '+')}\\"
182+
// ref:
183+
// https://github.com/facebook/react-native/blob/0.61-stable/template/android/app/build.gradle#L192
184+
//noinspection GradleDynamicVersion
185+
implementation 'com.facebook.react:react-native:+' // From node_modules
182186
}
183187
184188
def configureReactNativePom(def pom) {
@@ -210,7 +214,8 @@ def configureReactNativePom(def pom) {
210214
}
211215
212216
afterEvaluate { project ->
213-
217+
// some Gradle build hooks ref:
218+
// https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
214219
task androidJavadoc(type: Javadoc) {
215220
source = android.sourceSets.main.java.srcDirs
216221
classpath += files(android.bootClasspath)
@@ -246,7 +251,6 @@ afterEvaluate { project ->
246251
repositories.mavenDeployer {
247252
// Deploy to react-native-event-bridge/maven, ready to publish to npm
248253
repository url: \\"file://\${projectDir}/../android/maven\\"
249-
250254
configureReactNativePom pom
251255
}
252256
}

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

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,9 @@ sdk.dir=/Users/{username}/Library/Android/sdk
124124
},
125125
Object {
126126
"name": "react-native-integration-test-package/android/build.gradle",
127-
"theContent": "buildscript {
127+
"theContent": "// android/build.gradle
128+
129+
buildscript {
128130
ext.safeExtGet = {prop, fallback ->
129131
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
130132
}
@@ -152,18 +154,17 @@ def DEFAULT_MIN_SDK_VERSION = 16
152154
def DEFAULT_TARGET_SDK_VERSION = 28
153155
154156
android {
155-
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
156-
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
157-
158-
defaultConfig {
159-
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
160-
targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
161-
versionCode 1
162-
versionName \\"1.0\\"
163-
}
164-
lintOptions {
165-
abortOnError false
166-
}
157+
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
158+
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
159+
defaultConfig {
160+
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
161+
targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
162+
versionCode 1
163+
versionName \\"1.0\\"
164+
}
165+
lintOptions {
166+
abortOnError false
167+
}
167168
}
168169
169170
repositories {
@@ -178,7 +179,10 @@ repositories {
178179
}
179180
180181
dependencies {
181-
implementation \\"com.facebook.react:react-native:\${safeExtGet('reactnativeVersion', '+')}\\"
182+
// ref:
183+
// https://github.com/facebook/react-native/blob/0.61-stable/template/android/app/build.gradle#L192
184+
//noinspection GradleDynamicVersion
185+
implementation 'com.facebook.react:react-native:+' // From node_modules
182186
}
183187
184188
def configureReactNativePom(def pom) {
@@ -210,7 +214,8 @@ def configureReactNativePom(def pom) {
210214
}
211215
212216
afterEvaluate { project ->
213-
217+
// some Gradle build hooks ref:
218+
// https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
214219
task androidJavadoc(type: Javadoc) {
215220
source = android.sourceSets.main.java.srcDirs
216221
classpath += files(android.bootClasspath)
@@ -246,7 +251,6 @@ afterEvaluate { project ->
246251
repositories.mavenDeployer {
247252
// Deploy to react-native-event-bridge/maven, ready to publish to npm
248253
repository url: \\"file://\${projectDir}/../android/maven\\"
249-
250254
configureReactNativePom pom
251255
}
252256
}

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ content:
199199
"* outputFile name: react-native-alice-bobbi/android/build.gradle
200200
content:
201201
--------
202+
// android/build.gradle
203+
202204
buildscript {
203205
ext.safeExtGet = {prop, fallback ->
204206
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -227,18 +229,17 @@ def DEFAULT_MIN_SDK_VERSION = 16
227229
def DEFAULT_TARGET_SDK_VERSION = 28
228230
229231
android {
230-
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
231-
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
232-
233-
defaultConfig {
234-
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
235-
targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
236-
versionCode 1
237-
versionName \\"1.0\\"
238-
}
239-
lintOptions {
240-
abortOnError false
241-
}
232+
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
233+
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
234+
defaultConfig {
235+
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
236+
targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
237+
versionCode 1
238+
versionName \\"1.0\\"
239+
}
240+
lintOptions {
241+
abortOnError false
242+
}
242243
}
243244
244245
repositories {
@@ -253,7 +254,10 @@ repositories {
253254
}
254255
255256
dependencies {
256-
implementation \\"com.facebook.react:react-native:\${safeExtGet('reactnativeVersion', '+')}\\"
257+
// ref:
258+
// https://github.com/facebook/react-native/blob/0.61-stable/template/android/app/build.gradle#L192
259+
//noinspection GradleDynamicVersion
260+
implementation 'com.facebook.react:react-native:+' // From node_modules
257261
}
258262
259263
def configureReactNativePom(def pom) {
@@ -285,7 +289,8 @@ def configureReactNativePom(def pom) {
285289
}
286290
287291
afterEvaluate { project ->
288-
292+
// some Gradle build hooks ref:
293+
// https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
289294
task androidJavadoc(type: Javadoc) {
290295
source = android.sourceSets.main.java.srcDirs
291296
classpath += files(android.bootClasspath)
@@ -321,7 +326,6 @@ afterEvaluate { project ->
321326
repositories.mavenDeployer {
322327
// Deploy to react-native-event-bridge/maven, ready to publish to npm
323328
repository url: \\"file://\${projectDir}/../android/maven\\"
324-
325329
configureReactNativePom pom
326330
}
327331
}

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@ example
204204
"* outputFile name: react-native-alice-bobbi/android/build.gradle
205205
content:
206206
--------
207+
// android/build.gradle
208+
207209
buildscript {
208210
ext.safeExtGet = {prop, fallback ->
209211
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -232,18 +234,17 @@ def DEFAULT_MIN_SDK_VERSION = 16
232234
def DEFAULT_TARGET_SDK_VERSION = 28
233235
234236
android {
235-
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
236-
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
237-
238-
defaultConfig {
239-
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
240-
targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
241-
versionCode 1
242-
versionName \\"1.0\\"
243-
}
244-
lintOptions {
245-
abortOnError false
246-
}
237+
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
238+
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
239+
defaultConfig {
240+
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
241+
targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
242+
versionCode 1
243+
versionName \\"1.0\\"
244+
}
245+
lintOptions {
246+
abortOnError false
247+
}
247248
}
248249
249250
repositories {
@@ -258,7 +259,10 @@ repositories {
258259
}
259260
260261
dependencies {
261-
implementation \\"com.facebook.react:react-native:\${safeExtGet('reactnativeVersion', '+')}\\"
262+
// ref:
263+
// https://github.com/facebook/react-native/blob/0.61-stable/template/android/app/build.gradle#L192
264+
//noinspection GradleDynamicVersion
265+
implementation 'com.facebook.react:react-native:+' // From node_modules
262266
}
263267
264268
def configureReactNativePom(def pom) {
@@ -290,7 +294,8 @@ def configureReactNativePom(def pom) {
290294
}
291295
292296
afterEvaluate { project ->
293-
297+
// some Gradle build hooks ref:
298+
// https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
294299
task androidJavadoc(type: Javadoc) {
295300
source = android.sourceSets.main.java.srcDirs
296301
classpath += files(android.bootClasspath)
@@ -326,7 +331,6 @@ afterEvaluate { project ->
326331
repositories.mavenDeployer {
327332
// Deploy to react-native-event-bridge/maven, ready to publish to npm
328333
repository url: \\"file://\${projectDir}/../android/maven\\"
329-
330334
configureReactNativePom pom
331335
}
332336
}

0 commit comments

Comments
 (0)