Lower targets for gradleutils-shared

Need to target Gradle 8.13 because ForgeDev is currently on 8.14.1 right
now, and FG6 will not run on Gradle 9. I need FG6 in the workspace with
Forge for now since it acts as a reference point to help me move the
patcher plugin application. Once ForgeDev is free of FG6, it will be
updated to Gradle 9.

Also, got a tip from the Gradle Slack that worker daemons
(`WorkerExecutor`) can still run in Java 8 on Gradle 9, so making this
shared code target Java 8 will be better long-term.

Author: Jonathing

gradleutils-shared/build.gradle

@@ -23,7 +23,7 @@ version = gitversion.tagOffset
 println "Version: $version"
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(17)
+    toolchain.languageVersion = JavaLanguageVersion.of(8)
     withSourcesJar()
     withJavadocJar()
 }
@@ -46,10 +46,10 @@ dependencies {
     compileOnly libs.nulls
 
     // Gradle API
-    compileOnly libs.gradle
+    compileOnly sharedLibs.gradle
 
     // Tools
-    implementation libs.bundles.utils
+    implementation sharedLibs.bundles.utils
 }
 
 license {
@@ -84,6 +84,10 @@ tasks.withType(Javadoc).configureEach {
 }
 
 publishing {
+    repositories {
+        maven gradleutils.publishingForgeMaven
+    }
+
     publications.register('mavenJava', MavenPublication) {
         from components.java
         artifactId = projectArtifactId
@@ -103,10 +107,6 @@ publishing {
             }
         }
     }
-
-    repositories {
-        maven gradleutils.publishingForgeMaven
-    }
 }
 
 idea.module { downloadSources = downloadJavadoc = true }

gradleutils-shared/src/main/java/net/minecraftforge/gradleutils/shared/Closures.java

@@ -61,13 +61,14 @@ public final class Closures {
 
     @SuppressWarnings({"rawtypes", "unchecked"})
     private static <T> @UnknownNullability T invokeInternal(Closure closure, Object... object) {
-        var original = Thread.currentThread().getContextClassLoader();
+        ClassLoader original = Thread.currentThread().getContextClassLoader();
         Thread.currentThread().setContextClassLoader(closure.getClass().getClassLoader());
         try {
-            var ret = closure.getMaximumNumberOfParameters() == 0 ? closure.call() : closure.call(object);
+            Object ret = closure.getMaximumNumberOfParameters() == 0 ? closure.call() : closure.call(object);
             return ret != null ? (T) ret : null;
         } catch (InvokerInvocationException e) {
-            throw e.getCause() instanceof RuntimeException rte ? rte : e;
+            Throwable cause = e.getCause();
+            throw cause instanceof RuntimeException ? (RuntimeException) cause : e;
         } finally {
             Thread.currentThread().setContextClassLoader(original);
         }
@@ -79,7 +80,7 @@ public final class Closures {
     /// @param <R>      The return type of the function
     /// @return The closure
     /// @apiNote For static methods only.
-    public static <R> Closure<R> unaryOperator(UnaryOperator<? extends R> function) {
+    public static <R> Closure<R> unaryOperator(UnaryOperator<R> function) {
         return unaryOperator(ReflectionUtils.getCallingClass(), function);
     }
 
@@ -90,7 +91,7 @@ public static <R> Closure<R> unaryOperator(UnaryOperator<? extends R> function)
     /// @param <R>      The return type of the function
     /// @return The closure
     /// @apiNote For instance methods only.
-    public static <R> Closure<R> unaryOperator(Object owner, UnaryOperator<? extends R> function) {
+    public static <R> Closure<R> unaryOperator(Object owner, UnaryOperator<R> function) {
         return function(owner, function);
     }
 
@@ -304,7 +305,7 @@ public Void doCall() {
         }
     }
 
-    private static sealed class Empty extends Closure<Void> permits Running {
+    private static class Empty extends Closure<Void> {
         public Empty(Object owner) {
             super(owner, owner);
         }

gradleutils-shared/src/main/java/net/minecraftforge/gradleutils/shared/EnhancedPlugin.java

@@ -5,8 +5,10 @@
 package net.minecraftforge.gradleutils.shared;
 
 import org.codehaus.groovy.runtime.InvokerHelper;
+import org.gradle.StartParameter;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
+import org.gradle.api.file.BuildLayout;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.invocation.Gradle;
 import org.gradle.api.model.ObjectFactory;
@@ -36,6 +38,12 @@ public abstract class EnhancedPlugin<T> implements Plugin<T> {
      */
     protected abstract @Inject ObjectFactory getObjects();
 
+    /**
+     * @see <a href="https://docs.gradle.org/current/userguide/service_injection.html#buildlayout">BuildLayout
+     * Service Injection</a>
+     */
+    protected abstract @Inject BuildLayout getBuildLayout();
+
     /**
      * @see <a href="https://docs.gradle.org/current/userguide/service_injection.html#providerfactory">ProviderFactory
      * Service Injection</a>
@@ -118,15 +126,15 @@ public final DirectoryProperty globalCaches() {
 
     private DirectoryProperty makeGlobalCaches() {
         try {
-            var startParameter = ((Gradle) InvokerHelper.getPropertySafe(this.target, "gradle")).getStartParameter();
-            var gradleUserHomeDir = this.getObjects().directoryProperty().fileValue(startParameter.getGradleUserHomeDir());
+            StartParameter startParameter = ((Gradle) InvokerHelper.getPropertySafe(this.target, "gradle")).getStartParameter();
+            DirectoryProperty gradleUserHomeDir = this.getObjects().directoryProperty().fileValue(startParameter.getGradleUserHomeDir());
 
             return this.getObjects().directoryProperty().convention(
                 gradleUserHomeDir.dir("caches/minecraftforge/" + this.name).map(this.problemsInternal.ensureFileLocation())
             );
         } catch (Exception e) {
             throw this.problemsInternal.illegalPluginTarget(
-                new IllegalArgumentException("Failed to get %s global caches directory for target: %s".formatted(this.displayName, this.target), e),
+                new IllegalArgumentException(String.format("Failed to get %s global caches directory for target: %s", this.displayName, this.target), e),
                 "types with access to Gradle (#getGradle()Lorg/gradle/api/invocation/Gradle), such as projects or settings."
             );
         }
@@ -149,19 +157,20 @@ public final DirectoryProperty localCaches() {
     private DirectoryProperty makeLocalCaches() {
         try {
             DirectoryProperty workingProjectBuildDir;
-            if (this.target instanceof Project project) {
-                workingProjectBuildDir = project.getLayout().getBuildDirectory();
+            if (this.target instanceof Project) {
+                workingProjectBuildDir = ((Project) this.target).getLayout().getBuildDirectory();
             } else {
-                var startParameter = ((Gradle) InvokerHelper.getPropertySafe(this.target, "gradle")).getStartParameter();
-                workingProjectBuildDir = this.getObjects().directoryProperty().fileValue(new File(Objects.requireNonNullElseGet(startParameter.getProjectDir(), startParameter::getCurrentDir), "build"));
+                StartParameter startParameter = ((Gradle) InvokerHelper.getPropertySafe(this.target, "gradle")).getStartParameter();
+                File projectDir = startParameter.getProjectDir();
+                workingProjectBuildDir = this.getObjects().directoryProperty().fileValue(new File(projectDir != null ? projectDir : this.getBuildLayout().getRootDirectory().getAsFile(), "build"));
             }
 
             return this.getObjects().directoryProperty().convention(
                 workingProjectBuildDir.dir("minecraftforge/" + this.name).map(this.problemsInternal.ensureFileLocation())
             );
         } catch (Exception e) {
             throw this.problemsInternal.illegalPluginTarget(
-                new IllegalArgumentException("Failed to get %s local caches directory for target: %s".formatted(this.displayName, this.getTarget()), e),
+                new IllegalArgumentException(String.format("Failed to get %s local caches directory for target: %s", this.displayName, this.getTarget()), e),
                 "projects or types with access to Gradle (#getGradle()Lorg/gradle/api/invocation/Gradle), such as settings."
             );
         }

gradleutils-shared/src/main/java/net/minecraftforge/gradleutils/shared/EnhancedProblems.java

@@ -26,6 +26,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import javax.inject.Inject;
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Collection;
@@ -107,10 +108,10 @@ public final boolean test(String property) {
     /// @return The exception to throw
     public final RuntimeException illegalPluginTarget(Exception e, Class<?> firstAllowedTarget, Class<?>... allowedTargets) {
         return this.getReporter().throwing(e, id("invalid-plugin-target", "Invalid plugin target"), spec -> spec
-            .details("""
-                Attempted to apply the %s plugin to an invalid target.
-                This plugin can only be applied on the following types:
-                %s""".formatted(this.displayName, Stream.concat(Stream.of(firstAllowedTarget), Stream.of(allowedTargets)).map(Class::getName).collect(Collectors.joining(", ", "[", "]"))))
+            .details(String.format(
+                "Attempted to apply the %s plugin to an invalid target.\n" +
+                "This plugin can only be applied on the following types:\n" +
+                "%s", this.displayName, Stream.concat(Stream.of(firstAllowedTarget), Stream.of(allowedTargets)).map(Class::getName).collect(Collectors.joining(", ", "[", "]"))))
             .severity(Severity.ERROR)
             .stackLocation()
             .solution("Use a valid plugin target.")
@@ -124,9 +125,9 @@ public final RuntimeException illegalPluginTarget(Exception e, Class<?> firstAll
     /// @return The exception to throw
     public final RuntimeException illegalPluginTarget(Exception e, String allowedTargets) {
         return this.getReporter().throwing(e, id("invalid-plugin-target", "Invalid plugin target"), spec -> spec
-            .details("""
-                Attempted to apply the %s plugin to an invalid target.
-                This plugin can only be applied on %s""".formatted(this.displayName, allowedTargets))
+            .details(String.format(
+                "Attempted to apply the %s plugin to an invalid target.\n" +
+                "This plugin can only be applied on %s", this.displayName, allowedTargets))
             .severity(Severity.ERROR)
             .stackLocation()
             .solution("Use a valid plugin target.")
@@ -138,9 +139,9 @@ public final RuntimeException illegalPluginTarget(Exception e, String allowedTar
     /// @param e The exception that was caught, will be re-thrown (or wrapped with a [RuntimeException])
     /// @return The exception to throw
     public final RuntimeException pluginNotYetApplied(Exception e) {
-        return this.getReporter().throwing(e, id("plugin-not-yet-applied", "%s is not applied".formatted(this.displayName)), spec -> spec
-            .details("""
-                Attempted to get details from the %s plugin, but it has not yet been applied to the target.""".formatted(this.displayName))
+        return this.getReporter().throwing(e, id("plugin-not-yet-applied", String.format("%s is not applied", this.displayName)), spec -> spec
+            .details(String.format(
+                "Attempted to get details from the %s plugin, but it has not yet been applied to the target.", this.displayName))
             .severity(Severity.ERROR)
             .stackLocation()
             .solution("Apply the plugin before attempting to use it from the target's plugin manager.")
@@ -157,10 +158,10 @@ public final RuntimeException pluginNotYetApplied(Exception e) {
     /// @param task The affected task
     public final void reportToolExecNotEnhanced(Task task) {
         this.getReporter().report(id("tool-exec-not-enhanced", "ToolExec subclass doesn't implement EnhancedTask"), spec -> spec
-            .details("""
-                Implementing subclass of ToolExecBase should also implement (a subclass of) EnhancedTask.
-                Not doing so will result in global caches being ignored. Please check your implementations.
-                Affected task: %s (%s)""".formatted(task, task.getClass()))
+            .details(String.format(
+                "Implementing subclass of ToolExecBase should also implement (a subclass of) EnhancedTask.\n" +
+                "Not doing so will result in global caches being ignored. Please check your implementations.\n" +
+                "Affected task: %s (%s)", task, task.getClass()))
             .severity(Severity.WARNING)
             .stackLocation()
             .solution("Double check your task implementation."));
@@ -171,9 +172,9 @@ Implementing subclass of ToolExecBase should also implement (a subclass of) Enha
     /// @param task The affected task
     public final void reportToolExecNotEnhanced(Class<?> task) {
         this.getReporter().report(id("enhanced-task-no-plugin", "EnhancedTask doesn't implement #pluginType"), spec -> spec
-            .details("""
-                Implementation of EnhancedTask must implement #pluginType
-                Affected task type: %s""".formatted(task))
+            .details(String.format(
+                "Implementation of EnhancedTask must implement #pluginType\n" +
+                "Affected task type: %s", task))
             .severity(Severity.ERROR)
             .stackLocation()
             .solution("Double check your task implementation."));
@@ -184,10 +185,10 @@ public final void reportToolExecNotEnhanced(Class<?> task) {
     /// @param task The affected task
     public final void reportToolExecEagerArgs(Task task) {
         this.getReporter().report(id("tool-exec-eager-args", "ToolExecBase implementation adds arguments without using addArguments()"), spec -> spec
-            .details("""
-                A ToolExecBase task is eagerly adding arguments using JavaExec#args without using ToolExecBase#addArguments.
-                This may cause implementations or superclasses to have their arguments ignored or missing.
-                Affected task: %s (%s)""".formatted(task, task.getClass()))
+            .details(String.format(
+                "A ToolExecBase task is eagerly adding arguments using JavaExec#args without using ToolExecBase#addArguments.\n" +
+                "This may cause implementations or superclasses to have their arguments ignored or missing.\n" +
+                "Affected task: %s (%s)", task, task.getClass()))
             .severity(Severity.WARNING)
             .stackLocation()
             .solution("Use ToolExecBase#addArguments"));
@@ -203,15 +204,15 @@ public final void reportToolExecEagerArgs(Task task) {
     /// @return The transformer to apply onto a provider
     public final <T extends FileSystemLocation> Transformer<T, T> ensureFileLocation() {
         return file -> {
-            var dir = file instanceof Directory ? file.getAsFile() : file.getAsFile().getParentFile();
+            File dir = file instanceof Directory ? file.getAsFile() : file.getAsFile().getParentFile();
             try {
                 Files.createDirectories(dir.toPath());
             } catch (IOException e) {
                 throw this.getReporter().throwing(e, id("cannot-ensure-directory", "Failed to create directory"), spec -> spec
-                    .details("""
-                        Failed to create a directory required for %s to function.
-                        Directory: %s"""
-                        .formatted(this.displayName, dir.getAbsolutePath()))
+                    .details(String.format(
+                        "Failed to create a directory required for %s to function.\n" +
+                        "Directory: %s",
+                        this.displayName, dir.getAbsolutePath()))
                     .severity(Severity.ERROR)
                     .stackLocation()
                     .solution("Ensure that the you have write access to the directory that needs to be created.")
@@ -264,8 +265,8 @@ default RuntimeException throwing(Throwable exception, Collection<? extends Prob
             return this.toRTE(exception);
         }
 
-        private RuntimeException toRTE(Throwable exception) {
-            return exception instanceof RuntimeException rte ? rte : new RuntimeException(exception);
+        default RuntimeException toRTE(Throwable exception) {
+            return exception instanceof RuntimeException ? (RuntimeException) exception : new RuntimeException(exception);
         }
     }
 
@@ -310,7 +311,7 @@ private Problems unwrapProblems() {
 
     private Predicate<String> unwrapProperties() {
         try {
-            var providers = Objects.requireNonNull(this.getProviders());
+            ProviderFactory providers = Objects.requireNonNull(this.getProviders());
             return property -> isTrue(providers, property);
         } catch (Exception e) {
             return Boolean::getBoolean;

gradleutils-shared/src/main/java/net/minecraftforge/gradleutils/shared/EnhancedTask.java

@@ -11,6 +11,7 @@
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.Internal;
+import org.jetbrains.annotations.VisibleForTesting;
 
 import java.io.File;
 
@@ -21,7 +22,8 @@ public interface EnhancedTask extends Task {
     /// @return The plugin type
     Class<? extends EnhancedPlugin<? super Project>> pluginType();
 
-    private EnhancedPlugin<? super Project> getPlugin() {
+    @VisibleForTesting
+    default @Internal EnhancedPlugin<? super Project> getPlugin() {
         return this.getProject().getPlugins().getPlugin(this.pluginType());
     }
 
@@ -59,6 +61,6 @@ default DirectoryProperty localCaches() {
     /// @param ext The extension to use for the file
     /// @return A provider for the file
     default Provider<RegularFile> getDefaultOutputFile(String ext) {
-        return this.localCaches().file("%s/output.%s".formatted(this.getName(), ext)).map(this.getPlugin().getProblemsInternal().ensureFileLocation());
+        return this.localCaches().file(String.format("%s/output.%s", this.getName(), ext)).map(this.getPlugin().getProblemsInternal().ensureFileLocation());
     }
 }

gradleutils-shared/src/main/java/net/minecraftforge/gradleutils/shared/Lazy.java

@@ -18,7 +18,7 @@
 /// [callables][Callable], as the closure API allows chaining via [Closure#compose(Closure)] and
 /// [Closure#andThen(Closure)]. They can still be created using callables.
 /// @see Actionable
-public sealed class Lazy<T> implements Supplier<T>, Callable<T> permits Lazy.Actionable {
+public class Lazy<T> implements Supplier<T>, Callable<T> {
     /// Creates a simple lazy of the given callable.
     ///
     /// @param <T>      The return type of the callable
@@ -144,7 +144,7 @@ public boolean isPresent() {
         ///
         /// @return The a new actionable lazy copied from this one
         public Actionable<T> copy() {
-            var ret = new Actionable<>(this.closure);
+            Actionable<T> ret = new Actionable<>(this.closure);
             ret.value = this.value;
             ret.present = this.present;
             ret.modifications = this.modifications;