lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2026-02-25 21:22:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1443 from dawidkreft

Browse Source 
* pr/1443:
  Polish "Fix handling of source compatibility with recent Java versions"
  Fix handling of source compatibility with recent Java versions

Closes gh-1443
This commit is contained in:
Stephane Nicoll
2023-07-18 15:16:48 +02:00
parent 68ca360125 49acff2a4c
commit 9da2820126
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriter.java
View File

@@ -100,7 +100,7 @@ public class KotlinDslGradleBuildWriter extends GradleBuildWriter {
if (generation >= 1 && generation <= 10) { if (generation >= 1 && generation <= 10) {
sb.append("VERSION_1_").append(generation); sb.append("VERSION_1_").append(generation);
} }
else if (generation <= 17) { else if (generation <= 24) {
sb.append("VERSION_").append(generation); sb.append("VERSION_").append(generation);
} }
else { else {

11
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriterTests.java
View File

@@ -57,7 +57,7 @@ class KotlinDslGradleBuildWriterTests extends GradleBuildWriterTests {
@ParameterizedTest @ParameterizedTest
@MethodSource("sourceCompatibilityParameters") @MethodSource("sourceCompatibilityParameters")
void gradleBuildWithSourceCompatibility15(String sourceCompatibility, String javaVersionConstant) { void gradleBuildWithSourceCompatibilities(String sourceCompatibility, String javaVersionConstant) {
GradleBuild build = new GradleBuild(); GradleBuild build = new GradleBuild();
build.settings().sourceCompatibility(sourceCompatibility); build.settings().sourceCompatibility(sourceCompatibility);
assertThat(write(build)).contains(""" assertThat(write(build)).contains("""
@@ -82,7 +82,14 @@ class KotlinDslGradleBuildWriterTests extends GradleBuildWriterTests {
Arguments.arguments("15", "JavaVersion.VERSION_15"), Arguments.arguments("15", "JavaVersion.VERSION_15"),
Arguments.arguments("16", "JavaVersion.VERSION_16"), Arguments.arguments("16", "JavaVersion.VERSION_16"),
Arguments.arguments("17", "JavaVersion.VERSION_17"), Arguments.arguments("17", "JavaVersion.VERSION_17"),
Arguments.arguments("18", "JavaVersion.VERSION_HIGHER")); 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"));
} }
@Test @Test