From 7fd6e99d8296d29f5e69627611bf5255937f1bb0 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Fri, 24 Apr 2026 14:28:01 -0600 Subject: [PATCH] Make makePluginsJson run after ensureJarCompatibility By using `mustRunAfter` instead of `dependsOn` it won't force it to run unless its already in the task graph, so that way it only ensures it runs first if there are actually cross platform plugins with ensureJarCompatibility still pending. --- .../cloudstream3/gradle/tasks/Tasks.kt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) 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 b12d112..5c1863f 100644 --- a/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/Tasks.kt +++ b/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/Tasks.kt @@ -106,16 +106,17 @@ fun registerTasks(project: Project) { task.targetJarFile.set(project.layout.buildDirectory.file("${project.name}.jar")) } - project.tasks.register("ensureJarCompatibility", EnsureJarCompatibilityTask::class.java) { task -> - task.dependsOn(compilePluginJar) - task.hasCrossPlatformSupport.set(extension.isCrossPlatform) - if (extension.isCrossPlatform) { - task.jarFile.set(project.layout.buildDirectory.file("${project.name}.jar")) - task.doLast { - task.checkOutput() + val ensureJarCompatibility = + project.tasks.register("ensureJarCompatibility", EnsureJarCompatibilityTask::class.java) { task -> + task.dependsOn(compilePluginJar) + task.hasCrossPlatformSupport.set(extension.isCrossPlatform) + if (extension.isCrossPlatform) { + task.jarFile.set(project.layout.buildDirectory.file("${project.name}.jar")) + task.doLast { + task.checkOutput() + } } } - } val manifestFile = intermediatesDir.map { it.file("manifest.json") } @@ -202,6 +203,7 @@ fun registerTasks(project: Project) { project.rootProject.tasks.named("makePluginsJson", MakePluginsJsonTask::class.java).configure { task -> task.dependsOn(writeCacheEntry) + task.mustRunAfter(ensureJarCompatibility) task.pluginEntryFiles.from(pluginEntryFile) }