Skip to content

Commit d5756db

Browse files
committed
Stop using Native Build Tools "requiredVersion" configuration option
Closes spring-projectsgh-34840
1 parent d2451ce commit d5756db

File tree

3 files changed

+0
-41
lines changed

3 files changed

+0
-41
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/NativeImagePluginAction.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.graalvm.buildtools.gradle.dsl.GraalVMExtension;
2525
import org.graalvm.buildtools.gradle.dsl.GraalVMReachabilityMetadataRepositoryExtension;
2626
import org.gradle.api.Action;
27-
import org.gradle.api.GradleException;
2827
import org.gradle.api.Plugin;
2928
import org.gradle.api.Project;
3029
import org.gradle.api.artifacts.Configuration;
@@ -96,15 +95,6 @@ private void configureTestNativeBinaryClasspath(Project project, SourceSetContai
9695
private GraalVMExtension configureGraalVmExtension(Project project) {
9796
GraalVMExtension extension = project.getExtensions().getByType(GraalVMExtension.class);
9897
extension.getToolchainDetection().set(false);
99-
extension.getBinaries().configureEach((options) -> {
100-
try {
101-
options.getRequiredVersion().convention("22.3");
102-
}
103-
catch (NoSuchMethodError ex) {
104-
throw new GradleException("Incompatible version of org.graalvm.buildtools.native plugin. "
105-
+ "Please upgrade to 0.9.17 or later.");
106-
}
107-
});
10898
return extension;
10999
}
110100

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,6 @@ void classesGeneratedDuringAotTestProcessingAreOnTheTestNativeImageClasspath() {
115115
projectPath("build/resources/aotTest"), projectPath("build/generated/aotTestClasses"));
116116
}
117117

118-
@TestTemplate
119-
void nativeImageBinariesRequireGraal22Dot3() {
120-
BuildResult result = this.gradleBuild.build("requiredGraalVersion");
121-
assertThat(result.getOutput()).contains("custom: 22.3", "main: 22.3", "test: 22.3");
122-
}
123-
124118
private String projectPath(String path) {
125119
try {
126120
return new File(this.gradleBuild.getProjectDir(), path).getCanonicalPath();

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests-nativeImageBinariesRequireGraal22Dot3.gradle

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)