fix: broken support for custom appProjectName in Gradle Plugin

.changeset/crisp-animals-drive.md

@@ -0,0 +1,6 @@
+---
+'brownfield': patch
+'@callstack/react-native-brownfield': patch
+---
+
+fix: support custom app project name in Gradle plugin via extension's appProjectName config field

.changeset/seven-tables-dress.md

@@ -0,0 +1,7 @@
+---
+'@callstack/react-native-brownfield': patch
+'brownfield': patch
+'@callstack/brownfield-cli': patch
+---
+
+chore: bump up Gradle plugin version

apps/RNApp/android/build.gradle

@@ -16,7 +16,7 @@ buildscript {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
-        classpath("com.callstack.react:brownfield-gradle-plugin:1.0.1-SNAPSHOT")
+        classpath("com.callstack.react:brownfield-gradle-plugin:1.0.2-SNAPSHOT")
     }
 }
 

apps/scripts/prepare-android-build-gradle-for-ci.ts

@@ -9,7 +9,7 @@ if (!projectDirName) {
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-const SNAPSHOT_VERSION = '1.0.1-SNAPSHOT';
+const SNAPSHOT_VERSION = '1.0.2-SNAPSHOT';
 const targetPath = path.resolve(
   __dirname,
   '..',

gradle-plugins/react/README.md

@@ -20,7 +20,7 @@ buildscript {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
-+       classpath("com.callstack.react:brownfield-gradle-plugin:1.0.1")
++       classpath("com.callstack.react:brownfield-gradle-plugin:1.0.2")
     }
 }
 ```
@@ -59,7 +59,7 @@ buildscript {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
-+       classpath("com.callstack.react:brownfield-gradle-plugin:1.0.1-SNAPSHOT")
++       classpath("com.callstack.react:brownfield-gradle-plugin:1.0.2-SNAPSHOT")
     }
 }
 ```

gradle-plugins/react/brownfield/gradle.properties

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

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

@@ -45,11 +45,11 @@ class RNBrownfieldPlugin
                 project.evaluationDependsOn(EXPO_PROJECT_LOCATOR)
             }
 
-            RNSourceSets.configure(project, extension)
             projectConfigurations.setup()
             registerRClassTransformer()
 
             project.afterEvaluate {
+                RNSourceSets.configure(project, extension)
                 afterEvaluate()
 
                 if (this.isExpoProject) {

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

@@ -5,7 +5,7 @@
  * We can't use the new `com.android.build.gradle.api.LibraryVariant`
  * as of now.
  *
- * We may want to re-visit this in future.
+ * We may want to re-visit this in the future.
  */
 
 package com.callstack.react.brownfield.processors
@@ -17,6 +17,7 @@ import com.callstack.react.brownfield.artifacts.ArtifactsResolver.Companion.ARTI
 import com.callstack.react.brownfield.exceptions.TaskNotFound
 import com.callstack.react.brownfield.shared.BaseProject
 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.Task
 import org.gradle.api.artifacts.ResolvedArtifact
@@ -57,7 +58,9 @@ class VariantProcessor(private val variant: LibraryVariant) : BaseProject() {
         }
 
         if (capitalizedVariantName.contains("Release")) {
-            prepareTask.dependsOn(":app:createBundle${capitalizedVariantName}JsAndAssets")
+            val projectExt = project.extensions.getByType(Extension::class.java)
+            val appProject = project.rootProject.project(projectExt.appProjectName)
+            prepareTask.dependsOn("${appProject.path}:createBundle${capitalizedVariantName}JsAndAssets")
         }
 
         val bundleTask = variantTaskProvider.bundleTaskProvider(project, variant.name)

packages/react-native-brownfield/src/expo-config-plugin/android/utils/constants.ts

@@ -1,2 +1,2 @@
-export const BROWNFIELD_PLUGIN_VERSION = '1.0.1';
+export const BROWNFIELD_PLUGIN_VERSION = '1.0.2';
 export const brownfieldGradlePluginDependency = `classpath("com.callstack.react:brownfield-gradle-plugin:${BROWNFIELD_PLUGIN_VERSION}")`;