Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix devDisabledInStaging not working with multiple productFlavors #30606

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,12 @@ abstract class ReactExtension @Inject constructor(project: Project) {
val devDisabledInVariants: ListProperty<String> =
objects.listProperty(String::class.java).convention(emptyList())

/**
* Functional interface to disable dev mode only on specific [BaseVariant] Default: will
* check [devDisabledInVariants] or return True for Release variants and False for Debug variants.
*/
var disableDevForVariant: (BaseVariant) -> Boolean = { variant -> variant.name in devDisabledInVariants.get() || variant.isRelease }

/**
* Variant Name to Boolean map that allows to toggle the bundle command for a specific variant.
* Default: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ internal fun Project.configureReactTasks(variant: BaseVariant, config: ReactExte
}
it.execCommand = execCommand
it.bundleCommand = config.bundleCommand.get()
it.devEnabled = !(variant.name in config.devDisabledInVariants.get() || isRelease)
it.devEnabled = !config.disableDevForVariant(variant)
it.entryFile = detectedEntryFile(config)

val extraArgs = mutableListOf<String>()
Expand Down
9 changes: 7 additions & 2 deletions react.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ def hermesFlagsForVariant = config.hermesFlagsForVariant ?: {
return hermesFlags
}

// Set disableDevForVariant to a function to configure per variant,
// defaults to `devDisabledIn${targetName}` or True for Release variants and False for debug variants
def disableDevForVariant = config.disableDevForVariant ?: {
def variant -> config."devDisabledIn${variant.name.capitalize()}" || variant.name.toLowerCase().contains("release")
}

// Set deleteDebugFilesForVariant to a function to configure per variant,
// defaults to True for Release variants and False for debug variants
def deleteDebugFilesForVariant = config.deleteDebugFilesForVariant ?: {
Expand Down Expand Up @@ -172,8 +178,7 @@ afterEvaluate {
workingDir(reactRoot)

// Set up dev mode
def devEnabled = !(config."devDisabledIn${targetName}"
|| targetName.toLowerCase().contains("release"))
def devEnabled = !disableDevForVariant(variant)

def extraArgs = []

Expand Down