2019-10-16 20:03:47 +03:00
|
|
|
/*
|
|
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
|
|
*
|
|
|
|
* This source code is licensed under the MIT license found in the
|
|
|
|
* LICENSE file in the root directory of this source tree.
|
|
|
|
*/
|
2018-09-07 23:08:05 +03:00
|
|
|
|
2015-11-18 23:17:39 +03:00
|
|
|
import org.apache.tools.ant.taskdefs.condition.Os
|
|
|
|
|
Fix error with bundling task eval. when no gradle config is provided (#27101)
Summary:
Fix `react.gradle`'s handling of the case where a configuration isn't explicitly specified by the parent project - e.g. before importing to `build.gradle` files:
```groovy
apply plugin: 'com.android.application'
// Nothing to define:
// project.ext.react = [
// ]
apply from: "../../node_modules/react-native/react.gradle"
```
This is a _ridiculously_ subtle change but it is nevertheless important, as, combined with other groovy quirks, it can result in an overall misbehaviour of the build script.
### Source of the bug
Currently, when a react build config _isn't_ specified by the user, RN's `react.gradle` falls back to `[]` (i.e. in [this line](https://github.com/facebook/react-native/blob/81a6b6ed3c54498f6f2148c106846352405949bf/react.gradle#L8)). In groovy, `[]` stands for an empty _array_ (actually, an empty `ArrayList` instance). The config, however, is expected to have the nature of a `Map`.
### Effects of the bug
As a bottom line, whenever a configuration isn't specified, the evaluation of [the condition](https://github.com/facebook/react-native/blob/81a6b6ed3c54498f6f2148c106846352405949bf/react.gradle#L184) as to whether the bundling task in question should be enabled, results in the following build-time exception:
```
FAILURE: Build failed with an exception.
* Where:
Script '/Users/...../node_modules/react-native/react.gradle' line: 179
* What went wrong:
A problem occurred configuring project ':app'.
> Could not create task ':app:bundleDebugJsAndAssets'.
> Could not find method enabled() for arguments [[]] on task ':app:bundleDebugJsAndAssets' of type org.gradle.api.tasks.Exec.
* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. Run with --scan to get full insights.
* Get more help at https://help.gradle.org
BUILD FAILED in 9s
```
I'm not much of a Groovy person, but while digging in, I've learned that it has the following odd attribute to it:
When accessing a non-existing property of an empty `ArrayList` in a bean-like fashion (i.e. as `array.property1` rather than `array.getProperty('property1')`), a new empty array is returned. This only holds true for _empty_ arrays, as illustrated by the following snippet:
```groovy
def emptyArr = []
def arr = [40, 2]
def result1 = (emptyArr.uninitializedProp == null)
println "$result1, ${emptyArr.uninitializedProp}" // ==> false, []"
def result2 = (arr.uninitializedProp == null) // ==> MissingPropertyException
println result2 // Never reached
```
While this whole scheme could be a bug, it's nonetheless effective in both the latest 2.x.x groovy version and in 2.1.0 (which is the oldest one that seems to be available for download nowadays). The point being is that its a behavior that's sticked.
Note that other evaluations of `config` properties (e.g. [lines 10-19](https://github.com/facebook/react-native/blob/81a6b6ed3c54498f6f2148c106846352405949bf/react.gradle#L10)) in the script are not effected by this as they are initially only examined in a boolean form, rather than using a null comparison; "Lucky" for us, empty arrays evaluate to `false`.
### Fix
Simply fallback to a groovy map rather than an array whenever `config` hasn't been specified. Namely, initialize it to `[:]`, which results in a new `HashMap` instance, rather than `[]`.
### Workaround
Until effectively fixed, can be worked-around by explicitly setting config to an empty map before the react gradle script is imported by the user:
```groovy
apply plugin: 'com.android.application'
project.ext.react = [:]
apply from: "../../node_modules/react-native/react.gradle"
```
## Changelog
[Android] [Fixed] - Fix 'Could not create task ':app:bundleDebugJsAndAssets'.' error in project with no react config
Pull Request resolved: https://github.com/facebook/react-native/pull/27101
Test Plan: Mostly regression is required here. I've myself ran this over a project with an empty config and the app has launched successfully in both `release` and `debug` flavors.
Differential Revision: D18298542
Pulled By: cpojer
fbshipit-source-id: 88b4715b75f190003c4813e5324a5094a7779f67
2019-11-04 19:13:32 +03:00
|
|
|
def config = project.hasProperty("react") ? project.react : [:];
|
2015-10-19 16:32:02 +03:00
|
|
|
|
2019-10-14 09:39:29 +03:00
|
|
|
def detectEntryFile(config) {
|
|
|
|
if (System.getenv('ENTRY_FILE')) {
|
|
|
|
return System.getenv('ENTRY_FILE')
|
|
|
|
} else if (config.entryFile) {
|
|
|
|
return config.entryFile
|
|
|
|
} else if ((new File("${projectDir}/../../index.android.js")).exists()) {
|
|
|
|
return "index.android.js"
|
|
|
|
}
|
|
|
|
|
|
|
|
return "index.js";
|
|
|
|
}
|
|
|
|
|
2020-04-15 21:16:12 +03:00
|
|
|
/**
|
|
|
|
* Detects CLI location in a similar fashion to the React Native CLI
|
|
|
|
*/
|
|
|
|
def detectCliPath(config) {
|
|
|
|
if (config.cliPath) {
|
|
|
|
return config.cliPath
|
|
|
|
}
|
|
|
|
|
2020-04-29 00:40:25 +03:00
|
|
|
def cliPath = ["node", "-e", "console.log(require('react-native/cli').bin);"].execute([], projectDir).text.trim()
|
2020-08-01 04:47:45 +03:00
|
|
|
|
2020-04-15 21:16:12 +03:00
|
|
|
if (cliPath) {
|
|
|
|
return cliPath
|
|
|
|
} else if (new File("${projectDir}/../../node_modules/react-native/cli.js").exists()) {
|
|
|
|
return "${projectDir}/../../node_modules/react-native/cli.js"
|
|
|
|
} else {
|
|
|
|
throw new Exception("Couldn't determine CLI location. " +
|
|
|
|
"Please set `project.ext.react.cliPath` to the path of the react-native cli.js");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-07-26 08:59:00 +03:00
|
|
|
def composeSourceMapsPath = config.composeSourceMapsPath ?: "node_modules/react-native/scripts/compose-source-maps.js"
|
2015-10-19 16:32:02 +03:00
|
|
|
def bundleAssetName = config.bundleAssetName ?: "index.android.bundle"
|
2019-10-14 09:39:29 +03:00
|
|
|
def entryFile = detectEntryFile(config)
|
2017-10-14 03:22:00 +03:00
|
|
|
def bundleCommand = config.bundleCommand ?: "bundle"
|
2018-08-04 02:55:37 +03:00
|
|
|
def reactRoot = file(config.root ?: "../../")
|
2015-10-19 16:32:02 +03:00
|
|
|
def inputExcludes = config.inputExcludes ?: ["android/**", "ios/**"]
|
2017-10-14 03:22:00 +03:00
|
|
|
def bundleConfig = config.bundleConfig ? "${reactRoot}/${config.bundleConfig}" : null ;
|
2019-07-26 08:59:00 +03:00
|
|
|
def enableVmCleanup = config.enableVmCleanup == null ? true : config.enableVmCleanup
|
2020-04-14 05:45:08 +03:00
|
|
|
def hermesCommand = config.hermesCommand ?: "../../node_modules/hermes-engine/%OS-BIN%/hermesc"
|
2015-10-19 16:32:02 +03:00
|
|
|
|
2019-06-05 16:09:09 +03:00
|
|
|
def reactNativeDevServerPort() {
|
|
|
|
def value = project.getProperties().get("reactNativeDevServerPort")
|
|
|
|
return value != null ? value : "8081"
|
|
|
|
}
|
|
|
|
|
|
|
|
def reactNativeInspectorProxyPort() {
|
|
|
|
def value = project.getProperties().get("reactNativeInspectorProxyPort")
|
|
|
|
return value != null ? value : reactNativeDevServerPort()
|
|
|
|
}
|
|
|
|
|
2019-07-26 08:59:00 +03:00
|
|
|
def getHermesOSBin() {
|
2019-08-12 12:42:00 +03:00
|
|
|
if (Os.isFamily(Os.FAMILY_WINDOWS)) return "win64-bin";
|
|
|
|
if (Os.isFamily(Os.FAMILY_MAC)) return "osx-bin";
|
|
|
|
if (Os.isOs(null, "linux", "amd64", null)) return "linux64-bin";
|
|
|
|
throw new Exception("OS not recognized. Please set project.ext.react.hermesCommand " +
|
|
|
|
"to the path of a working Hermes compiler.");
|
2019-07-26 08:59:00 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
// Make sure not to inspect the Hermes config unless we need it,
|
|
|
|
// to avoid breaking any JSC-only setups.
|
|
|
|
def getHermesCommand = {
|
2019-08-12 12:42:00 +03:00
|
|
|
// If the project specifies a Hermes command, don't second guess it.
|
|
|
|
if (!hermesCommand.contains("%OS-BIN%")) {
|
|
|
|
return hermesCommand
|
|
|
|
}
|
2019-07-26 08:59:00 +03:00
|
|
|
|
2019-08-12 12:42:00 +03:00
|
|
|
// Execution on Windows fails with / as separator
|
|
|
|
return hermesCommand
|
|
|
|
.replaceAll("%OS-BIN%", getHermesOSBin())
|
|
|
|
.replace('/' as char, File.separatorChar);
|
2019-07-26 08:59:00 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
// Set enableHermesForVariant to a function to configure per variant,
|
|
|
|
// or set `enableHermes` to True/False to set all of them
|
|
|
|
def enableHermesForVariant = config.enableHermesForVariant ?: {
|
2019-08-12 12:42:00 +03:00
|
|
|
def variant -> config.enableHermes ?: false
|
2019-07-26 08:59:00 +03:00
|
|
|
}
|
|
|
|
|
2019-06-05 16:09:09 +03:00
|
|
|
android {
|
|
|
|
buildTypes.all {
|
|
|
|
resValue "integer", "react_native_dev_server_port", reactNativeDevServerPort()
|
|
|
|
resValue "integer", "react_native_inspector_proxy_port", reactNativeInspectorProxyPort()
|
|
|
|
}
|
|
|
|
}
|
2016-01-07 20:32:46 +03:00
|
|
|
|
2018-03-26 08:00:11 +03:00
|
|
|
afterEvaluate {
|
2018-12-07 07:30:24 +03:00
|
|
|
def isAndroidLibrary = plugins.hasPlugin("com.android.library")
|
|
|
|
def variants = isAndroidLibrary ? android.libraryVariants : android.applicationVariants
|
|
|
|
variants.all { def variant ->
|
2018-08-04 02:55:37 +03:00
|
|
|
// Create variant and target names
|
|
|
|
def targetName = variant.name.capitalize()
|
|
|
|
def targetPath = variant.dirName
|
|
|
|
|
|
|
|
// React js bundle directories
|
|
|
|
def jsBundleDir = file("$buildDir/generated/assets/react/${targetPath}")
|
|
|
|
def resourcesDir = file("$buildDir/generated/res/react/${targetPath}")
|
|
|
|
|
|
|
|
def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
|
2019-07-26 08:59:00 +03:00
|
|
|
def jsSourceMapsDir = file("$buildDir/generated/sourcemaps/react/${targetPath}")
|
|
|
|
def jsIntermediateSourceMapsDir = file("$buildDir/intermediates/sourcemaps/react/${targetPath}")
|
|
|
|
def jsPackagerSourceMapFile = file("$jsIntermediateSourceMapsDir/${bundleAssetName}.packager.map")
|
|
|
|
def jsCompilerSourceMapFile = file("$jsIntermediateSourceMapsDir/${bundleAssetName}.compiler.map")
|
|
|
|
def jsOutputSourceMapFile = file("$jsSourceMapsDir/${bundleAssetName}.map")
|
2018-08-04 02:55:37 +03:00
|
|
|
|
|
|
|
// Additional node and packager commandline arguments
|
|
|
|
def nodeExecutableAndArgs = config.nodeExecutableAndArgs ?: ["node"]
|
2020-04-15 21:16:12 +03:00
|
|
|
def cliPath = detectCliPath(config)
|
2019-11-05 14:03:04 +03:00
|
|
|
|
|
|
|
def execCommand = []
|
|
|
|
|
2020-04-15 21:16:12 +03:00
|
|
|
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
|
|
|
execCommand.addAll(["cmd", "/c", *nodeExecutableAndArgs, cliPath])
|
2019-11-05 14:03:04 +03:00
|
|
|
} else {
|
2020-04-15 21:16:12 +03:00
|
|
|
execCommand.addAll([*nodeExecutableAndArgs, cliPath])
|
2019-11-05 14:03:04 +03:00
|
|
|
}
|
2020-08-01 04:47:45 +03:00
|
|
|
|
2019-07-26 08:59:00 +03:00
|
|
|
def enableHermes = enableHermesForVariant(variant)
|
|
|
|
|
2018-08-04 02:55:37 +03:00
|
|
|
def currentBundleTask = tasks.create(
|
|
|
|
name: "bundle${targetName}JsAndAssets",
|
|
|
|
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.deleteDir()
|
|
|
|
jsBundleDir.mkdirs()
|
|
|
|
resourcesDir.deleteDir()
|
|
|
|
resourcesDir.mkdirs()
|
2019-07-26 08:59:00 +03:00
|
|
|
jsIntermediateSourceMapsDir.deleteDir()
|
|
|
|
jsIntermediateSourceMapsDir.mkdirs()
|
|
|
|
jsSourceMapsDir.deleteDir()
|
|
|
|
jsSourceMapsDir.mkdirs()
|
2018-08-04 02:55:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
// Set up inputs and outputs so gradle can cache the result
|
|
|
|
inputs.files fileTree(dir: reactRoot, excludes: inputExcludes)
|
2019-02-09 21:14:55 +03:00
|
|
|
outputs.dir(jsBundleDir)
|
|
|
|
outputs.dir(resourcesDir)
|
2018-08-04 02:55:37 +03:00
|
|
|
|
|
|
|
// Set up the call to the react-native cli
|
2019-02-09 21:14:55 +03:00
|
|
|
workingDir(reactRoot)
|
2018-08-04 02:55:37 +03:00
|
|
|
|
|
|
|
// Set up dev mode
|
|
|
|
def devEnabled = !(config."devDisabledIn${targetName}"
|
|
|
|
|| targetName.toLowerCase().contains("release"))
|
|
|
|
|
2020-04-15 21:16:12 +03:00
|
|
|
def extraArgs = config.extraPackagerArgs ?: [];
|
2018-08-04 02:55:37 +03:00
|
|
|
|
|
|
|
if (bundleConfig) {
|
|
|
|
extraArgs = extraArgs.clone()
|
|
|
|
extraArgs.add("--config");
|
|
|
|
extraArgs.add(bundleConfig);
|
|
|
|
}
|
|
|
|
|
2019-11-05 14:03:04 +03:00
|
|
|
commandLine(*execCommand, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
|
|
|
|
"--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir,
|
|
|
|
"--sourcemap-output", enableHermes ? jsPackagerSourceMapFile : jsOutputSourceMapFile, *extraArgs)
|
|
|
|
|
2019-07-26 08:59:00 +03:00
|
|
|
|
|
|
|
if (enableHermes) {
|
|
|
|
doLast {
|
|
|
|
def hermesFlags;
|
|
|
|
def hbcTempFile = file("${jsBundleFile}.hbc")
|
|
|
|
exec {
|
|
|
|
if (targetName.toLowerCase().contains("release")) {
|
|
|
|
// Can't use ?: since that will also substitute valid empty lists
|
|
|
|
hermesFlags = config.hermesFlagsRelease
|
|
|
|
if (hermesFlags == null) hermesFlags = ["-O", "-output-source-map"]
|
|
|
|
} else {
|
|
|
|
hermesFlags = config.hermesFlagsDebug
|
|
|
|
if (hermesFlags == null) hermesFlags = []
|
|
|
|
}
|
2019-10-14 09:39:29 +03:00
|
|
|
|
2019-09-26 03:49:43 +03:00
|
|
|
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
|
|
|
commandLine("cmd", "/c", getHermesCommand(), "-emit-binary", "-out", hbcTempFile, jsBundleFile, *hermesFlags)
|
|
|
|
} else {
|
|
|
|
commandLine(getHermesCommand(), "-emit-binary", "-out", hbcTempFile, jsBundleFile, *hermesFlags)
|
|
|
|
}
|
2019-07-26 08:59:00 +03:00
|
|
|
}
|
|
|
|
ant.move(
|
|
|
|
file: hbcTempFile,
|
|
|
|
toFile: jsBundleFile
|
|
|
|
);
|
|
|
|
if (hermesFlags.contains("-output-source-map")) {
|
|
|
|
ant.move(
|
|
|
|
// Hermes will generate a source map with this exact name
|
|
|
|
file: "${jsBundleFile}.hbc.map",
|
|
|
|
tofile: jsCompilerSourceMapFile
|
|
|
|
);
|
|
|
|
exec {
|
|
|
|
// TODO: set task dependencies for caching
|
|
|
|
|
|
|
|
// Set up the call to the compose-source-maps script
|
|
|
|
workingDir(reactRoot)
|
|
|
|
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
|
|
|
commandLine("cmd", "/c", *nodeExecutableAndArgs, composeSourceMapsPath, jsPackagerSourceMapFile, jsCompilerSourceMapFile, "-o", jsOutputSourceMapFile)
|
|
|
|
} else {
|
|
|
|
commandLine(*nodeExecutableAndArgs, composeSourceMapsPath, jsPackagerSourceMapFile, jsCompilerSourceMapFile, "-o", jsOutputSourceMapFile)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-08-04 02:55:37 +03:00
|
|
|
}
|
|
|
|
|
2019-02-14 00:16:14 +03:00
|
|
|
enabled config."bundleIn${targetName}" != null
|
2019-08-12 12:42:00 +03:00
|
|
|
? config."bundleIn${targetName}"
|
|
|
|
: config."bundleIn${variant.buildType.name.capitalize()}" != null
|
|
|
|
? config."bundleIn${variant.buildType.name.capitalize()}"
|
|
|
|
: targetName.toLowerCase().contains("release")
|
2018-08-04 02:55:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
// Expose a minimal interface on the application variant and the task itself:
|
|
|
|
variant.ext.bundleJsAndAssets = currentBundleTask
|
|
|
|
currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask)
|
|
|
|
currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask)
|
|
|
|
|
|
|
|
// registerGeneratedResFolders for Android plugin 3.x
|
|
|
|
if (variant.respondsTo("registerGeneratedResFolders")) {
|
|
|
|
variant.registerGeneratedResFolders(currentBundleTask.generatedResFolders)
|
|
|
|
} else {
|
|
|
|
variant.registerResGeneratingTask(currentBundleTask)
|
|
|
|
}
|
- update to gradle 4.10.1 or high (#23103)
Summary:
Add suport to gradle 4.10.1 or high!
The new version of android studio 3.3 recommendete to update gradle project to 4.10.1
> To take advantage of the latest features, improvements, and security fixes, we strongly recommend that you update the Android Gradle plugin to version 3.3.0 and Gradle to version 4.10.1. [Release notes ](https://developer.android.com/studio/releases/gradle-plugin)
>Android plugin 3.2.0 and higher now support building the Android App Bundle—a new upload format that defers APK generation and signing to compatible app stores, such as Google Play. With app bundles, you no longer have to build, sign, and manage multiple APKs, and users get smaller, more optimized downloads. [Learn more](https://developer.android.com/guide/app-bundle/?utm_source=android-studio)
but if the upgrade to the new Android gradle many warnings come up, becouse meny things was obsoleted
> WARNING: API 'variant.getMergeResources()' is obsolete and has been replaced with 'variant.getMergeResourcesProvider()'.
> WARNING: API 'variant.getPackageApplication()' is obsolete and has been replaced with 'variant.getPackageApplicationProvider()'.
> WARNING: API 'variant.getMergeAssets()' is obsolete and has been replaced with 'variant.getMergeAssetsProvider()'.
> It will be removed at the end of 2019.
> For more information, [see ](https://d.android.com/r/tools/task-configuration-avoidance.)
> To determine what is calling variant.getMergeAssets(), use -Pandroid.debug.obsoleteApi=true on the command line to display a stack trace.
Changelog:
----------
[Android] [Deprecated] - fix warinings obsolete to update to gradle 4.10.1 or high
Pull Request resolved: https://github.com/facebook/react-native/pull/23103
Differential Revision: D13817123
Pulled By: cpojer
fbshipit-source-id: 9816e20145a5fded2702cf9317cfb6862f3ebd8b
2019-01-25 14:12:51 +03:00
|
|
|
variant.mergeResourcesProvider.get().dependsOn(currentBundleTask)
|
2018-08-04 02:55:37 +03:00
|
|
|
|
|
|
|
// packageApplication for Android plugin 3.x
|
|
|
|
def packageTask = variant.hasProperty("packageApplication")
|
- update to gradle 4.10.1 or high (#23103)
Summary:
Add suport to gradle 4.10.1 or high!
The new version of android studio 3.3 recommendete to update gradle project to 4.10.1
> To take advantage of the latest features, improvements, and security fixes, we strongly recommend that you update the Android Gradle plugin to version 3.3.0 and Gradle to version 4.10.1. [Release notes ](https://developer.android.com/studio/releases/gradle-plugin)
>Android plugin 3.2.0 and higher now support building the Android App Bundle—a new upload format that defers APK generation and signing to compatible app stores, such as Google Play. With app bundles, you no longer have to build, sign, and manage multiple APKs, and users get smaller, more optimized downloads. [Learn more](https://developer.android.com/guide/app-bundle/?utm_source=android-studio)
but if the upgrade to the new Android gradle many warnings come up, becouse meny things was obsoleted
> WARNING: API 'variant.getMergeResources()' is obsolete and has been replaced with 'variant.getMergeResourcesProvider()'.
> WARNING: API 'variant.getPackageApplication()' is obsolete and has been replaced with 'variant.getPackageApplicationProvider()'.
> WARNING: API 'variant.getMergeAssets()' is obsolete and has been replaced with 'variant.getMergeAssetsProvider()'.
> It will be removed at the end of 2019.
> For more information, [see ](https://d.android.com/r/tools/task-configuration-avoidance.)
> To determine what is calling variant.getMergeAssets(), use -Pandroid.debug.obsoleteApi=true on the command line to display a stack trace.
Changelog:
----------
[Android] [Deprecated] - fix warinings obsolete to update to gradle 4.10.1 or high
Pull Request resolved: https://github.com/facebook/react-native/pull/23103
Differential Revision: D13817123
Pulled By: cpojer
fbshipit-source-id: 9816e20145a5fded2702cf9317cfb6862f3ebd8b
2019-01-25 14:12:51 +03:00
|
|
|
? variant.packageApplicationProvider.get()
|
2018-08-04 02:55:37 +03:00
|
|
|
: tasks.findByName("package${targetName}")
|
2018-12-07 07:30:24 +03:00
|
|
|
if (variant.hasProperty("packageLibrary")) {
|
|
|
|
packageTask = variant.packageLibrary
|
|
|
|
}
|
2018-08-04 02:55:37 +03:00
|
|
|
|
2019-01-15 13:11:11 +03:00
|
|
|
// pre bundle build task for Android plugin 3.2+
|
|
|
|
def buildPreBundleTask = tasks.findByName("build${targetName}PreBundle")
|
|
|
|
|
2018-08-04 02:55:37 +03:00
|
|
|
def resourcesDirConfigValue = config."resourcesDir${targetName}"
|
|
|
|
if (resourcesDirConfigValue) {
|
|
|
|
def currentCopyResTask = tasks.create(
|
|
|
|
name: "copy${targetName}BundledResources",
|
|
|
|
type: Copy) {
|
2016-01-08 23:11:34 +03:00
|
|
|
group = "react"
|
2018-08-04 02:55:37 +03:00
|
|
|
description = "copy bundled resources into custom location for ${targetName}."
|
|
|
|
|
2019-02-09 21:14:55 +03:00
|
|
|
from(resourcesDir)
|
|
|
|
into(file(resourcesDirConfigValue))
|
2018-08-04 02:55:37 +03:00
|
|
|
|
|
|
|
dependsOn(currentBundleTask)
|
|
|
|
|
2019-02-09 21:14:55 +03:00
|
|
|
enabled(currentBundleTask.enabled)
|
2016-01-08 23:11:34 +03:00
|
|
|
}
|
|
|
|
|
2018-08-04 02:55:37 +03:00
|
|
|
packageTask.dependsOn(currentCopyResTask)
|
2019-01-15 13:11:11 +03:00
|
|
|
if (buildPreBundleTask != null) {
|
|
|
|
buildPreBundleTask.dependsOn(currentCopyResTask)
|
|
|
|
}
|
2018-08-04 02:55:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
def currentAssetsCopyTask = tasks.create(
|
|
|
|
name: "copy${targetName}BundledJs",
|
|
|
|
type: Copy) {
|
|
|
|
group = "react"
|
|
|
|
description = "copy bundled JS into ${targetName}."
|
2016-01-08 23:11:34 +03:00
|
|
|
|
2018-10-02 12:55:40 +03:00
|
|
|
if (config."jsBundleDir${targetName}") {
|
2019-02-09 21:14:55 +03:00
|
|
|
from(jsBundleDir)
|
|
|
|
into(file(config."jsBundleDir${targetName}"))
|
2018-10-02 12:55:40 +03:00
|
|
|
} else {
|
|
|
|
into ("$buildDir/intermediates")
|
|
|
|
into ("assets/${targetPath}") {
|
2019-02-09 21:14:55 +03:00
|
|
|
from(jsBundleDir)
|
2018-10-02 12:55:40 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
// Workaround for Android Gradle Plugin 3.2+ new asset directory
|
2018-10-31 15:27:13 +03:00
|
|
|
into ("merged_assets/${variant.name}/merge${targetName}Assets/out") {
|
2019-02-09 21:14:55 +03:00
|
|
|
from(jsBundleDir)
|
2018-10-02 12:55:40 +03:00
|
|
|
}
|
2019-04-27 19:39:35 +03:00
|
|
|
|
|
|
|
// Workaround for Android Gradle Plugin 3.4+ new asset directory
|
|
|
|
into ("merged_assets/${variant.name}/out") {
|
|
|
|
from(jsBundleDir)
|
|
|
|
}
|
2018-10-02 12:55:40 +03:00
|
|
|
}
|
2018-08-04 02:55:37 +03:00
|
|
|
|
|
|
|
// mergeAssets must run first, as it clears the intermediates directory
|
- update to gradle 4.10.1 or high (#23103)
Summary:
Add suport to gradle 4.10.1 or high!
The new version of android studio 3.3 recommendete to update gradle project to 4.10.1
> To take advantage of the latest features, improvements, and security fixes, we strongly recommend that you update the Android Gradle plugin to version 3.3.0 and Gradle to version 4.10.1. [Release notes ](https://developer.android.com/studio/releases/gradle-plugin)
>Android plugin 3.2.0 and higher now support building the Android App Bundle—a new upload format that defers APK generation and signing to compatible app stores, such as Google Play. With app bundles, you no longer have to build, sign, and manage multiple APKs, and users get smaller, more optimized downloads. [Learn more](https://developer.android.com/guide/app-bundle/?utm_source=android-studio)
but if the upgrade to the new Android gradle many warnings come up, becouse meny things was obsoleted
> WARNING: API 'variant.getMergeResources()' is obsolete and has been replaced with 'variant.getMergeResourcesProvider()'.
> WARNING: API 'variant.getPackageApplication()' is obsolete and has been replaced with 'variant.getPackageApplicationProvider()'.
> WARNING: API 'variant.getMergeAssets()' is obsolete and has been replaced with 'variant.getMergeAssetsProvider()'.
> It will be removed at the end of 2019.
> For more information, [see ](https://d.android.com/r/tools/task-configuration-avoidance.)
> To determine what is calling variant.getMergeAssets(), use -Pandroid.debug.obsoleteApi=true on the command line to display a stack trace.
Changelog:
----------
[Android] [Deprecated] - fix warinings obsolete to update to gradle 4.10.1 or high
Pull Request resolved: https://github.com/facebook/react-native/pull/23103
Differential Revision: D13817123
Pulled By: cpojer
fbshipit-source-id: 9816e20145a5fded2702cf9317cfb6862f3ebd8b
2019-01-25 14:12:51 +03:00
|
|
|
dependsOn(variant.mergeAssetsProvider.get())
|
2018-08-04 02:55:37 +03:00
|
|
|
|
2019-02-09 21:14:55 +03:00
|
|
|
enabled(currentBundleTask.enabled)
|
2016-01-08 23:11:34 +03:00
|
|
|
}
|
2018-08-04 02:55:37 +03:00
|
|
|
|
2020-10-27 02:04:06 +03:00
|
|
|
// mergeResources task runs before the bundle file is copied to the intermediate asset directory from Android plugin 4.1+.
|
|
|
|
// This ensures to copy the bundle file before mergeResources task starts
|
|
|
|
def mergeResourcesTask = tasks.findByName("merge${targetName}Resources")
|
|
|
|
mergeResourcesTask.dependsOn(currentAssetsCopyTask)
|
|
|
|
|
2018-08-04 02:55:37 +03:00
|
|
|
packageTask.dependsOn(currentAssetsCopyTask)
|
2019-01-15 13:11:11 +03:00
|
|
|
if (buildPreBundleTask != null) {
|
|
|
|
buildPreBundleTask.dependsOn(currentAssetsCopyTask)
|
|
|
|
}
|
2019-07-26 08:59:00 +03:00
|
|
|
|
|
|
|
// Delete the VM related libraries that this build doesn't need.
|
|
|
|
// The application can manage this manually by setting 'enableVmCleanup: false'
|
|
|
|
//
|
|
|
|
// This should really be done by packaging all Hermes releated libs into
|
|
|
|
// two separate HermesDebug and HermesRelease AARs, but until then we'll
|
|
|
|
// kludge it by deleting the .so files out of the /transforms/ directory.
|
|
|
|
def isRelease = targetName.toLowerCase().contains("release")
|
|
|
|
def libDir = "$buildDir/intermediates/transforms/"
|
|
|
|
def vmSelectionAction = {
|
|
|
|
fileTree(libDir).matching {
|
|
|
|
if (enableHermes) {
|
|
|
|
// For Hermes, delete all the libjsc* files
|
|
|
|
include "**/libjsc*.so"
|
|
|
|
|
|
|
|
if (isRelease) {
|
|
|
|
// Reduce size by deleting the debugger/inspector
|
|
|
|
include '**/libhermes-inspector.so'
|
|
|
|
include '**/libhermes-executor-debug.so'
|
|
|
|
} else {
|
|
|
|
// Release libs take precedence and must be removed
|
|
|
|
// to allow debugging
|
|
|
|
include '**/libhermes-executor-release.so'
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// For JSC, delete all the libhermes* files
|
|
|
|
include "**/libhermes*.so"
|
|
|
|
}
|
|
|
|
}.visit { details ->
|
|
|
|
def targetVariant = ".*/transforms/[^/]*/${targetPath}/.*"
|
|
|
|
def path = details.file.getAbsolutePath().replace(File.separatorChar, '/' as char)
|
|
|
|
if (path.matches(targetVariant) && details.file.isFile()) {
|
2019-08-12 12:42:00 +03:00
|
|
|
details.file.delete()
|
2019-07-26 08:59:00 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (enableVmCleanup) {
|
|
|
|
def task = tasks.findByName("package${targetName}")
|
|
|
|
task.doFirst(vmSelectionAction)
|
|
|
|
}
|
2016-01-08 23:11:34 +03:00
|
|
|
}
|
2015-10-19 16:32:02 +03:00
|
|
|
}
|