fix: ktlint and detekt

Author: hurali97

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/plugin/ProjectConfigurations.kt

@@ -1,7 +1,7 @@
 package com.callstack.react.brownfield.plugin
 
-import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.android.build.api.dsl.LibraryExtension
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.callstack.react.brownfield.shared.Logging
 import com.callstack.react.brownfield.utils.capitalized
 import org.gradle.api.Project

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

@@ -148,7 +148,7 @@ class RNBrownfieldPlugin : Plugin<Project> {
 
         /** ===== jniLibsProcessor ===== */
         val jniLibsProcessor = JNILibsProcessor(project)
-        jniLibsProcessor.processJniLibs(aarLibraries, variant, explodeTask)
+        jniLibsProcessor.processJniLibs(aarLibraries, variant)
 
         /** ===== proguardProcessor ===== */
         val proguardProcessor = ProguardProcessor(project)

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.api.dsl.LibraryExtension
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.callstack.react.brownfield.exceptions.NameSpaceNotFound
 import com.callstack.react.brownfield.utils.Extension
 import com.callstack.react.brownfield.utils.Utils

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

@@ -1,21 +1,25 @@
 package com.callstack.react.brownfield.processors
 
 import com.android.build.api.variant.LibraryVariant
-import com.callstack.react.brownfield.shared.Constants.INTERMEDIATES_TEMP_DIR
-import com.callstack.react.brownfield.shared.ExplodeAarTask
 import com.callstack.react.brownfield.shared.Logging
 import com.callstack.react.brownfield.utils.AndroidArchiveLibrary
 import com.callstack.react.brownfield.utils.Extension
 import com.callstack.react.brownfield.utils.capitalized
-import org.gradle.api.Project
-import java.io.File
-
 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.provider.ListProperty
 import org.gradle.api.provider.Property
-import org.gradle.api.tasks.*
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.Optional
+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 java.io.File
 import kotlin.collections.component1
 import kotlin.collections.component2
 
@@ -24,16 +28,16 @@ import kotlin.collections.component2
  * with the AAR as they are provided by the Gradle when AAR is
  * consumed by the host App.
  */
-val UN_ALLOWED_LIBS = listOf(
-    "libc++_shared.so", "libfbjni.so", "libhermestooling.so",
-    "libhermesvm.so", "libimagepipeline.so", "libjsi.so",
-    "libnative-filters.so", "libnative-imagetranscoder.so",
-    "libreactnative.so"
-)
+val UN_ALLOWED_LIBS =
+    listOf(
+        "libc++_shared.so", "libfbjni.so", "libhermestooling.so",
+        "libhermesvm.so", "libimagepipeline.so", "libjsi.so",
+        "libnative-filters.so", "libnative-imagetranscoder.so",
+        "libreactnative.so",
+    )
 
 @CacheableTask
 abstract class ProcessAndCopyJniLibsTask : DefaultTask() {
-
     @get:InputFiles
     @get:PathSensitive(PathSensitivity.RELATIVE)
     abstract val aarJniDirs: ConfigurableFileCollection
@@ -56,9 +60,10 @@ abstract class ProcessAndCopyJniLibsTask : DefaultTask() {
         outDir.deleteRecursively()
         outDir.mkdirs()
 
-        val existingJNILibs = listOf("arm64-v8a", "armeabi-v7a", "x86_64", "x86")
-            .associateWith { mutableListOf<String>() }
-            .toMutableMap()
+        val existingJNILibs =
+            listOf("arm64-v8a", "armeabi-v7a", "x86_64", "x86")
+                .associateWith { mutableListOf<String>() }
+                .toMutableMap()
 
         // 1. Scan and process duplicate libs from AAR paths
         aarJniDirs.forEach { jniDir ->
@@ -78,33 +83,52 @@ abstract class ProcessAndCopyJniLibsTask : DefaultTask() {
         }
     }
 
-    private fun copyStrippedSoLibs(outDir: File, existingJNILibs: MutableMap<String, MutableList<String>>) {
+    private fun copyStrippedSoLibs(
+        outDir: File,
+        existingJNILibs: MutableMap<String, MutableList<String>>,
+    ) {
         val fromDir = strippedLibsDir.get().asFile
-        if (fromDir.exists()) {
-            existingJNILibs.forEach { (arch, libNames) ->
-                val sourceArchDir = File(fromDir, arch)
-                if (sourceArchDir.exists()) {
-                    val destArchDir = File(outDir, arch).apply { mkdirs() }
-                    sourceArchDir.listFiles()?.forEach { file ->
-                        val name = file.name
-
-                        val isCodegenLib = name.startsWith("libreact_codegen_") && name.endsWith(".so")
-                        val isUnAllowedLib = UN_ALLOWED_LIBS.any { lib -> name == lib || name.contains(lib) }
-                        val matchesFilter = name == "libappmodules.so" || isCodegenLib || !isUnAllowedLib
-
-                        if (matchesFilter) {
-                            try {
-                                file.copyTo(File(destArchDir, name), overwrite = true)
-                            } catch (e: java.io.IOException) {
-                                Logging.error("Failed to copy $name: ${e.message}", e.cause)
-                            }
-                        }
-                    }
-                }
-            }
+        if (!fromDir.exists()) return
+
+        existingJNILibs.keys.forEach { arch ->
+            copyArchStrippedSoLibs(fromDir, outDir, arch)
+        }
+    }
+
+    private fun copyArchStrippedSoLibs(
+        fromDir: File,
+        outDir: File,
+        arch: String,
+    ) {
+        val sourceArchDir = File(fromDir, arch)
+        if (!sourceArchDir.exists()) return
+
+        val destArchDir = File(outDir, arch).apply { mkdirs() }
+        sourceArchDir.listFiles()?.forEach { file ->
+            copyIfAllowed(file, destArchDir)
+        }
+    }
+
+    private fun copyIfAllowed(
+        file: File,
+        destArchDir: File,
+    ) {
+        val name = file.name
+        if (!matchesAllowedLib(name)) return
+
+        try {
+            file.copyTo(File(destArchDir, name), overwrite = true)
+        } catch (e: java.io.IOException) {
+            Logging.error("Failed to copy $name: ${e.message}", e.cause)
         }
     }
 
+    private fun matchesAllowedLib(name: String): Boolean {
+        val isCodegenLib = name.startsWith("libreact_codegen_") && name.endsWith(".so")
+        val isUnAllowedLib = UN_ALLOWED_LIBS.any { lib -> name == lib || name.contains(lib) }
+        return name == "libappmodules.so" || isCodegenLib || !isUnAllowedLib
+    }
+
     private fun processNestedLibs(
         files: Array<File>?,
         existingJNILibs: MutableMap<String, MutableList<String>>,
@@ -128,37 +152,37 @@ class JNILibsProcessor(val project: Project) {
     fun processJniLibs(
         aarLibraries: Collection<AndroidArchiveLibrary>,
         variant: LibraryVariant,
-        explodeTask: TaskProvider<ExplodeAarTask>,
     ) {
         val variantName = variant.name
         val capitalizedVariantName = variantName.capitalized()
         val projectExt = project.extensions.getByType(Extension::class.java)
         val appProject = project.rootProject.project(projectExt.appProjectName)
 
-        val processJniTask = project.tasks.register("processCustomJniLibsFor$capitalizedVariantName",ProcessAndCopyJniLibsTask::class.java) {
-//            Verify if this is required
-//            it.dependsOn(explodeTask)
-            it.useStrippedSoFiles.set(projectExt.useStrippedSoFiles)
+        val processJniTask =
+            project.tasks.register("processCustomJniLibsFor$capitalizedVariantName", ProcessAndCopyJniLibsTask::class.java) {
+                it.useStrippedSoFiles.set(projectExt.useStrippedSoFiles)
 
-            val jniDirs = aarLibraries.map { aarLib ->
-                aarLib.getJniDir()
-            }
+                val jniDirs =
+                    aarLibraries.map { aarLib ->
+                        aarLib.getJniDir()
+                    }
 
-            it.aarJniDirs.setFrom(jniDirs)
+                it.aarJniDirs.setFrom(jniDirs)
 
-            val fromDirProvider = appProject.layout.buildDirectory.dir(
-                "intermediates/stripped_native_libs/$variantName/strip${capitalizedVariantName}DebugSymbols/out/lib"
-            )
-            it.strippedLibsDir.set(fromDirProvider)
+                val fromDirProvider =
+                    appProject.layout.buildDirectory.dir(
+                        "intermediates/stripped_native_libs/$variantName/strip${capitalizedVariantName}DebugSymbols/out/lib",
+                    )
+                it.strippedLibsDir.set(fromDirProvider)
 
-            val stripTaskPath = ":${appProject.name}:strip${capitalizedVariantName}DebugSymbols"
-            val codegenTaskPath = ":${project.name}:generateCodegenSchemaFromJavaScript"
-            it.dependsOn(stripTaskPath, codegenTaskPath)
-        }
+                val stripTaskPath = ":${appProject.name}:strip${capitalizedVariantName}DebugSymbols"
+                val codegenTaskPath = ":${project.name}:generateCodegenSchemaFromJavaScript"
+                it.dependsOn(stripTaskPath, codegenTaskPath)
+            }
 
         variant.sources.jniLibs?.addGeneratedSourceDirectory(
             taskProvider = processJniTask,
-            wiredWith = { it.outputDirectory }
+            wiredWith = { it.outputDirectory },
         )
     }
 }

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

@@ -11,7 +11,7 @@ class ProguardProcessor(val project: Project) {
         proguardRules: List<File>,
         capitalizedVariantName: String,
         explodeTask: TaskProvider<ExplodeAarTask>,
-        ) {
+    ) {
         val mergeTaskName = "merge${capitalizedVariantName}ConsumerProguardFiles"
         project.tasks.matching { it.name == mergeTaskName }.configureEach { task ->
             task.dependsOn(explodeTask)

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

@@ -2,16 +2,13 @@ package com.callstack.react.brownfield.processors
 
 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.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.Project
 import org.gradle.api.Task
 import org.gradle.api.UnknownTaskException
 import org.gradle.api.tasks.TaskProvider
-import java.io.File
 
 class VariantTaskProvider(val project: Project) {
     fun bundleTaskProvider(
@@ -42,7 +39,7 @@ class VariantTaskProvider(val project: Project) {
 
         val projectExt = project.extensions.getByType(Extension::class.java)
         val appProject = project.rootProject.project(projectExt.appProjectName)
-        
+
         val jsBundleTaskName = "${appProject.path}:createBundle${capitalizedBundledAssetsVariantName}JsAndAssets"
 
         variant.lifecycleTasks.registerPreBuild(explodeAarTask, jsBundleTaskName)

gradle-plugins/react/brownfield/src/main/kotlin/com/callstack/react/brownfield/shared/BundleTaskProvider.kt

@@ -14,7 +14,7 @@ class BundleTaskProvider(private val variantTaskProvider: VariantTaskProvider) {
         variant: LibraryVariant,
     ): TaskProvider<Task> {
         val androidComponent = project.extensions.findByType(LibraryExtension::class.java)
-        // TODO: evaluate if default makes sense
+        // Default to the variant name until a matching build type/flavor refines it.
         var taskName = variant.name
 
         androidComponent?.buildTypes?.forEach {
@@ -29,7 +29,6 @@ class BundleTaskProvider(private val variantTaskProvider: VariantTaskProvider) {
                     return@forEach
                 }
             }
-
         }
         return variantTaskProvider.bundleTaskProvider(project, taskName)
     }

packages/react-native-brownfield/src/expo-config-plugin/template/android/build.gradle.kts

@@ -69,8 +69,6 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
-
-        missingDimensionStrategy("abc", "dev")
     }
 
     buildFeatures {