Skip to content

Commit c2cc76e

Browse files
Merge pull request #163 from callstack/support-flavors
feat: support flavors for JSBundle
2 parents ff08de2 + 4146206 commit c2cc76e

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,4 @@ example/.yarn/*
8080
# generated by bob
8181
lib/
8282

83+
secring.gpg

gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/plugin/RNSourceSets.kt

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,22 @@ object RNSourceSets {
4444
}
4545

4646
private fun configureSourceSets() {
47-
androidExtension.sourceSets.getByName("main") { sourceSet ->
48-
for (bundlePathSegment in listOf(
49-
// outputs for RN <= 0.81
50-
"createBundleReleaseJsAndAssets",
51-
// outputs for RN >= 0.82
52-
"react/release",
53-
)) {
54-
sourceSet.assets.srcDirs("$appBuildDir/generated/assets/$bundlePathSegment")
55-
sourceSet.res.srcDirs("$appBuildDir/generated/res/$bundlePathSegment")
47+
project.extensions.getByType(LibraryExtension::class.java).libraryVariants.all { variant ->
48+
val capitalizedVariantName = variant.name.replaceFirstChar(Char::titlecase)
49+
50+
androidExtension.sourceSets.getByName("main") { sourceSet ->
51+
for (bundlePathSegment in listOf(
52+
// outputs for RN <= 0.81
53+
"createBundle${capitalizedVariantName}JsAndAssets",
54+
// outputs for RN >= 0.82
55+
"react/release",
56+
)) {
57+
sourceSet.assets.srcDirs("$appBuildDir/generated/assets/$bundlePathSegment")
58+
sourceSet.res.srcDirs("$appBuildDir/generated/res/$bundlePathSegment")
59+
}
60+
61+
sourceSet.java.srcDirs("$moduleBuildDir/generated/autolinking/src/main/java")
5662
}
57-
58-
sourceSet.java.srcDirs("$moduleBuildDir/generated/autolinking/src/main/java")
5963
}
6064

6165
androidExtension.sourceSets.getByName("release") {

gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantProcessor.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ class VariantProcessor(private val variant: LibraryVariant) : BaseProject() {
5555
throw TaskNotFound("Can not find $preBuildTaskPath task")
5656
}
5757

58-
if (capitalizedVariantName == "Release") {
59-
prepareTask.dependsOn(":app:createBundleReleaseJsAndAssets")
58+
if (capitalizedVariantName.contains("Release")) {
59+
prepareTask.dependsOn(":app:createBundle${capitalizedVariantName}JsAndAssets")
6060
}
6161

6262
val bundleTask = variantTaskProvider.bundleTaskProvider(project, variant.name)

0 commit comments

Comments
 (0)