Use react.gradle from repo root instead of copy in RNTester
Summary:
RNTester used a copy of the main react.gradle file instead of the real one. Recent changes to the real file caused builds to fail with older gradle versions but was not caught by CI because it wasn't using that file for RNTester. That copy of react.gradle is just a leftover from when projects included a copy instead of importing the one in RN directly.
Note: CI WILL fail with this PR, if we have trouble landing this I can add the revert in this commit too but wanted to keep it as 2 separate commits.
Tested that building RNTester actually fails now that it uses react.gradle with recent changes, then tested that is builds properly when reverting d16ff3bd8b.
[INTERNAL] [MINOR] [RNTester] - Use react.gradle from repo root instead of copy in RNTester
Closes https://github.com/facebook/react-native/pull/18188
Differential Revision: D7155179
Pulled By: hramos
fbshipit-source-id: 15b461a63b841bf807e7d11ba3ead005ca5e33b0
This commit is contained in:
Janic Duplessis
Facebook Github Bot
parent
3f8a04ba62
commit
9f239d7914
|
|
@ -64,7 +64,7 @@ project.ext.react = [
|
||||||
inputExcludes: ["android/**", "./**"]
|
inputExcludes: ["android/**", "./**"]
|
||||||
]
|
]
|
||||||
|
|
||||||
apply from: "react.gradle"
|
apply from: "../../../react.gradle"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set this to true to create three separate APKs instead of one:
|
* Set this to true to create three separate APKs instead of one:
|
||||||
|
|
|
||||||
|
|
@ -1,96 +0,0 @@
|
||||||
import org.apache.tools.ant.taskdefs.condition.Os
|
|
||||||
|
|
||||||
def config = project.hasProperty("react") ? project.react : [];
|
|
||||||
|
|
||||||
def bundleAssetName = config.bundleAssetName ?: "index.android.bundle"
|
|
||||||
def entryFile = config.entryFile ?: "index.android.js"
|
|
||||||
|
|
||||||
// because elvis operator
|
|
||||||
def elvisFile(thing) {
|
|
||||||
return thing ? file(thing) : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
def reactRoot = elvisFile(config.root) ?: file("../../")
|
|
||||||
def inputExcludes = config.inputExcludes ?: ["android/**", "ios/**"]
|
|
||||||
|
|
||||||
void runBefore(String dependentTaskName, Task task) {
|
|
||||||
Task dependentTask = tasks.findByPath(dependentTaskName);
|
|
||||||
if (dependentTask != null) {
|
|
||||||
dependentTask.dependsOn task
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
gradle.projectsEvaluated {
|
|
||||||
// Grab all build types and product flavors
|
|
||||||
def buildTypes = android.buildTypes.collect { type -> type.name }
|
|
||||||
def productFlavors = android.productFlavors.collect { flavor -> flavor.name }
|
|
||||||
|
|
||||||
// When no product flavors defined, use empty
|
|
||||||
if (!productFlavors) productFlavors.add('')
|
|
||||||
|
|
||||||
productFlavors.each { productFlavorName ->
|
|
||||||
buildTypes.each { buildTypeName ->
|
|
||||||
// Create variant and source names
|
|
||||||
def sourceName = "${buildTypeName}"
|
|
||||||
def targetName = "${sourceName.capitalize()}"
|
|
||||||
if (productFlavorName) {
|
|
||||||
sourceName = "${productFlavorName}${targetName}"
|
|
||||||
}
|
|
||||||
|
|
||||||
// React js bundle directories
|
|
||||||
def jsBundleDirConfigName = "jsBundleDir${targetName}"
|
|
||||||
def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?:
|
|
||||||
file("$buildDir/intermediates/assets/${sourceName}")
|
|
||||||
|
|
||||||
def resourcesDirConfigName = "jsBundleDir${targetName}"
|
|
||||||
def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?:
|
|
||||||
file("$buildDir/intermediates/res/merged/${sourceName}")
|
|
||||||
def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
|
|
||||||
|
|
||||||
// Bundle task name for variant
|
|
||||||
def bundleJsAndAssetsTaskName = "bundle${targetName}JsAndAssets"
|
|
||||||
|
|
||||||
def currentBundleTask = tasks.create(
|
|
||||||
name: bundleJsAndAssetsTaskName,
|
|
||||||
type: Exec) {
|
|
||||||
group = "react"
|
|
||||||
description = "bundle JS and assets for ${targetName}."
|
|
||||||
|
|
||||||
// Create dirs if they are not there (e.g. the "clean" task just ran)
|
|
||||||
doFirst {
|
|
||||||
jsBundleDir.mkdirs()
|
|
||||||
resourcesDir.mkdirs()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set up inputs and outputs so gradle can cache the result
|
|
||||||
inputs.files fileTree(dir: reactRoot, excludes: inputExcludes)
|
|
||||||
outputs.dir jsBundleDir
|
|
||||||
outputs.dir resourcesDir
|
|
||||||
|
|
||||||
// Set up the call to the react-native cli
|
|
||||||
workingDir reactRoot
|
|
||||||
|
|
||||||
// Set up dev mode
|
|
||||||
def devEnabled = !targetName.toLowerCase().contains("release")
|
|
||||||
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
|
||||||
commandLine "cmd", "/c", "node", "./local-cli/cli.js", "bundle", "--platform", "android", "--dev", "${devEnabled}",
|
|
||||||
"--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir
|
|
||||||
} else {
|
|
||||||
commandLine "node", "./local-cli/cli.js", "bundle", "--platform", "android", "--dev", "${devEnabled}",
|
|
||||||
"--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir
|
|
||||||
}
|
|
||||||
|
|
||||||
enabled config."bundleIn${targetName}" ?: targetName.toLowerCase().contains("release")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hook bundle${productFlavor}${buildType}JsAndAssets into the android build process
|
|
||||||
currentBundleTask.dependsOn("merge${targetName}Resources")
|
|
||||||
currentBundleTask.dependsOn("merge${targetName}Assets")
|
|
||||||
|
|
||||||
runBefore("processArmeabi-v7a${targetName}Resources", currentBundleTask)
|
|
||||||
runBefore("processX86${targetName}Resources", currentBundleTask)
|
|
||||||
runBefore("processUniversal${targetName}Resources", currentBundleTask)
|
|
||||||
runBefore("process${targetName}Resources", currentBundleTask)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue