@@ -6,12 +6,13 @@ package net.minecraftforge.gradleutils
66
77import groovy.transform.CompileStatic
88import groovy.transform.PackageScope
9- import net.minecraftforge.gradleutils.shared.SharedUtil
109import org.gradle.api.Action
1110import org.gradle.api.Project
1211import org.gradle.api.artifacts.repositories.MavenArtifactRepository
1312import org.gradle.api.file.Directory
1413import org.gradle.api.file.DirectoryProperty
14+ import org.gradle.api.flow.FlowProviders
15+ import org.gradle.api.flow.FlowScope
1516import org.gradle.api.model.ObjectFactory
1617import org.gradle.api.plugins.ExtensionAware
1718import org.gradle.api.provider.Property
@@ -26,10 +27,6 @@ import static net.minecraftforge.gradleutils.GradleUtilsPlugin.LOGGER
2627
2728@CompileStatic
2829@PackageScope abstract class GradleUtilsExtensionImpl implements GradleUtilsExtensionInternal {
29- protected abstract @Inject ObjectFactory getObjects ()
30- protected abstract @Inject BuildLayout getBuildLayout ()
31- protected abstract @Inject ProviderFactory getProviders ()
32-
3330 private final DirectoryProperty rootDirectory
3431
3532 private final Property<String > mavenUser
@@ -38,16 +35,29 @@ import static net.minecraftforge.gradleutils.GradleUtilsPlugin.LOGGER
3835
3936 final PomUtils pom
4037
38+ protected abstract @Inject ObjectFactory getObjects ()
39+ protected abstract @Inject BuildLayout getBuildLayout ()
40+ protected abstract @Inject ProviderFactory getProviders ()
41+
42+ protected abstract @Inject FlowScope getFlowScope ()
43+ protected abstract @Inject FlowProviders getFlowProviders ()
44+
4145 @Inject
4246 GradleUtilsExtensionImpl (ExtensionAware target ) {
4347 this . rootDirectory = this . objects. directoryProperty(). fileValue(this . buildLayout. rootDirectory)
4448
45- this . mavenUser = this . objects. property(String ). value(this . providers. environmentVariable(' MAVEN_USER' )). tap(SharedUtil . finalizeProperty())
46- this . mavenPassword = this . objects. property(String ). value(this . providers. environmentVariable(' MAVEN_PASSWORD' )). tap(SharedUtil . finalizeProperty())
47- this . mavenUrl = this . objects. property(String ). value(this . providers. environmentVariable(' MAVEN_URL' ). orElse(this . providers. environmentVariable(' MAVEN_URL_RELEASE' ))). tap(SharedUtil . finalizeProperty())
49+ this . mavenUser = this . objects. property(String ). value(this . providers. environmentVariable(' MAVEN_USER' )). tap(Util . finalizeProperty())
50+ this . mavenPassword = this . objects. property(String ). value(this . providers. environmentVariable(' MAVEN_PASSWORD' )). tap(Util . finalizeProperty())
51+ this . mavenUrl = this . objects. property(String ). value(this . providers. environmentVariable(' MAVEN_URL' ). orElse(this . providers. environmentVariable(' MAVEN_URL_RELEASE' ))). tap(Util . finalizeProperty())
4852
4953 this . pom = this . objects. newInstance(PomUtilsImpl , target)
5054
55+ this . flowScope. always(GradleUtilsFlowAction.JavadocLinksClassCheck ) {
56+ it. parameters { parameters ->
57+ parameters. failure. set(this . flowProviders. buildWorkResult. map { it. failure. orElse(null ) })
58+ }
59+ }
60+
5161 if (target instanceof Project ) {
5262 target. tasks. register(GenerateActionsWorkflow . NAME , GenerateActionsWorkflowImpl )
5363 }
0 commit comments