From 6464c7df28bf6231ae7b815e68a21800a316a130 Mon Sep 17 00:00:00 2001 From: Dawid Kreft Date: Tue, 18 Jul 2023 14:29:07 +0200 Subject: [PATCH 1/2] Fix handling of source compatibility with recent Java versions See gh-1443 --- .../buildsystem/gradle/KotlinDslGradleBuildWriter.java | 2 +- .../buildsystem/gradle/KotlinDslGradleBuildWriterTests.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriter.java index 9bd1d866..0227a911 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriter.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriter.java @@ -100,7 +100,7 @@ public class KotlinDslGradleBuildWriter extends GradleBuildWriter { if (generation >= 1 && generation <= 10) { sb.append("VERSION_1_").append(generation); } - else if (generation <= 17) { + else if (generation <= 24) { sb.append("VERSION_").append(generation); } else { diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriterTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriterTests.java index ec7f3a7c..c3b7234e 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriterTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriterTests.java @@ -57,7 +57,7 @@ class KotlinDslGradleBuildWriterTests extends GradleBuildWriterTests { @ParameterizedTest @MethodSource("sourceCompatibilityParameters") - void gradleBuildWithSourceCompatibility15(String sourceCompatibility, String javaVersionConstant) { + void gradleBuildWithSourceCompatibilities(String sourceCompatibility, String javaVersionConstant) { GradleBuild build = new GradleBuild(); build.settings().sourceCompatibility(sourceCompatibility); assertThat(write(build)).contains(""" @@ -82,7 +82,9 @@ class KotlinDslGradleBuildWriterTests extends GradleBuildWriterTests { Arguments.arguments("15", "JavaVersion.VERSION_15"), Arguments.arguments("16", "JavaVersion.VERSION_16"), Arguments.arguments("17", "JavaVersion.VERSION_17"), - Arguments.arguments("18", "JavaVersion.VERSION_HIGHER")); + Arguments.arguments("18", "JavaVersion.VERSION_18"), + Arguments.arguments("24", "JavaVersion.VERSION_24"), + Arguments.arguments("25", "JavaVersion.VERSION_HIGHER")); } @Test From 49acff2a4cccbfb4fe8790c93f8d222a3e3396f6 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 18 Jul 2023 15:11:40 +0200 Subject: [PATCH 2/2] Polish "Fix handling of source compatibility with recent Java versions" See gh-1443 --- .../buildsystem/gradle/KotlinDslGradleBuildWriterTests.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriterTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriterTests.java index c3b7234e..2d4d94b3 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriterTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriterTests.java @@ -83,6 +83,11 @@ class KotlinDslGradleBuildWriterTests extends GradleBuildWriterTests { Arguments.arguments("16", "JavaVersion.VERSION_16"), Arguments.arguments("17", "JavaVersion.VERSION_17"), Arguments.arguments("18", "JavaVersion.VERSION_18"), + Arguments.arguments("19", "JavaVersion.VERSION_19"), + Arguments.arguments("20", "JavaVersion.VERSION_20"), + Arguments.arguments("21", "JavaVersion.VERSION_21"), + Arguments.arguments("22", "JavaVersion.VERSION_22"), + Arguments.arguments("23", "JavaVersion.VERSION_23"), Arguments.arguments("24", "JavaVersion.VERSION_24"), Arguments.arguments("25", "JavaVersion.VERSION_HIGHER")); }