From 3810f1a5806b88422b1a93c0ddfb9e6c11bd1a85 Mon Sep 17 00:00:00 2001
From: C10udburst <18114966+C10udburst@users.noreply.github.com>
Date: Fri, 19 Aug 2022 14:16:55 +0200
Subject: [PATCH] i just needed to write this properly and not be lazy

---
 .../gradle/tasks/MakePluginsJsonTask.kt             |  2 +-
 .../lagradost/cloudstream3/gradle/tasks/Tasks.kt    | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/MakePluginsJsonTask.kt b/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/MakePluginsJsonTask.kt
index cd21e84..76081b7 100644
--- a/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/MakePluginsJsonTask.kt
+++ b/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/MakePluginsJsonTask.kt
@@ -20,7 +20,7 @@ abstract class MakePluginsJsonTask : DefaultTask() {
         val lst = LinkedList<PluginEntry>()
 
         for (subproject in project.allprojects) {
-            val cloudstream = subproject.extensions.findCloudstream() ?: continue
+            subproject.extensions.findCloudstream() ?: continue
 
             lst.add(subproject.makePluginEntry())
         }
diff --git a/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/Tasks.kt b/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/Tasks.kt
index 39e4228..4f87b3e 100644
--- a/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/Tasks.kt
+++ b/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/Tasks.kt
@@ -11,7 +11,8 @@ import org.gradle.api.Project
 import org.gradle.api.tasks.AbstractCopyTask
 import org.gradle.api.tasks.bundling.Zip
 import org.gradle.api.tasks.compile.AbstractCompile
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile 
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import com.lagradost.cloudstream3.gradle.findCloudstream
 
 const val TASK_GROUP = "cloudstream"
 
@@ -23,7 +24,15 @@ fun registerTasks(project: Project) {
         project.rootProject.tasks.register("makePluginsJson", MakePluginsJsonTask::class.java) {
             it.group = TASK_GROUP
 
-            it.mustRunAfter("make")
+            for (subproject in project.allprojects) {
+                subproject.extensions.findCloudstream() ?: continue
+    
+                val makeTask = subproject.tasks.findByName("make")
+                if (makeTask != null) {
+                    it.dependsOn(makeTask)
+                }
+                
+            }
             
             it.outputs.upToDateWhen { false }