From 16563a6a0a293ac78c913b0a189ce8e2628a212c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 18 Apr 2023 13:20:56 +0200 Subject: [PATCH] Upgrade to Native Build Tools Plugin 0.9.21 Closes gh-35055 --- gradle.properties | 2 +- .../boot/gradle/plugin/NativeImagePluginAction.java | 10 ---------- .../NativeImagePluginActionIntegrationTests.java | 6 ------ 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index a2d30611a16..f4fe7fad0d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,6 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.7.22 tomcatVersion=10.1.7 -nativeBuildToolsVersion=0.9.20 +nativeBuildToolsVersion=0.9.21 kotlin.stdlib.default.dependency=false diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/NativeImagePluginAction.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/NativeImagePluginAction.java index 1ae66ec9592..7526220cb42 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/NativeImagePluginAction.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/NativeImagePluginAction.java @@ -24,7 +24,6 @@ import org.graalvm.buildtools.gradle.NativeImagePlugin; import org.graalvm.buildtools.gradle.dsl.GraalVMExtension; import org.graalvm.buildtools.gradle.dsl.GraalVMReachabilityMetadataRepositoryExtension; import org.gradle.api.Action; -import org.gradle.api.GradleException; import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; @@ -96,15 +95,6 @@ class NativeImagePluginAction implements PluginApplicationAction { private GraalVMExtension configureGraalVmExtension(Project project) { GraalVMExtension extension = project.getExtensions().getByType(GraalVMExtension.class); extension.getToolchainDetection().set(false); - extension.getBinaries().configureEach((options) -> { - try { - options.getRequiredVersion().convention("22.3"); - } - catch (NoSuchMethodError ex) { - throw new GradleException("Incompatible version of org.graalvm.buildtools.native plugin. " - + "Please upgrade to 0.9.17 or later."); - } - }); return extension; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java index e25e6c04557..877fc0ec242 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java @@ -115,12 +115,6 @@ class NativeImagePluginActionIntegrationTests { projectPath("build/resources/aotTest"), projectPath("build/generated/aotTestClasses")); } - @TestTemplate - void nativeImageBinariesRequireGraal22Dot3() { - BuildResult result = this.gradleBuild.build("requiredGraalVersion"); - assertThat(result.getOutput()).contains("custom: 22.3", "main: 22.3", "test: 22.3"); - } - private String projectPath(String path) { try { return new File(this.gradleBuild.getProjectDir(), path).getCanonicalPath();