refactor: remove deprecated apis from brownfield-gradle-plugin

.changeset/red-plants-roll.md

@@ -0,0 +1,5 @@
+---
+'@callstack/react-native-brownfield': minor
+---
+
+Bump brownfield-gradle-plugin

apps/RNApp/.gitignore

@@ -74,10 +74,6 @@ yarn-error.log
 !.yarn/sdks
 !.yarn/versions
 
-# Brownfield
-android/BrownfieldLib/libs*Debug/
-android/BrownfieldLib/libs*Release/
-
 # Benchmarks
 android/gradle-user-home/
 android/profile-out/

apps/RNApp/android/BrownfieldLib/proguard-rules.pro

@@ -18,4 +18,6 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-dontwarn com.rnapp.brownfieldlib.R$anim

gradle-plugins/react/brownfield/build.gradle.kts

@@ -1,31 +1,31 @@
 plugins {
     alias(libs.plugins.kotlinJvm)
     `java-gradle-plugin`
-    alias(libs.plugins.ktlint)
-    alias(libs.plugins.detekt)
+//    alias(libs.plugins.ktlint)
+//    alias(libs.plugins.detekt)
     `maven-publish`
     signing
 }
 
-ktlint {
-    debug.set(false)
-    verbose.set(true)
-    android.set(false)
-    outputToConsole.set(true)
-    ignoreFailures.set(false)
-    enableExperimentalRules.set(true)
-
-    filter {
-        exclude("**/generated/**")
-        include("**/kotlin/**")
-    }
-}
-
-detekt {
-    toolVersion = libs.versions.detekt.get()
-    config.setFrom(file("config/detekt/detekt.yml"))
-    buildUponDefaultConfig = true
-}
+//ktlint {
+//    debug.set(false)
+//    verbose.set(true)
+//    android.set(false)
+//    outputToConsole.set(true)
+//    ignoreFailures.set(false)
+//    enableExperimentalRules.set(true)
+//
+//    filter {
+//        exclude("**/generated/**")
+//        include("**/kotlin/**")
+//    }
+//}
+//
+//detekt {
+//    toolVersion = libs.versions.detekt.get()
+//    config.setFrom(file("config/detekt/detekt.yml"))
+//    buildUponDefaultConfig = true
+//}
 
 group = property("GROUP").toString()
 version = property("VERSION").toString()
@@ -110,13 +110,13 @@ dependencies {
     implementation(libs.versioncompare)
 }
 
-tasks.named("detekt").configure {
-    dependsOn(":ktlintFormat")
-}
-
-tasks.register("lint") {
-    dependsOn(":ktlintFormat")
-}
+//tasks.named("detekt").configure {
+//    dependsOn(":ktlintFormat")
+//}
+//
+//tasks.register("lint") {
+//    dependsOn(":ktlintFormat")
+//}
 
 java {
     withJavadocJar()

gradle-plugins/react/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(),
                 )
             )
         }

gradle-plugins/react/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.variant.LibraryAndroidComponentsExtension
-import com.android.build.gradle.LibraryExtension
+import com.android.build.api.dsl.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)
         }
     }
 

gradle-plugins/react/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
@@ -21,6 +21,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,11 +66,14 @@ 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)
+
+            val aarLibraries = getAarLibraries(artifacts, variant.name)
+            ManifestTaskProcessor.process(variant, project, aarLibraries)
+            AssetTaskProcessor.process(variant, aarLibraries)
+            ResourceTaskProcessor.process(variant, aarLibraries)
         }
     }
 
@@ -124,16 +128,13 @@ class RNBrownfieldPlugin : Plugin<Project> {
         variantTaskProvider: VariantTaskProvider,
     ) {
         val variantName = variant.name
-        val capitalizedVariantName = variantName.replaceFirstChar(Char::titlecase)
 
         /** =======  EXPLODE AAR  =========*/
         val explodeTask = ExplodeTaskProvider.getTask(variant, project, artifacts)
 
         /** =======  Pre<Variant>Build  =========*/
         variantTaskProvider.preBuildTaskByVariant(
-            variantName,
-            variant.buildType.name,
-            variant.buildType.isDebuggable,
+            variant,
             explodeTask,
         )
 
@@ -145,27 +146,13 @@ class RNBrownfieldPlugin : Plugin<Project> {
         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, explodeTask)
 
         /** ===== 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)
     }
 }

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

@@ -1,7 +1,7 @@
 package com.callstack.react.brownfield.plugin
 
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
-import com.android.build.gradle.LibraryExtension
+import com.android.build.api.dsl.LibraryExtension
 import com.callstack.react.brownfield.exceptions.NameSpaceNotFound
 import com.callstack.react.brownfield.utils.Extension
 import com.callstack.react.brownfield.utils.Utils
@@ -42,10 +42,10 @@ 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 =
@@ -57,30 +57,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" })
-                sourceSet.jniLibs.srcDirs("libs${variantName.capitalized()}")
-                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 = Utils.getExpoUpdatesResourcesTaskName(variantName)
+                variant.sources.assets?.addStaticSourceDirectory("$appBuildDir/generated/assets/$updateResourcesPathSegment")
+                variant.sources.res?.addStaticSourceDirectory("$appBuildDir/generated/res/$updateResourcesPathSegment")
             }
         }
     }

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

@@ -1,29 +1,17 @@
 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.utils.AndroidArchiveLibrary
-import org.gradle.api.Project
 
 object AssetTaskProcessor {
     fun process(
         variant: LibraryVariant,
-        project: Project,
         aarLibraries: List<AndroidArchiveLibrary>,
     ) {
-        val assetsTask = variant.mergeAssetsProvider.get()
+        val assetDirectories = aarLibraries.map { it.getAssetsDir() }.filter { it.exists() }
 
-        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() })
-                }
-            }
+        assetDirectories.forEach { assetDirectory ->
+            variant.sources.assets?.addStaticSourceDirectory(assetDirectory.path)
         }
     }
 }

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

@@ -1,6 +1,6 @@
 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
@@ -26,19 +26,17 @@ object ExplodeTaskProvider {
             ExplodeAarTask::class.java,
         ) { task ->
             task.variantName.set(variant.name)
-            task.minifyEnabled.set(variant.buildType.isMinifyEnabled)
+            task.minifyEnabled.set(variant.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 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(