2015-11-18 20:17:39 +00:00
|
|
|
import org.apache.tools.ant.taskdefs.condition.Os
|
|
|
|
|
2015-10-19 13:32:02 +00:00
|
|
|
def config = project.hasProperty("react") ? project.react : [];
|
|
|
|
|
2017-04-10 19:08:07 +00:00
|
|
|
def cliPath = config.cliPath ?: "node_modules/react-native/local-cli/cli.js"
|
2015-10-19 13:32:02 +00:00
|
|
|
def bundleAssetName = config.bundleAssetName ?: "index.android.bundle"
|
|
|
|
def entryFile = config.entryFile ?: "index.android.js"
|
2017-10-14 00:22:00 +00:00
|
|
|
def bundleCommand = config.bundleCommand ?: "bundle"
|
2018-03-05 18:53:00 +00:00
|
|
|
|
|
|
|
// because elvis operator
|
|
|
|
def elvisFile(thing) {
|
|
|
|
return thing ? file(thing) : null;
|
|
|
|
}
|
|
|
|
|
|
|
|
def reactRoot = elvisFile(config.root) ?: file("../../")
|
2015-10-19 13:32:02 +00:00
|
|
|
def inputExcludes = config.inputExcludes ?: ["android/**", "ios/**"]
|
2017-10-14 00:22:00 +00:00
|
|
|
def bundleConfig = config.bundleConfig ? "${reactRoot}/${config.bundleConfig}" : null ;
|
2015-10-19 13:32:02 +00:00
|
|
|
|
2018-03-05 18:53:00 +00:00
|
|
|
void runBefore(String dependentTaskName, Task task) {
|
|
|
|
Task dependentTask = tasks.findByPath(dependentTaskName);
|
|
|
|
if (dependentTask != null) {
|
|
|
|
dependentTask.dependsOn task
|
|
|
|
}
|
|
|
|
}
|
2016-01-07 17:32:46 +00:00
|
|
|
|
2018-03-26 05:00:11 +00:00
|
|
|
afterEvaluate {
|
Android - Fix Drawable v4 paths in Android Artifact Resources (Libraries)
Summary:
_Quick apologies for the lengthiness of this description. Want to make sure I'm clear and it is understood what is being altered._
Thanks for submitting a PR! Please read these instructions carefully:
- [x] Explain the **motivation** for making this change.
- [x] Provide a **test plan** demonstrating that the code is solid.
- [x] Match the **code formatting** of the rest of the codebase.
- [x] Target the `master` branch, NOT a "stable" branch.
https://github.com/facebook/react-native/issues/5787
```
Unknown source file : /home/tom/projects/blueprint-native/android/app/build/intermediates/res/merged/release/drawable-mdpi-v4/images_google.png: error: Duplicate file.
Unknown source file : /home/tom/projects/blueprint-native/android/app/build/intermediates/res/merged/release/drawable-mdpi/images_google.png: Original is here. The version qualifier may be implied.
```
At Hudl, we've been attempting to package our React Native code into Library Dependencies _(Cocoapods / Android Artifact Resource (aar))_. Recently in React Native 0.42.0, there was an upgrade to the Android Project's gradle plugin from 1.3.1 to 2.2.3. This update drastically effected the outcome of drawable resources in Android without anyone noticing.
**There are 4 outcomes to consider with this change:**
1. You are developing in an Android Application using Gradle 1.3.1 or lower
2. You are developing in an Android Application using Gradle 2.2.3 or higher
3. You are developing in an Android Library Module using Gradle 1.3.1 or lower
4. You are developing in an Android Library Module using Gradle 2.2.3 or higher
With the upgrade to 2.2.3, Android changed the way aapt builds its resources. Any Library created with 2.2.3, has its resources ending with a `v4` suffix. The reasoning behind this I'm not sure of but assume it deals with Vector support that was added around that time.
The change I've added checks if React Native is being ran in an Android Library vs an Application, and appends the v4 suffix to the merged asset folders.
Multiple test were performed.
1. I first started out validating my assumption about the asset merger by creating a new Android Project to verify my assumptions above.
1. [Application + >= 2.2.3](https://github.com/jpshelley/TestAndroidLibraryDrawables/tree/master/app/build/intermediates/res/merged/debug) -- `hdpi` contains my drawable. `hdpi-v4` contains dependency's drawables.
2. [Application + <= 1.3.1](https://github.com/jpshelley/TestAndroidLibraryDrawables/tree/Android-LegacyVersion/app/build/intermediates/res/merged/debug) -- Same as above (I expect because deps are compiled against gradle 2.2.3+ themselves.
3. [Library + >= 2.2.3](https://github.com/jpshelley/TestAndroidLibraryDrawables/tree/Android-UsingAndroidLibrary/library/build/intermediates/res/merged/debug) -- Only `-v4` folders found! Resources from the library are packages in the app's build output in similar `-v4` folder too.
4. [Library + <= 1.3.1](https://github.com/jpshelley/TestAndroidLibraryDrawables/tree/Android-UsingAndroidLibraryLegacyVersion/library/build/intermediates/res/merged/debug) -- Same as ii. & iii. `-v4` contains other resources, but my resources are located in non -v4 folder.
2. I then wanted to validate against React Native itself. So I updated my react native code using this PR/Branch, and tested against my project locally. Unfortunately I cannot share that code as it is private, but before this change I was getting the same error as mentioned in #5787 and now my build runs as intended with the assets being placed where they should be.
Additional resources:
* https://github.com/facebook/react-native/issues/5787
* http://stackoverflow.com/questions/35700272/android-build-tool-adds-v4-qualifier-to-drawable-folders-by-default-in-generated
* https://github.com/facebook/react-native/issues/12710
Please let me know if more information is needed, further test plans, etc. With this change we should be able to upgrade to Gradle 2.3.0 as well to support the latest version of Android Studio.
Closes https://github.com/facebook/react-native/pull/13128
Differential Revision: D7828618
Pulled By: hramos
fbshipit-source-id: a7ad7b63b1b51cbfd2ea7656e4d77321306ce33a
2018-05-01 11:01:29 +00:00
|
|
|
def isAndroidLibrary = plugins.hasPlugin("com.android.library")
|
2018-03-05 18:53:00 +00:00
|
|
|
// 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 target names
|
|
|
|
def flavorNameCapitalized = "${productFlavorName.capitalize()}"
|
|
|
|
def buildNameCapitalized = "${buildTypeName.capitalize()}"
|
|
|
|
def targetName = "${flavorNameCapitalized}${buildNameCapitalized}"
|
|
|
|
def targetPath = productFlavorName ?
|
|
|
|
"${productFlavorName}/${buildTypeName}" :
|
|
|
|
"${buildTypeName}"
|
|
|
|
|
|
|
|
// React js bundle directories
|
|
|
|
def jsBundleDirConfigName = "jsBundleDir${targetName}"
|
|
|
|
def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?:
|
|
|
|
file("$buildDir/intermediates/assets/${targetPath}")
|
|
|
|
|
|
|
|
def resourcesDirConfigName = "resourcesDir${targetName}"
|
|
|
|
def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?:
|
|
|
|
file("$buildDir/intermediates/res/merged/${targetPath}")
|
|
|
|
def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
|
|
|
|
|
|
|
|
// Bundle task name for variant
|
|
|
|
def bundleJsAndAssetsTaskName = "bundle${targetName}JsAndAssets"
|
|
|
|
|
|
|
|
// Additional node and packager commandline arguments
|
|
|
|
def nodeExecutableAndArgs = config.nodeExecutableAndArgs ?: ["node"]
|
|
|
|
def extraPackagerArgs = config.extraPackagerArgs ?: []
|
|
|
|
|
|
|
|
def currentBundleTask = tasks.create(
|
|
|
|
name: bundleJsAndAssetsTaskName,
|
|
|
|
type: Exec) {
|
2016-01-08 20:11:34 +00:00
|
|
|
group = "react"
|
2018-03-05 18:53:00 +00:00
|
|
|
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 = !(config."devDisabledIn${targetName}"
|
|
|
|
|| targetName.toLowerCase().contains("release"))
|
|
|
|
|
|
|
|
def extraArgs = extraPackagerArgs;
|
|
|
|
|
|
|
|
if (bundleConfig) {
|
|
|
|
extraArgs = extraArgs.clone()
|
|
|
|
extraArgs.add("--config");
|
|
|
|
extraArgs.add(bundleConfig);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
|
|
|
commandLine("cmd", "/c", *nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
|
|
|
|
"--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
|
|
|
|
} else {
|
|
|
|
commandLine(*nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
|
|
|
|
"--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
|
|
|
|
}
|
|
|
|
|
|
|
|
enabled config."bundleIn${targetName}" ||
|
|
|
|
config."bundleIn${buildTypeName.capitalize()}" ?:
|
|
|
|
targetName.toLowerCase().contains("release")
|
Android - Fix Drawable v4 paths in Android Artifact Resources (Libraries)
Summary:
_Quick apologies for the lengthiness of this description. Want to make sure I'm clear and it is understood what is being altered._
Thanks for submitting a PR! Please read these instructions carefully:
- [x] Explain the **motivation** for making this change.
- [x] Provide a **test plan** demonstrating that the code is solid.
- [x] Match the **code formatting** of the rest of the codebase.
- [x] Target the `master` branch, NOT a "stable" branch.
https://github.com/facebook/react-native/issues/5787
```
Unknown source file : /home/tom/projects/blueprint-native/android/app/build/intermediates/res/merged/release/drawable-mdpi-v4/images_google.png: error: Duplicate file.
Unknown source file : /home/tom/projects/blueprint-native/android/app/build/intermediates/res/merged/release/drawable-mdpi/images_google.png: Original is here. The version qualifier may be implied.
```
At Hudl, we've been attempting to package our React Native code into Library Dependencies _(Cocoapods / Android Artifact Resource (aar))_. Recently in React Native 0.42.0, there was an upgrade to the Android Project's gradle plugin from 1.3.1 to 2.2.3. This update drastically effected the outcome of drawable resources in Android without anyone noticing.
**There are 4 outcomes to consider with this change:**
1. You are developing in an Android Application using Gradle 1.3.1 or lower
2. You are developing in an Android Application using Gradle 2.2.3 or higher
3. You are developing in an Android Library Module using Gradle 1.3.1 or lower
4. You are developing in an Android Library Module using Gradle 2.2.3 or higher
With the upgrade to 2.2.3, Android changed the way aapt builds its resources. Any Library created with 2.2.3, has its resources ending with a `v4` suffix. The reasoning behind this I'm not sure of but assume it deals with Vector support that was added around that time.
The change I've added checks if React Native is being ran in an Android Library vs an Application, and appends the v4 suffix to the merged asset folders.
Multiple test were performed.
1. I first started out validating my assumption about the asset merger by creating a new Android Project to verify my assumptions above.
1. [Application + >= 2.2.3](https://github.com/jpshelley/TestAndroidLibraryDrawables/tree/master/app/build/intermediates/res/merged/debug) -- `hdpi` contains my drawable. `hdpi-v4` contains dependency's drawables.
2. [Application + <= 1.3.1](https://github.com/jpshelley/TestAndroidLibraryDrawables/tree/Android-LegacyVersion/app/build/intermediates/res/merged/debug) -- Same as above (I expect because deps are compiled against gradle 2.2.3+ themselves.
3. [Library + >= 2.2.3](https://github.com/jpshelley/TestAndroidLibraryDrawables/tree/Android-UsingAndroidLibrary/library/build/intermediates/res/merged/debug) -- Only `-v4` folders found! Resources from the library are packages in the app's build output in similar `-v4` folder too.
4. [Library + <= 1.3.1](https://github.com/jpshelley/TestAndroidLibraryDrawables/tree/Android-UsingAndroidLibraryLegacyVersion/library/build/intermediates/res/merged/debug) -- Same as ii. & iii. `-v4` contains other resources, but my resources are located in non -v4 folder.
2. I then wanted to validate against React Native itself. So I updated my react native code using this PR/Branch, and tested against my project locally. Unfortunately I cannot share that code as it is private, but before this change I was getting the same error as mentioned in #5787 and now my build runs as intended with the assets being placed where they should be.
Additional resources:
* https://github.com/facebook/react-native/issues/5787
* http://stackoverflow.com/questions/35700272/android-build-tool-adds-v4-qualifier-to-drawable-folders-by-default-in-generated
* https://github.com/facebook/react-native/issues/12710
Please let me know if more information is needed, further test plans, etc. With this change we should be able to upgrade to Gradle 2.3.0 as well to support the latest version of Android Studio.
Closes https://github.com/facebook/react-native/pull/13128
Differential Revision: D7828618
Pulled By: hramos
fbshipit-source-id: a7ad7b63b1b51cbfd2ea7656e4d77321306ce33a
2018-05-01 11:01:29 +00:00
|
|
|
|
|
|
|
if (isAndroidLibrary) {
|
|
|
|
doLast {
|
|
|
|
def moveFunc = { resSuffix ->
|
|
|
|
File originalDir = file("${resourcesDir}/drawable-${resSuffix}")
|
|
|
|
if (originalDir.exists()) {
|
|
|
|
File destDir = file("${resourcesDir}/drawable-${resSuffix}-v4")
|
|
|
|
ant.move(file: originalDir, tofile: destDir)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
moveFunc.curry("ldpi").call()
|
|
|
|
moveFunc.curry("mdpi").call()
|
|
|
|
moveFunc.curry("hdpi").call()
|
|
|
|
moveFunc.curry("xhdpi").call()
|
|
|
|
moveFunc.curry("xxhdpi").call()
|
|
|
|
moveFunc.curry("xxxhdpi").call()
|
|
|
|
}
|
|
|
|
}
|
2016-01-08 20:11:34 +00:00
|
|
|
}
|
|
|
|
|
2018-03-05 18:53:00 +00:00
|
|
|
// Hook bundle${productFlavor}${buildType}JsAndAssets into the android build process
|
|
|
|
currentBundleTask.dependsOn("merge${targetName}Resources")
|
|
|
|
currentBundleTask.dependsOn("merge${targetName}Assets")
|
2016-01-08 20:11:34 +00:00
|
|
|
|
2018-03-05 18:53:00 +00:00
|
|
|
runBefore("process${flavorNameCapitalized}Armeabi-v7a${buildNameCapitalized}Resources", currentBundleTask)
|
|
|
|
runBefore("process${flavorNameCapitalized}X86${buildNameCapitalized}Resources", currentBundleTask)
|
|
|
|
runBefore("processUniversal${targetName}Resources", currentBundleTask)
|
|
|
|
runBefore("process${targetName}Resources", currentBundleTask)
|
|
|
|
runBefore("dataBindingProcessLayouts${targetName}", currentBundleTask)
|
2016-01-08 20:11:34 +00:00
|
|
|
}
|
|
|
|
}
|
2015-10-19 13:32:02 +00:00
|
|
|
}
|