Allow bundle task to be disabled for release (#18892)

deecewan · facebook-github-bot · commit 6b21109d3d64 · 2019-02-13T14:40:37.000-08:00
Summary: The current system would always end up falling back to `true` for release builds Pull Request resolved: #18892 Differential Revision: D14069444 Pulled By: hramos fbshipit-source-id: 16e32a366b3b2e252a98a967da827ba1ebaeff85
diff --git a/react.gradle b/react.gradle
@@ -76,9 +76,11 @@ afterEvaluate {
                     "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
             }
 
-            enabled config."bundleIn${targetName}" ||
-                config."bundleIn${variant.buildType.name.capitalize()}" ?:
-                targetName.toLowerCase().contains("release")
+            enabled config."bundleIn${targetName}" != null
+              ? config."bundleIn${targetName}"
+              : config."bundleIn${buildTypeName.capitalize()}" != null
+                ? config."bundleIn${buildTypeName.capitalize()}"
+                : targetName.toLowerCase().contains("release")
         }
 
         // Expose a minimal interface on the application variant and the task itself:

Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,11 @@ afterEvaluate {`
`76`	`76`	`"--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)`
`77`	`77`	`}`
`78`	`78`
`79`		`- enabled config."bundleIn${targetName}" \|\|`
`80`		`- config."bundleIn${variant.buildType.name.capitalize()}" ?:`
`81`		`- targetName.toLowerCase().contains("release")`
	`79`	`+ enabled config."bundleIn${targetName}" != null`
	`80`	`+ ? config."bundleIn${targetName}"`
	`81`	`+ : config."bundleIn${buildTypeName.capitalize()}" != null`
	`82`	`+ ? config."bundleIn${buildTypeName.capitalize()}"`
	`83`	`+ : targetName.toLowerCase().contains("release")`
`82`	`84`	`}`
`83`	`85`
`84`	`86`	`// Expose a minimal interface on the application variant and the task itself:`