From 20b97a73266b345653b7799afe6ead8be846d440 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 2 Dec 2021 19:59:08 +0800 Subject: [PATCH] Perhaps let's not include javaexec helpers Signed-off-by: shedaniel --- .../ArchitecturyLoomDecompiler.java | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/api/decompilers/architectury/ArchitecturyLoomDecompiler.java b/src/main/java/net/fabricmc/loom/api/decompilers/architectury/ArchitecturyLoomDecompiler.java index f75188dc..1a1f4b64 100644 --- a/src/main/java/net/fabricmc/loom/api/decompilers/architectury/ArchitecturyLoomDecompiler.java +++ b/src/main/java/net/fabricmc/loom/api/decompilers/architectury/ArchitecturyLoomDecompiler.java @@ -24,14 +24,7 @@ package net.fabricmc.loom.api.decompilers.architectury; -import org.gradle.api.Action; -import org.gradle.api.Project; -import org.gradle.api.artifacts.ConfigurationContainer; -import org.gradle.api.artifacts.dsl.DependencyHandler; -import org.gradle.api.file.FileCollection; import org.gradle.api.logging.Logger; -import org.gradle.process.ExecResult; -import org.gradle.process.JavaExecSpec; import net.fabricmc.loom.task.GenerateSourcesTask; @@ -39,23 +32,4 @@ public interface ArchitecturyLoomDecompiler { String name(); void decompile(Logger logger, GenerateSourcesTask.DecompileParams params); - - static ExecResult javaexec(Project project, Action action) { - return project.javaexec(spec -> { - spec.classpath(getClasspath(project)); - action.execute(spec); - }); - } - - private static Object getClasspath(Project project) { - return getRuntimeClasspath(project.getRootProject().getPlugins().hasPlugin("fabric-loom") ? project.getRootProject() : project); - } - - private static FileCollection getRuntimeClasspath(Project project) { - ConfigurationContainer configurations = project.getBuildscript().getConfigurations(); - DependencyHandler handler = project.getDependencies(); - return configurations.getByName("classpath") - .plus(project.getRootProject().getBuildscript().getConfigurations().getByName("classpath")) - .plus(configurations.detachedConfiguration(handler.localGroovy())); - } }