Fix ToolchainPlugin

jvalkeal · jvalkeal · commit f5521b7bf394 · 2024-08-30T09:20:50.000+01:00
- Change toolchain to get configured immediately instead after project evaluation which somehow caused i.e. vscode not detect correct project jdk in use. - Relates #1131
diff --git a/buildSrc/src/main/java/org/springframework/shell/gradle/ToolchainPlugin.java b/buildSrc/src/main/java/org/springframework/shell/gradle/ToolchainPlugin.java
@@ -30,7 +30,7 @@ public void apply(Project project) {
 
 	private void configureToolchain(Project project) {
 		ToolchainExtension toolchain = project.getExtensions().create("toolchain", ToolchainExtension.class, project);
-		project.afterEvaluate((evaluated) -> configure(evaluated, toolchain));
+		configure(project, toolchain);
 	}
 
 	private void configure(Project project, ToolchainExtension toolchain) {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public void apply(Project project) {`
`30`	`30`
`31`	`31`	`private void configureToolchain(Project project) {`
`32`	`32`	`ToolchainExtension toolchain = project.getExtensions().create("toolchain", ToolchainExtension.class, project);`
`33`		`- project.afterEvaluate((evaluated) -> configure(evaluated, toolchain));`
	`33`	`+ configure(project, toolchain);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`private void configure(Project project, ToolchainExtension toolchain) {`