Skip to content

Commit df609f4

Browse files
committed
Upgrade to Native Build Tools 0.11.0
Closes gh-46501
1 parent 1b3e9e6 commit df609f4

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibility.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
*/
4949
boolean configurationCache() default false;
5050

51-
String versionsLessThan() default "";
51+
/**
52+
* Minimum version of Gradle against which compatibility should be tested.
53+
* @return minimum version
54+
*/
55+
String minimumVersion() default "";
5256

5357
}

build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
5959
GradleCompatibility gradleCompatibility = AnnotationUtils.findAnnotation(testClass, GradleCompatibility.class)
6060
.get();
6161
Stream<String> gradleVersions = GRADLE_VERSIONS.stream();
62-
if (StringUtils.hasText(gradleCompatibility.versionsLessThan())) {
63-
GradleVersion upperExclusive = GradleVersion.version(gradleCompatibility.versionsLessThan());
62+
if (StringUtils.hasText(gradleCompatibility.minimumVersion())) {
63+
GradleVersion lowerInclusive = GradleVersion.version(gradleCompatibility.minimumVersion());
6464
gradleVersions = gradleVersions
65-
.filter((version) -> GradleVersion.version(version).compareTo(upperExclusive) < 0);
65+
.filter((version) -> GradleVersion.version(version).compareTo(lowerInclusive) >= 0);
6666
}
6767
return gradleVersions.flatMap((version) -> {
6868
List<TestTemplateInvocationContext> invocationContexts = new ArrayList<>();

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
* @author Andy Wilkinson
4444
* @author Scott Frederick
4545
*/
46-
@GradleCompatibility
46+
@GradleCompatibility(minimumVersion = "8.3")
4747
class NativeImagePluginActionIntegrationTests {
4848

4949
GradleBuild gradleBuild;
@@ -111,7 +111,9 @@ void classesGeneratedDuringAotProcessingAreOnTheNativeImageClasspath() {
111111

112112
@TestTemplate
113113
void classesGeneratedDuringAotTestProcessingAreOnTheTestNativeImageClasspath() {
114-
BuildResult result = this.gradleBuild.build("checkTestNativeImageClasspath");
114+
BuildResult result = this.gradleBuild
115+
.scriptProperty("junitVersion", TestTemplate.class.getPackage().getImplementationVersion())
116+
.build("checkTestNativeImageClasspath");
115117
assertThat(result.getOutput()).contains(projectPath("build/classes/java/aotTest"),
116118
projectPath("build/resources/aotTest"), projectPath("build/generated/aotTestClasses"));
117119
}

build-plugin/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests-classesGeneratedDuringAotTestProcessingAreOnTheTestNativeImageClasspath.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ repositories {
2525
mavenCentral()
2626
}
2727

28+
dependencies {
29+
testImplementation("org.junit.jupiter:junit-jupiter:{junitVersion}")
30+
}
31+
2832
task('checkTestNativeImageClasspath') {
2933
doFirst {
3034
tasks.nativeTestCompile.options.get().classpath.each { println it }

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ junitJupiterVersion=5.13.4
1717
kotlinVersion=2.2.0
1818
mavenVersion=3.9.10
1919
mockitoVersion=5.18.0
20-
nativeBuildToolsVersion=0.10.6
20+
nativeBuildToolsVersion=0.11.0
2121
snakeYamlVersion=2.4
2222
springFrameworkVersion=7.0.0-M7
2323
springFramework60xVersion=6.0.23

0 commit comments

Comments
 (0)