fix: review comments

Author: hurali97

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

@@ -1,6 +1,9 @@
 package com.callstack.react.brownfield.processors
 
 import com.callstack.react.brownfield.utils.capitalized
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.api.tasks.TaskCollection
 
 object VariantHelper {
     fun getAsmTransformTaskName(capitalizedVariantName: String): String {
@@ -39,4 +42,18 @@ object VariantHelper {
     fun getExpoUpdatesResourcesTaskName(variantName: String): String {
         return "create${variantName.capitalized()}UpdatesResources"
     }
+
+    fun getKotlinCompileTask(
+        project: Project,
+        capitalizedVariantName: String,
+    ): TaskCollection<Task> {
+        return project.tasks.matching { it.name == "compile${capitalizedVariantName}Kotlin" }
+    }
+
+    fun getJavaCompileTask(
+        project: Project,
+        capitalizedVariantName: String,
+    ): TaskCollection<Task> {
+        return project.tasks.matching { it.name == "compile${capitalizedVariantName}JavaWithJavac" }
+    }
 }

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

@@ -13,7 +13,6 @@ import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.UnknownTaskException
 import org.gradle.api.tasks.TaskProvider
-import org.gradle.configurationcache.extensions.capitalized
 import java.io.File
 
 class VariantTaskProvider(val project: Project) {
@@ -111,11 +110,11 @@ class VariantTaskProvider(val project: Project) {
     ): TaskProvider<MergeClassesTask> {
         val capitalizedVariantName = variantName.capitalized()
         val mergeClassesTaskName = "mergeClasses$capitalizedVariantName"
-        val kotlinCompileTaskName = "compile${capitalizedVariantName}Kotlin"
 
         return project.tasks.register(mergeClassesTaskName, MergeClassesTask::class.java) {
             it.dependsOn(explodeTasks)
-            it.dependsOn(project.tasks.named(kotlinCompileTaskName))
+            it.dependsOn(VariantHelper.getKotlinCompileTask(project, capitalizedVariantName))
+            it.dependsOn(VariantHelper.getJavaCompileTask(project, capitalizedVariantName))
             it.variantName.set(variantName)
             it.inputClassesJars.from(aarLibraries.map { aarLibrary -> aarLibrary.getClassesJarFile() })
             it.outputDir.set(DirectoryManager.getMergeClassDirectory(variantName))