Skip to content

Commit 3a88914

Browse files
committed
Fix ToolExecBase tasks not serializing with the config cache
1 parent f7cff0a commit 3a88914

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@
99
import org.gradle.api.file.FileSystemLocation;
1010
import org.gradle.api.file.FileSystemLocationProperty;
1111
import org.gradle.api.file.ProjectLayout;
12+
import org.gradle.api.logging.LogLevel;
13+
import org.gradle.api.logging.LoggingManager;
1214
import org.gradle.api.provider.ListProperty;
15+
import org.gradle.api.provider.Property;
1316
import org.gradle.api.provider.Provider;
1417
import org.gradle.api.specs.Spec;
18+
import org.gradle.api.tasks.Console;
1519
import org.gradle.api.tasks.Input;
1620
import org.gradle.api.tasks.Internal;
1721
import org.gradle.api.tasks.JavaExec;
@@ -23,6 +27,7 @@
2327

2428
import javax.inject.Inject;
2529
import java.io.File;
30+
import java.io.OutputStream;
2631
import java.util.Locale;
2732
import java.util.Map;
2833
import java.util.concurrent.Callable;
@@ -94,8 +99,7 @@ protected ToolExecBase(Class<P> problemsType, Tool tool) {
9499
this.getMainClass().set(resolved.getMainClass());
95100
this.getJavaLauncher().set(resolved.getJavaLauncher());
96101

97-
this.setStandardOutput(SharedUtil.toLog(this.getLogger()::lifecycle));
98-
this.setErrorOutput(SharedUtil.toLog(this.getLogger()::error));
102+
this.getLogging().captureStandardOutput(LogLevel.LIFECYCLE).captureStandardError(LogLevel.ERROR);
99103
}
100104

101105
/// The enhanced problems instance to use for this task.

settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins {
1414
id 'io.freefair.javadoc-links' version '8.14' apply false // https://plugins.gradle.org/plugin/io.freefair.javadoc-links
1515

1616
id 'net.minecraftforge.gradleutils' version '3.2.0' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
17-
id 'net.minecraftforge.gitversion' version '3.0.6' // https://plugins.gradle.org/plugin/net.minecraftforge.gitversion
17+
id 'net.minecraftforge.gitversion' version '3.0.2' // https://plugins.gradle.org/plugin/net.minecraftforge.gitversion
1818
}
1919

2020
rootProject.name = 'gradleutils'
@@ -34,7 +34,7 @@ dependencyResolutionManagement {
3434
version 'gradle-javadoc-links', '8.14'
3535

3636
plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0' // https://plugins.gradle.org/plugin/net.minecraftforge.licenser
37-
plugin 'changelog', 'net.minecraftforge.changelog' version '3.0.5' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
37+
plugin 'changelog', 'net.minecraftforge.changelog' version '3.0.2' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
3838
plugin 'plugin-publish', 'com.gradle.plugin-publish' version '1.3.1' // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
3939
plugin 'shadow', 'com.gradleup.shadow' version '9.0.2' // https://plugins.gradle.org/plugin/com.gradleup.shadow
4040

0 commit comments

Comments
 (0)