Add jarJar task to assemble dependencies

neoforged · Nov 29, 2023 · 30b6437 · 30b6437
1 parent dcbaf5b
commit 30b6437
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/userdev/src/main/java/net/neoforged/gradle/userdev/UserDevProjectPlugin.java b/userdev/src/main/java/net/neoforged/gradle/userdev/UserDevProjectPlugin.java
@@ -11,7 +11,9 @@
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.plugins.JavaPluginExtension;
+import org.gradle.api.tasks.TaskProvider;
 import org.gradle.api.tasks.bundling.Jar;
+import org.gradle.language.base.plugins.LifecycleBasePlugin;
 
 public class UserDevProjectPlugin implements Plugin<Project> {
     public static final String JAR_JAR_TASK_NAME = "jarJar";
@@ -39,7 +41,7 @@ protected void configureJarJarTask(Project project, JarJar jarJarExtension) {
 
         JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class);
 
-        project.getTasks().register(JAR_JAR_TASK_NAME, net.neoforged.gradle.userdev.tasks.JarJar.class, jarJar -> {
+        TaskProvider<net.neoforged.gradle.userdev.tasks.JarJar> jarJarTask = project.getTasks().register(JAR_JAR_TASK_NAME, net.neoforged.gradle.userdev.tasks.JarJar.class, jarJar -> {
             jarJar.setGroup(JAR_JAR_GROUP);
             jarJar.setDescription("Create a combined JAR of project and selected dependencies");
             jarJar.getArchiveClassifier().convention("all");
@@ -54,6 +56,10 @@ protected void configureJarJarTask(Project project, JarJar jarJarExtension) {
             jarJar.setEnabled(false);
         });
 
-        project.getArtifacts().add(JAR_JAR_DEFAULT_CONFIGURATION_NAME, project.getTasks().named(JAR_JAR_TASK_NAME));
+        project.getArtifacts().add(JAR_JAR_DEFAULT_CONFIGURATION_NAME, jarJarTask);
+
+        project.getTasks().named(LifecycleBasePlugin.ASSEMBLE_TASK_NAME, t -> {
+            t.dependsOn(jarJarTask);
+        });
     }
 }