Skip to content
Merged
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,4 @@ example/.yarn/*
# generated by bob
lib/

secring.gpg
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading