diff --git a/.gitignore b/.gitignore index ea5f60a2..3a5e3558 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ example/.yarn/* # generated by bob lib/ +secring.gpg diff --git a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/plugin/RNSourceSets.kt b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/plugin/RNSourceSets.kt index 69ca5c67..33ef4475 100644 --- a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/plugin/RNSourceSets.kt +++ b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/plugin/RNSourceSets.kt @@ -44,18 +44,22 @@ object RNSourceSets { } private fun configureSourceSets() { - androidExtension.sourceSets.getByName("main") { sourceSet -> - for (bundlePathSegment in listOf( - // outputs for RN <= 0.81 - "createBundleReleaseJsAndAssets", - // outputs for RN >= 0.82 - "react/release", - )) { - sourceSet.assets.srcDirs("$appBuildDir/generated/assets/$bundlePathSegment") - sourceSet.res.srcDirs("$appBuildDir/generated/res/$bundlePathSegment") + project.extensions.getByType(LibraryExtension::class.java).libraryVariants.all { variant -> + val capitalizedVariantName = variant.name.replaceFirstChar(Char::titlecase) + + androidExtension.sourceSets.getByName("main") { sourceSet -> + for (bundlePathSegment in listOf( + // outputs for RN <= 0.81 + "createBundle${capitalizedVariantName}JsAndAssets", + // outputs for RN >= 0.82 + "react/release", + )) { + sourceSet.assets.srcDirs("$appBuildDir/generated/assets/$bundlePathSegment") + sourceSet.res.srcDirs("$appBuildDir/generated/res/$bundlePathSegment") + } + + sourceSet.java.srcDirs("$moduleBuildDir/generated/autolinking/src/main/java") } - - sourceSet.java.srcDirs("$moduleBuildDir/generated/autolinking/src/main/java") } androidExtension.sourceSets.getByName("release") { diff --git a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantProcessor.kt b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantProcessor.kt index 704887e0..5b57e990 100644 --- a/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantProcessor.kt +++ b/gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantProcessor.kt @@ -55,8 +55,8 @@ class VariantProcessor(private val variant: LibraryVariant) : BaseProject() { throw TaskNotFound("Can not find $preBuildTaskPath task") } - if (capitalizedVariantName == "Release") { - prepareTask.dependsOn(":app:createBundleReleaseJsAndAssets") + if (capitalizedVariantName.contains("Release")) { + prepareTask.dependsOn(":app:createBundle${capitalizedVariantName}JsAndAssets") } val bundleTask = variantTaskProvider.bundleTaskProvider(project, variant.name)