@callstack/react-native-brownfield 4.0.0 → 4.2.0

package/gradle-plugin/brownfield/config/detekt/detekt.yml

@@ -844,7 +844,7 @@ style:
     ignoredCharacters: []
   ThrowsCount:
     active: true
-    max: 2
+    max: 3
     excludeGuardClauses: false
   TrailingWhitespace:
     active: false

package/gradle-plugin/brownfield/gradle.properties

@@ -1,6 +1,6 @@
 PROJECT_ID=com.callstack.react.brownfield
 ARTIFACT_ID=brownfield-gradle-plugin
-VERSION=2.0.0-alpha05
+VERSION=2.0.0-alpha08
 GROUP=com.callstack.react
 IMPLEMENTATION_CLASS=com.callstack.react.brownfield.plugin.RNBrownfieldPlugin
 

package/gradle-plugin/brownfield/src/main/kotlin/com/callstack/react/brownfield/expo/utils/LocalMavenUtils.kt

@@ -1,6 +1,6 @@
 package com.callstack.react.brownfield.expo.utils
 
-import com.android.build.gradle.LibraryExtension
+import com.android.build.api.dsl.LibraryExtension
 import org.gradle.api.Project
 import java.io.File
 
@@ -68,10 +68,7 @@ object LocalMavenUtils {
                 BrownfieldPublishingInfo(
                     groupId = groupId,
                     artifactId = artifactId,
-                    version = (
-                        targetProjectAndroidLibExt.defaultConfig.versionName
-                            ?: targetProject.version.toString()
-                    ),
+                    version = targetProject.version.toString(),
                 )
             )
         }

package/gradle-plugin/brownfield/src/main/kotlin/com/callstack/react/brownfield/plugin/ProjectConfigurations.kt

@@ -1,7 +1,7 @@
 package com.callstack.react.brownfield.plugin
 
+import com.android.build.api.dsl.LibraryExtension
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
-import com.android.build.gradle.LibraryExtension
 import com.callstack.react.brownfield.shared.Logging
 import com.callstack.react.brownfield.utils.capitalized
 import org.gradle.api.Project
@@ -70,7 +70,6 @@ class ProjectConfigurations(private val project: Project) {
         val configuration = project.configurations.create(configName)
 
         configuration.extendsFrom(project.configurations.getByName("implementation"))
-        configuration.isVisible = false
         configuration.isTransitive = false
 
         val androidComponents = project.extensions.getByType(LibraryAndroidComponentsExtension::class.java)
@@ -96,9 +95,8 @@ class ProjectConfigurations(private val project: Project) {
         from: AttributeContainer,
         into: AttributeContainer,
     ) {
-        val value: T? = from.getAttribute(key)
-        if (value != null) {
-            into.attribute(key, value)
+        from.getAttribute(key)?.let {
+            into.attribute(key, it)
         }
     }
 

package/gradle-plugin/brownfield/src/main/kotlin/com/callstack/react/brownfield/plugin/RNBrownfieldPlugin.kt

@@ -1,7 +1,7 @@
 package com.callstack.react.brownfield.plugin
 
-import com.android.build.gradle.LibraryExtension
-import com.android.build.gradle.api.LibraryVariant
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
+import com.android.build.api.variant.LibraryVariant
 import com.callstack.react.brownfield.artifacts.ArtifactsResolver
 import com.callstack.react.brownfield.expo.ExpoPublishingHelper
 import com.callstack.react.brownfield.expo.utils.ExpoGradleProjectProjection
@@ -11,6 +11,7 @@ import com.callstack.react.brownfield.processors.JNILibsProcessor
 import com.callstack.react.brownfield.processors.ManifestTaskProcessor
 import com.callstack.react.brownfield.processors.ProguardProcessor
 import com.callstack.react.brownfield.processors.ResourceTaskProcessor
+import com.callstack.react.brownfield.processors.VariantHelper
 import com.callstack.react.brownfield.processors.VariantPackagesProperty
 import com.callstack.react.brownfield.processors.VariantTaskProvider
 import com.callstack.react.brownfield.shared.BaseProject
@@ -21,6 +22,7 @@ import com.callstack.react.brownfield.utils.AndroidArchiveLibrary
 import com.callstack.react.brownfield.utils.DirectoryManager
 import com.callstack.react.brownfield.utils.Extension
 import com.callstack.react.brownfield.utils.Utils
+import com.callstack.react.brownfield.utils.capitalized
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.ProjectConfigurationException
@@ -65,10 +67,8 @@ class RNBrownfieldPlugin : Plugin<Project> {
 
         val variantTaskProvider = VariantTaskProvider(project)
 
-        /**
-         * Configure Tasks
-         */
-        project.extensions.getByType(LibraryExtension::class.java).libraryVariants.all { variant ->
+        val androidComponents = project.extensions.getByType(LibraryAndroidComponentsExtension::class.java)
+        androidComponents.onVariants { variant ->
             configureTasks(variant, artifacts, variantTaskProvider)
         }
     }
@@ -124,48 +124,42 @@ class RNBrownfieldPlugin : Plugin<Project> {
         variantTaskProvider: VariantTaskProvider,
     ) {
         val variantName = variant.name
-        val capitalizedVariantName = variantName.replaceFirstChar(Char::titlecase)
+        val capitalizedVariantName = variantName.capitalized()
 
         /** =======  EXPLODE AAR  =========*/
         val explodeTask = ExplodeTaskProvider.getTask(variant, project, artifacts)
 
         /** =======  Pre<Variant>Build  =========*/
         variantTaskProvider.preBuildTaskByVariant(
-            variantName,
-            variant.buildType.name,
-            variant.buildType.isDebuggable,
+            variant,
             explodeTask,
         )
 
         val aarLibraries = getAarLibraries(artifacts, variantName)
 
+        ManifestTaskProcessor.process(project, variant, aarLibraries)
+        ResourceTaskProcessor.process(project, variant, aarLibraries, explodeTask)
+        AssetTaskProcessor.process(project, variant, aarLibraries, explodeTask)
+
+        /** =======  MERGE CLASSES  =========*/
+        val mergeClassesTask = variantTaskProvider.mergeClasses(aarLibraries, explodeTask, variantName)
+        VariantHelper.getAsmTransformTask(project, capitalizedVariantName).configureEach {
+            it.dependsOn(mergeClassesTask)
+        }
+
         /**
          * Flat IDs to be put into the variant property, required for RClass Transformer
          */
         val packageIDs = aarLibraries.map { it.getPackageName() }
         VariantPackagesProperty.getVariantPackagesProperty().put(variantName, packageIDs)
 
-        /** =======  MANIFEST MERGER  =========*/
-        ManifestTaskProcessor.process(variant, project, aarLibraries)
-
-        /** =======  GENERATE RESOURCES =========*/
-        ResourceTaskProcessor.process(variant, project, aarLibraries)
-
-        /** =======  GENERATE ASSETS ========= */
-        AssetTaskProcessor.process(variant, project, aarLibraries)
-
         /** ===== jniLibsProcessor ===== */
         val jniLibsProcessor = JNILibsProcessor(project)
-        jniLibsProcessor.processJniLibs(aarLibraries, variantName)
+        jniLibsProcessor.processJniLibs(aarLibraries, variant)
 
         /** ===== proguardProcessor ===== */
         val proguardProcessor = ProguardProcessor(project)
         val proguardRules = aarLibraries.map { it.getProguardRules() }
-        proguardProcessor.processConsumerFiles(proguardRules, capitalizedVariantName)
-        proguardProcessor.processGeneratedFiles(proguardRules, capitalizedVariantName)
-
-        /** ===== processDataBinding ===== */
-        val bundleTask = variantTaskProvider.bundleTaskProvider(project, variantName)
-        variantTaskProvider.processDataBinding(bundleTask, aarLibraries, variantName)
+        proguardProcessor.processFiles(proguardRules, variantName.capitalized(), explodeTask)
     }
 }

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

@@ -1,8 +1,9 @@
 package com.callstack.react.brownfield.plugin
 
+import com.android.build.api.dsl.LibraryExtension
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
-import com.android.build.gradle.LibraryExtension
 import com.callstack.react.brownfield.exceptions.NameSpaceNotFound
+import com.callstack.react.brownfield.processors.VariantHelper
 import com.callstack.react.brownfield.utils.Extension
 import com.callstack.react.brownfield.utils.Utils
 import com.callstack.react.brownfield.utils.capitalized
@@ -42,14 +43,14 @@ object RNSourceSets {
         // Move the non-variant-specific configuration out of the loop
         androidExtension.sourceSets.named("main") { sourceSet ->
             // This path is not variant-specific, so it's added once here.
-            sourceSet.java.srcDir("${getModuleBuildDir()}/generated/autolinking/src/main/java")
+            sourceSet.java.directories.add("${getModuleBuildDir()}/generated/autolinking/src/main/java")
         }
 
-        // 2. Use the onVariants block to configure each variant
+        // 2. Use the onVariants block to wire RN bundle outputs via the Variant Sources API
         componentsExtension.onVariants { variant ->
             val variantName = variant.name
             val bundledAssetsVariantName =
-                Utils.getBundledAssetsVariantName(
+                VariantHelper.getBundledAssetsVariantName(
                     variantName = variantName,
                     buildTypeName = variant.buildType,
                     isDebuggable = variant.debuggable,
@@ -57,37 +58,24 @@ object RNSourceSets {
             val capitalizedBundledAssetsVariantName = bundledAssetsVariantName.capitalized()
             val appProject = getAppProject()
 
-            // 3. Lazily configure the 'variant-specific' source set using .named()
-            androidExtension.sourceSets.named(variantName) { sourceSet ->
-                val bundlePathSegments =
-                    listOf(
-                        // outputs for RN <= 0.81
-                        "createBundle${capitalizedBundledAssetsVariantName}JsAndAssets",
-                        // outputs for RN >= 0.82
-                        "react/$bundledAssetsVariantName",
-                    )
-                val updateResourcesPathSegment = Utils.getExpoUpdatesResourcesTaskName(variant.name)
-
-                val appBuildDir = getAppBuildDir()
-                sourceSet.assets.srcDirs(bundlePathSegments.map { "$appBuildDir/generated/assets/$it" })
-                sourceSet.res.srcDirs(bundlePathSegments.map { "$appBuildDir/generated/res/$it" })
-                if (extension.useStrippedSoFiles) {
-                    val capitalizedVariantName = variantName.capitalized()
-                    val libsDir = project.layout.projectDirectory.dir("libs$capitalizedVariantName")
-                    val copyTaskName = "copy${capitalizedVariantName}LibSources"
-                    sourceSet.jniLibs.srcDir(
-                        project.files(libsDir).builtBy(copyTaskName),
-                    )
-                }
-                if (Utils.hasExpoUpdates(appProject, variant.name)) {
-                    val updateResourcesTask = appProject.tasks.named(updateResourcesPathSegment)
-                    sourceSet.assets.srcDir(
-                        project.files("$appBuildDir/generated/assets/$updateResourcesPathSegment").builtBy(updateResourcesTask),
-                    )
-                    sourceSet.res.srcDir(
-                        project.files("$appBuildDir/generated/res/$updateResourcesPathSegment").builtBy(updateResourcesTask),
-                    )
-                }
+            val bundlePathSegments =
+                listOf(
+                    // outputs for RN <= 0.81
+                    "createBundle${capitalizedBundledAssetsVariantName}JsAndAssets",
+                    // outputs for RN >= 0.82
+                    "react/$bundledAssetsVariantName",
+                )
+
+            val appBuildDir = getAppBuildDir()
+            bundlePathSegments.forEach { segment ->
+                variant.sources.assets?.addStaticSourceDirectory("$appBuildDir/generated/assets/$segment")
+                variant.sources.res?.addStaticSourceDirectory("$appBuildDir/generated/res/$segment")
+            }
+
+            if (Utils.hasExpoUpdates(appProject, variantName)) {
+                val updateResourcesPathSegment = VariantHelper.getExpoUpdatesResourcesTaskName(variant.name)
+                variant.sources.assets?.addStaticSourceDirectory("$appBuildDir/generated/assets/$updateResourcesPathSegment")
+                variant.sources.res?.addStaticSourceDirectory("$appBuildDir/generated/res/$updateResourcesPathSegment")
             }
         }
     }

package/gradle-plugin/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/AssetTaskProcessor.kt

@@ -1,29 +1,64 @@
 package com.callstack.react.brownfield.processors
 
-import com.android.build.gradle.LibraryExtension
-import com.android.build.gradle.api.LibraryVariant
+import com.android.build.api.variant.LibraryVariant
+import com.callstack.react.brownfield.shared.ExplodeAarTask
 import com.callstack.react.brownfield.utils.AndroidArchiveLibrary
+import com.callstack.react.brownfield.utils.capitalized
+import org.gradle.api.DefaultTask
 import org.gradle.api.Project
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.TaskProvider
+
+@CacheableTask
+abstract class CopyExplodedAssetsTask : DefaultTask() {
+    @get:InputFiles
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val inputAssetDirs: ConfigurableFileCollection
+
+    @get:OutputDirectory
+    abstract val outputDirectory: DirectoryProperty
+
+    @TaskAction
+    fun run() {
+        val out = outputDirectory.get().asFile
+        out.deleteRecursively()
+        out.mkdirs()
+        inputAssetDirs.forEach { assetDir ->
+            if (assetDir.exists()) {
+                assetDir.copyRecursively(out, overwrite = true)
+            }
+        }
+    }
+}
 
 object AssetTaskProcessor {
     fun process(
-        variant: LibraryVariant,
         project: Project,
+        variant: LibraryVariant,
         aarLibraries: List<AndroidArchiveLibrary>,
+        explodeTask: TaskProvider<ExplodeAarTask>,
     ) {
-        val assetsTask = variant.mergeAssetsProvider.get()
-
-        val androidExtension = project.extensions.getByName("android") as LibraryExtension
-        assetsTask.doFirst {
-            val filteredSourceSets =
-                androidExtension.sourceSets.filter { it.name == variant.name }
-
-            filteredSourceSets.forEach { sourceSet ->
-                val filteredAarLibs = aarLibraries.filter { it.getAssetsDir().exists() }
-                if (!filteredAarLibs.isEmpty()) {
-                    sourceSet.assets.srcDirs(filteredAarLibs.map { it.getAssetsDir() })
-                }
+        val capitalized = variant.name.capitalized()
+        val assetDirs = aarLibraries.map { it.getAssetsDir() }
+        val copyAssetsTask =
+            project.tasks.register(
+                "copyExplodedAssetsFor$capitalized",
+                CopyExplodedAssetsTask::class.java,
+            ) { task ->
+                task.inputAssetDirs.setFrom(assetDirs)
+                task.dependsOn(explodeTask)
             }
-        }
+
+        variant.sources.assets?.addGeneratedSourceDirectory(
+            copyAssetsTask,
+            CopyExplodedAssetsTask::outputDirectory,
+        )
     }
 }

package/gradle-plugin/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/ExplodeTaskProvider.kt

@@ -1,9 +1,10 @@
 package com.callstack.react.brownfield.processors
 
-import com.android.build.gradle.api.LibraryVariant
+import com.android.build.api.variant.LibraryVariant
 import com.callstack.react.brownfield.shared.BundleTaskProvider
 import com.callstack.react.brownfield.shared.ExplodeAarTask
 import com.callstack.react.brownfield.shared.UnresolvedArtifactInfo
+import com.callstack.react.brownfield.utils.Extension
 import com.callstack.react.brownfield.utils.capitalized
 import org.gradle.api.Project
 import org.gradle.api.Task
@@ -20,25 +21,23 @@ object ExplodeTaskProvider {
         val variantTaskProvider = VariantTaskProvider(project)
         val bundleProvider = BundleTaskProvider(variantTaskProvider)
         val capitalizedVariantName = variant.name.capitalized()
+        val projectExt = project.extensions.getByType(Extension::class.java)
 
         return project.tasks.register(
             "explode${capitalizedVariantName}Aar",
             ExplodeAarTask::class.java,
         ) { task ->
             task.variantName.set(variant.name)
-            task.minifyEnabled.set(variant.buildType.isMinifyEnabled)
 
             val finalArtifacts = mutableListOf<UnresolvedArtifactInfo>()
             artifacts.forEach { art ->
                 var artifactPath = art.file
                 if (art.isExpoPublishDependency != true) {
-                    val defaultTaskName = "bundle${capitalizedVariantName}Aar"
                     val dependencyProject = project.project(":${art.moduleName}")
-                    val bundleTaskProvider = bundleProvider.getBundleTask(dependencyProject, variant)
-                    val taskName = bundleTaskProvider?.name ?: defaultTaskName
-
+                    val bundleTaskProvider = bundleProvider.getBundleTask(dependencyProject, variant, projectExt.missingDimensionStrategies)
+                    val taskName = bundleTaskProvider.name
                     dependencyProject.tasks.findByName(taskName)?.let { task.dependsOn(it) }
-                    artifactPath = createArtifactFile(bundleTaskProvider?.get() as Task).absolutePath
+                    artifactPath = createArtifactFile(bundleTaskProvider.get()).absolutePath
                 }
 
                 finalArtifacts.add(