Skip to content

Commit 6b7eb43

Browse files
committed
Fix gradle plugin failing when no toolchain version is declared
1 parent 9d3c2d6 commit 6b7eb43

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

at-gradle/src/main/java/net/minecraftforge/accesstransformers/gradle/AccessTransformersContainerImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import groovy.lang.DelegatesTo;
55
import groovy.transform.stc.ClosureParams;
66
import groovy.transform.stc.SimpleType;
7+
import org.gradle.api.JavaVersion;
78
import org.gradle.api.PathValidation;
89
import org.gradle.api.Project;
910
import org.gradle.api.artifacts.Dependency;
@@ -195,7 +196,7 @@ private Provider<String> defaultJavaLauncher() {
195196
final JavaLanguageVersion version = JavaLanguageVersion.of(Constants.AT_MIN_JAVA);
196197

197198
JavaToolchainSpec currentToolchain = java.getToolchain();
198-
Provider<JavaLauncher> launcher = currentToolchain.getLanguageVersion().get().canCompileOrRun(version)
199+
Provider<JavaLauncher> launcher = currentToolchain.getLanguageVersion().getOrElse(JavaLanguageVersion.of(JavaVersion.current().ordinal() + 1)).canCompileOrRun(version)
199200
? javaToolchains.launcherFor(currentToolchain)
200201
: javaToolchains.launcherFor(spec -> spec.getLanguageVersion().set(version));
201202

0 commit comments

Comments
 (0)