Inject services inside task constructor

Author: MartelliEnrico

.editorconfig

@@ -18,7 +18,7 @@ ij_wrap_on_typing = false
 
 [*.java]
 indent_style = tab
-ij_java_imports_layout = $*,|,*,|,javax.**,java.**,|
+ij_java_imports_layout = $*, |, *, |, javax.**, java.**, |, @*
 ij_java_names_count_to_use_import_on_demand = 999
 ij_java_class_count_to_use_import_on_demand = 999
 ij_java_align_consecutive_assignments = false

buildSrc/src/main/java/com/github/stickerifier/stickerify/JlinkTask.java

@@ -3,6 +3,7 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.FileSystemOperations;
+import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.logging.LogLevel;
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.provider.ListProperty;
@@ -14,6 +15,7 @@
 import org.gradle.jvm.toolchain.JavaCompiler;
 import org.gradle.jvm.toolchain.JavaToolchainService;
 import org.gradle.process.ExecOperations;
+import org.jetbrains.annotations.NotNull;
 
 import javax.inject.Inject;
 import java.io.ByteArrayOutputStream;
@@ -23,33 +25,31 @@
 public abstract class JlinkTask extends DefaultTask {
 
 	@Input
-	public abstract ListProperty<String> getOptions();
+	public abstract ListProperty<@NotNull String> getOptions();
 
 	@Input
-	public abstract ListProperty<String> getModules();
+	public abstract ListProperty<@NotNull String> getModules();
 
 	@OutputDirectory
 	public abstract DirectoryProperty getOutputDirectory();
 
 	@Nested
-	protected abstract Property<JavaCompiler> getJavaCompiler();
-
-	@Inject
-	protected abstract JavaToolchainService getJavaToolchainService();
+	protected abstract Property<@NotNull JavaCompiler> getJavaCompiler();
 
 	@Inject
 	protected abstract FileSystemOperations getFs();
 
 	@Inject
 	protected abstract ExecOperations getExec();
 
-	public JlinkTask() {
+	@Inject
+	public JlinkTask(ProjectLayout layout, JavaToolchainService javaToolchain) {
 		getOptions().convention(List.of());
 		getModules().convention(List.of("ALL-MODULE-PATH"));
-		getOutputDirectory().convention(getProject().getLayout().getBuildDirectory().dir("jlink"));
+		getOutputDirectory().convention(layout.getBuildDirectory().dir("jlink"));
 
 		var toolchain = getProject().getExtensions().getByType(JavaPluginExtension.class).getToolchain();
-		getJavaCompiler().convention(getJavaToolchainService().compilerFor(toolchain));
+		getJavaCompiler().convention(javaToolchain.compilerFor(toolchain));
 	}
 
 	@TaskAction