Skip to content

Commit 07de81d

Browse files
authored
refactor(android): reduce redundant apply(from:) calls (#2290)
1 parent c850d17 commit 07de81d

File tree

9 files changed

+31
-7
lines changed

9 files changed

+31
-7
lines changed

android/autolink.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import groovy.json.JsonSlurper
22

3+
ext.rnta_autolink_gradle = true
4+
35
ext.autolinkModules = { File projectRoot, File output, String testAppDir ->
46
String[] autolink = ["node", "${testAppDir}/android/autolink.mjs", projectRoot.toString(), output.toString()]
57
def stderr = new StringBuffer()

android/config-plugins.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
apply(from: "${buildscript.sourceFile.getParent()}/node.gradle")
1+
ext.rnta_config_plugins_gradle = true
2+
3+
if (!hasProperty("rnta_node_gradle")) {
4+
apply(from: "${buildscript.sourceFile.getParent()}/node.gradle")
5+
}
26

37
ext.applyConfigPlugins = { File rootDir, String testAppDir ->
48
if (!findNodeModulesPath("@expo/config-plugins", rootDir)) {

android/dependencies.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
apply(from: "${buildscript.sourceFile.getParent()}/node.gradle")
2-
apply(from: "${buildscript.sourceFile.getParent()}/react-native.gradle")
1+
if (!hasProperty("rnta_node_gradle")) {
2+
apply(from: "${buildscript.sourceFile.getParent()}/node.gradle")
3+
}
4+
if (!hasProperty("rnta_react_native_gradle")) {
5+
apply(from: "${buildscript.sourceFile.getParent()}/react-native.gradle")
6+
}
37

48
/**
59
* Returns the recommended Gradle plugin version for the specified React Native

android/manifest.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import java.nio.file.Paths
33

44
def _manifest = null
55

6+
ext.rnta_manifest_gradle = true
7+
68
ext.getAppName = {
79
def manifest = getManifest()
810
if (manifest != null) {

android/media-types.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
ext.rnta_media_types_gradle = true
2+
13
ext.isFontFile = { File file ->
24
// https://github.com/facebook/react-native/blob/3dfedbc1aec18a4255e126fde96d5dc7b1271ea7/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/assets/ReactFontManager.java#L28
35
return [".otf", ".ttf"].any { file.name.endsWith(it) }

android/node.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import groovy.json.JsonSlurper
22
import java.nio.file.Paths
33

4-
apply(from: "${buildscript.sourceFile.getParent()}/utils.gradle")
4+
ext.rnta_node_gradle = true
5+
6+
if (!hasProperty("rnta_utils_gradle")) {
7+
apply(from: "${buildscript.sourceFile.getParent()}/utils.gradle")
8+
}
59

610
def _dependencies = [:]
711

android/react-native.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
apply(from: "${buildscript.sourceFile.getParent()}/node.gradle")
1+
ext.rnta_react_native_gradle = true
2+
3+
if (!hasProperty("rnta_node_gradle")) {
4+
apply(from: "${buildscript.sourceFile.getParent()}/node.gradle")
5+
}
26

37
ext.isBridgelessEnabled = { Project project, boolean isNewArchEnabled ->
48
if (isNewArchEnabled) {

android/utils.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import groovy.json.JsonSlurper
22
import java.nio.file.Paths
33

4+
ext.rnta_utils_gradle = true
5+
46
ext.checkEnvironment = { rootDir, testAppDir ->
57
String[] args = ["node", "-p", "JSON.stringify(require('./android/gradle-wrapper.js').GRADLE_VERSIONS)"]
68
def stdout = new StringBuffer()

test-app.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import java.nio.file.Paths
33
import org.gradle.initialization.DefaultSettings
44

55
def testAppDir = buildscript.sourceFile.getParent()
6+
apply(from: "${testAppDir}/android/utils.gradle")
7+
apply(from: "${testAppDir}/android/node.gradle")
68
apply(from: "${testAppDir}/android/autolink.gradle")
79
apply(from: "${testAppDir}/android/config-plugins.gradle")
810
apply(from: "${testAppDir}/android/media-types.gradle")
9-
apply(from: "${testAppDir}/android/node.gradle")
10-
apply(from: "${testAppDir}/android/utils.gradle")
1111

1212
checkEnvironment(rootDir, testAppDir)
1313
applyConfigPlugins(rootDir, testAppDir)

0 commit comments

Comments
 (0)