From a0d98918c5a567eb0b624b71a46680c41cd2fc22 Mon Sep 17 00:00:00 2001 From: Prithvi singh Date: Tue, 13 Jun 2023 09:56:57 +0530 Subject: [PATCH] Use Java configuration for Gradle build See gh-1427 --- ...KtsProjectGenerationConfigurationTests.java | 5 ++++- ...dleProjectGenerationConfigurationTests.java | 5 ++++- ...ation-processor-dependency-build.gradle.gen | 5 ++++- ...n-processor-dependency-build.gradle.kts.gen | 5 ++++- .../gradle/bom-ordering-build.gradle.gen | 5 ++++- .../gradle/bom-ordering-build.gradle.kts.gen | 5 ++++- .../gradle/bom-property-build.gradle.gen | 5 ++++- .../gradle/bom-property-build.gradle.kts.gen | 5 ++++- .../compile-only-dependency-build.gradle.gen | 5 ++++- ...ompile-only-dependency-build.gradle.kts.gen | 5 ++++- .../gradle/kotlin-java11-build.gradle.gen | 5 ++++- .../gradle/kotlin-java11-build.gradle.kts.gen | 5 ++++- .../gradle/repositories-build.gradle.gen | 5 ++++- .../gradle/repositories-build.gradle.kts.gen | 5 ++++- .../repositories-milestone-build.gradle.gen | 5 ++++- ...repositories-milestone-build.gradle.kts.gen | 5 ++++- .../gradle/version-override-build.gradle.gen | 5 ++++- .../version-override-build.gradle.kts.gen | 5 ++++- .../project/groovy/next/build.gradle.gen | 5 ++++- .../project/groovy/next/build.gradle.kts.gen | 5 ++++- .../project/groovy/standard/build.gradle.gen | 5 ++++- .../groovy/standard/build.gradle.kts.gen | 5 ++++- .../groovy/standard/war-build.gradle.gen | 5 ++++- .../groovy/standard/war-build.gradle.kts.gen | 5 ++++- .../project/java/standard/build.gradle.gen | 5 ++++- .../project/java/standard/build.gradle.kts.gen | 5 ++++- .../project/java/standard/war-build.gradle.gen | 5 ++++- .../java/standard/war-build.gradle.kts.gen | 5 ++++- .../project/kotlin/standard/build.gradle.gen | 5 ++++- .../kotlin/standard/build.gradle.kts.gen | 5 ++++- .../kotlin/standard/war-build.gradle.gen | 5 ++++- .../kotlin/standard/war-build.gradle.kts.gen | 5 ++++- .../buildsystem/gradle/GradleBuildWriter.java | 1 + .../gradle/GroovyDslGradleBuildWriter.java | 5 ++++- .../gradle/KotlinDslGradleBuildWriter.java | 5 ++++- .../gradle/GradleBuildWriterTests.java | 18 ++++++++++++++++++ .../GroovyDslGradleBuildWriterTests.java | 3 ++- .../KotlinDslGradleBuildWriterTests.java | 3 ++- 38 files changed, 159 insertions(+), 36 deletions(-) diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java index fda0482b..175b4983 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java @@ -120,7 +120,10 @@ class GradleKtsProjectGenerationConfigurationTests { "", "group = \"com.example\"", "version = \"0.0.1-SNAPSHOT\"", - "java.sourceCompatibility = JavaVersion.VERSION_11", + "", + "java {", + " sourceCompatibility = JavaVersion.VERSION_11", + "}", "", "repositories {", " mavenCentral()", diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java index 08789ada..c96eeedb 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java @@ -118,7 +118,10 @@ class GradleProjectGenerationConfigurationTests { "", "group = 'com.example'", "version = '0.0.1-SNAPSHOT'", - "sourceCompatibility = '11'", + "", + "java {", + " sourceCompatibility = '11'", + "}", "", "repositories {", " mavenCentral()", diff --git a/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen index f348fa12..5236b21e 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen @@ -6,7 +6,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' + +java { + sourceCompatibility = '1.8' +} configurations { compileOnly { diff --git a/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.kts.gen index 703b8ab8..7045c0f4 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.kts.gen @@ -6,7 +6,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 +} configurations { compileOnly { diff --git a/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.gen index 52fb817c..4666ce62 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.gen @@ -6,7 +6,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' + +java { + sourceCompatibility = '1.8' +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.kts.gen index 1f64ec9c..a6882a01 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.kts.gen @@ -6,7 +6,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.gen index ca9b137b..e98422cc 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.gen @@ -6,7 +6,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' + +java { + sourceCompatibility = '1.8' +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.kts.gen index 78de4599..dd88f968 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.kts.gen @@ -6,7 +6,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen index 39772f55..53bc9a39 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen @@ -6,7 +6,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' + +java { + sourceCompatibility = '1.8' +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.kts.gen index cd1586d9..060d6d13 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.kts.gen @@ -6,7 +6,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen index 38fcf07c..a3489557 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen @@ -9,7 +9,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '11' + +java { + sourceCompatibility = '11' +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.kts.gen index b0b1d177..5358d4cf 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.kts.gen @@ -9,7 +9,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_11 + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.gen index 44423279..26f90231 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.gen @@ -6,7 +6,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' + +java { + sourceCompatibility = '1.8' +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.kts.gen index 2c7a9573..7cb95353 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.kts.gen @@ -6,7 +6,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen index 12fb53df..daa52b22 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen @@ -6,7 +6,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' + +java { + sourceCompatibility = '1.8' +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen index 2c2e88c4..4a5db0b5 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen @@ -6,7 +6,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.gen index 797c0ab8..8212241f 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.gen @@ -6,7 +6,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' + +java { + sourceCompatibility = '1.8' +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.kts.gen index 3f96b259..ab2e1487 100644 --- a/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.kts.gen @@ -6,7 +6,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.gen index 2cbad42c..eeb89e67 100644 --- a/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.gen @@ -6,7 +6,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '17' + +java { + sourceCompatibility = '17' +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.kts.gen index c92ad510..a5b9949b 100644 --- a/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.kts.gen @@ -6,7 +6,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_17 + +java { + sourceCompatibility = JavaVersion.VERSION_17 +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.gen index 70b44f22..7d8de8dd 100644 --- a/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.gen @@ -6,7 +6,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' + +java { + sourceCompatibility = '1.8' +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.kts.gen index c408c004..f611081f 100644 --- a/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.kts.gen @@ -6,7 +6,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.gen index 8996f233..b01d0e82 100644 --- a/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.gen @@ -7,7 +7,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' + +java { + sourceCompatibility = '1.8' +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.kts.gen index ae0db278..15c7c83b 100644 --- a/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.kts.gen @@ -7,7 +7,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.gen index 09a48f63..f9a42f44 100644 --- a/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.gen @@ -6,7 +6,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' + +java { + sourceCompatibility = '1.8' +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.kts.gen index 164c2623..67256eff 100644 --- a/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.kts.gen @@ -6,7 +6,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.gen index cf6bb1b6..02fc6b87 100644 --- a/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.gen @@ -7,7 +7,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' + +java { + sourceCompatibility = '1.8' +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.kts.gen index 1aca7305..5b2474f1 100644 --- a/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.kts.gen @@ -7,7 +7,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.gen index e0cb72ee..9193faa6 100644 --- a/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.gen @@ -9,7 +9,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' + +java { + sourceCompatibility = '1.8' +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.kts.gen index 1477f21a..cd902b41 100644 --- a/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.kts.gen @@ -9,7 +9,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen index e71a201c..a457368f 100644 --- a/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen +++ b/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen @@ -10,7 +10,10 @@ plugins { group = 'com.example' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '1.8' + +java { + sourceCompatibility = '1.8' +} repositories { mavenCentral() diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.kts.gen index 225eaf03..67c1a138 100644 --- a/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.kts.gen +++ b/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.kts.gen @@ -10,7 +10,10 @@ plugins { group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 +} repositories { mavenCentral() diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java index f328926f..38fb371e 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java @@ -65,6 +65,7 @@ public abstract class GradleBuildWriter { writePlugins(writer, build); writeProperty(writer, "group", settings.getGroup()); writeProperty(writer, "version", settings.getVersion()); + writer.println(); writeJavaSourceCompatibility(writer, settings); writer.println(); writeConfigurations(writer, build.configurations()); diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriter.java index c3e7639f..5442a564 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriter.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriter.java @@ -88,7 +88,10 @@ public class GroovyDslGradleBuildWriter extends GradleBuildWriter { @Override protected void writeJavaSourceCompatibility(IndentingWriter writer, GradleBuildSettings settings) { - writeProperty(writer, "sourceCompatibility", settings.getSourceCompatibility()); + writer.println("java {"); + writer.indented( + () -> writer.println(String.format("sourceCompatibility = '%s'", settings.getSourceCompatibility()))); + writer.println("}"); } @Override 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 17a27ef0..c4a2586a 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 @@ -82,7 +82,10 @@ public class KotlinDslGradleBuildWriter extends GradleBuildWriter { @Override protected void writeJavaSourceCompatibility(IndentingWriter writer, GradleBuildSettings settings) { - writer.println("java.sourceCompatibility = " + getJavaVersionConstant(settings.getSourceCompatibility())); + writer.println("java {"); + writer.indented(() -> writer.println( + String.format("sourceCompatibility = %s", getJavaVersionConstant(settings.getSourceCompatibility())))); + writer.println("}"); } private String getJavaVersionConstant(String jvmVersion) { diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriterTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriterTests.java index bf8bc74d..eaac194c 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriterTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriterTests.java @@ -16,8 +16,11 @@ package io.spring.initializr.generator.buildsystem.gradle; +import java.io.StringWriter; import java.util.Set; +import io.spring.initializr.generator.io.IndentingWriter; +import io.spring.initializr.generator.io.SimpleIndentStrategy; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -90,4 +93,19 @@ public abstract class GradleBuildWriterTests { protected abstract String write(GradleBuild build); + /** + * A helper method that tests if java configuration is written properly + * @param format in which source compatibility must be written + * @param jvmVersion for the java + * @return the string representation for java configuration + */ + protected String javaConfigurationWriter(String format, String jvmVersion) { + StringWriter stringWriter = new StringWriter(); + IndentingWriter writer = new IndentingWriter(stringWriter, new SimpleIndentStrategy("\t")); + writer.println("java {"); + writer.indented(() -> writer.println(String.format(format, jvmVersion))); + writer.println("}"); + return stringWriter.toString().replace("\r\n", "\n"); + } + } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriterTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriterTests.java index 42ee75e9..96470846 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriterTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriterTests.java @@ -52,7 +52,8 @@ class GroovyDslGradleBuildWriterTests extends GradleBuildWriterTests { void gradleBuildWithSourceCompatibility() { GradleBuild build = new GradleBuild(); build.settings().sourceCompatibility("11"); - assertThat(write(build).lines()).contains("sourceCompatibility = '11'"); + String javaConfiguration = javaConfigurationWriter("sourceCompatibility = '%s'", "11"); + assertThat(write(build)).contains(javaConfiguration); } @Test 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 dd2ba537..d8929dcb 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 @@ -60,7 +60,8 @@ class KotlinDslGradleBuildWriterTests extends GradleBuildWriterTests { void gradleBuildWithSourceCompatibility15(String sourceCompatibility, String javaVersionConstant) { GradleBuild build = new GradleBuild(); build.settings().sourceCompatibility(sourceCompatibility); - assertThat(write(build)).contains("java.sourceCompatibility = " + javaVersionConstant); + String javaConfiguration = javaConfigurationWriter("sourceCompatibility = %s", javaVersionConstant); + assertThat(write(build)).contains(javaConfiguration); } static Stream sourceCompatibilityParameters() {