feat(plugin): update dependency task for LSParanoidTask (#master)

Improve LSParanoidTask dependency configuration: - Use merge classes or jar task instead of compile tasks - Handle cases where dependency task is not found - Update version to 0.6.16 Signed-off-by: androidacy-user <opensource@androidacy.com>
Androidacy · Oct 15, 2024 · ef60ea6 · ef60ea6
1 parent 6c9e8a3
commit ef60ea6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 
 allprojects {
     group = "com.github.Androidacy.LSParanoid"
-    version = "0.6.15"
+    version = "0.6.16"
 
     plugins.withType(JavaPlugin::class.java) {
         extensions.configure(JavaPluginExtension::class.java) {

diff --git a/gradle-plugin/src/main/java/org/lsposed/lsparanoid/plugin/LSParanoidPlugin.kt b/gradle-plugin/src/main/java/org/lsposed/lsparanoid/plugin/LSParanoidPlugin.kt
@@ -56,16 +56,18 @@ class LSParanoidPlugin : Plugin<Project> {
                         LSParanoidTask::output,
                     )
                 project.afterEvaluate {
-                    project.tasks.withType(JavaCompile::class.java) { javaCompileTask ->
-                        if (javaCompileTask.name.startsWith("compile${variant.name.replaceFirstChar { it.uppercase() }}")) {
-                            task.configure { it.dependsOn(javaCompileTask) }
-                        }
+                    val dependencyTaskName = if (project.plugins.hasPlugin("com.android.application")) {
+                        "merge${variant.name.replaceFirstChar { it.titlecase() }}Classes"
+                    } else {
+                        "jar" // or bundleLibCompileToJar<VariantName>
                     }
+                    val dependencyTask = project.tasks.findByName(dependencyTaskName)
 
-                    project.tasks.withType(KotlinCompile::class.java) { kotlinCompileTask ->
-                        if (kotlinCompileTask.name.startsWith("compile${variant.name.replaceFirstChar { it.uppercase() }}")) {
-                            task.configure { it.dependsOn(kotlinCompileTask) }
-                        }
+                    if (dependencyTask != null) {
+                        task.configure { it.dependsOn(dependencyTask) }
+                    } else {
+                        // Handle the case where the dependency task is not found, maybe throw an error or log a warning
+                        project.logger.warn("Dependency task '$dependencyTaskName' not found for LSParanoid plugin")
                     }
                 }
             }