From 3fac2d78e4e5b6f322abcb50ac97162f3583f233 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 8 Feb 2018 10:13:15 +0100 Subject: [PATCH] Fix `freeCompilerArgs` definition in Gradle build Closes gh-593 --- .../main/resources/templates/starter-build.gradle | 12 ++++++++---- .../project/gradle/kotlin-java6-build.gradle.gen | 8 ++++++-- .../project/gradle/kotlin-java7-build.gradle.gen | 8 ++++++-- .../project/gradle/kotlin-java9-build.gradle.gen | 12 ++++++++---- .../gradle/kotlin-springboot2-build.gradle.gen | 12 ++++++++---- .../kotlin-springboot2-legacy-build.gradle.gen | 12 ++++++++---- .../project/kotlin/standard/build.gradle.gen | 12 ++++++++---- .../resources/project/kotlin/war/build.gradle.gen | 12 ++++++++---- 8 files changed, 60 insertions(+), 28 deletions(-) diff --git a/initializr-generator/src/main/resources/templates/starter-build.gradle b/initializr-generator/src/main/resources/templates/starter-build.gradle index cec65b0a..e4382fcd 100644 --- a/initializr-generator/src/main/resources/templates/starter-build.gradle +++ b/initializr-generator/src/main/resources/templates/starter-build.gradle @@ -48,12 +48,16 @@ group = '{{groupId}}' version = '{{version}}' sourceCompatibility = {{javaVersion}}{{#kotlin}} compileKotlin { - freeCompilerArgs = ["-Xjsr305=strict"]{{#java8OrLater}} - kotlinOptions.jvmTarget = "1.8"{{/java8OrLater}} + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"]{{#java8OrLater}} + jvmTarget = "1.8"{{/java8OrLater}} + } } compileTestKotlin { - freeCompilerArgs = ["-Xjsr305=strict"]{{#java8OrLater}} - kotlinOptions.jvmTarget = "1.8"{{/java8OrLater}} + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"]{{#java8OrLater}} + jvmTarget = "1.8"{{/java8OrLater}} + } }{{/kotlin}} repositories { diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-java6-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-java6-build.gradle.gen index c943b316..fd71b5c7 100644 --- a/initializr-generator/src/test/resources/project/gradle/kotlin-java6-build.gradle.gen +++ b/initializr-generator/src/test/resources/project/gradle/kotlin-java6-build.gradle.gen @@ -24,10 +24,14 @@ group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.6 compileKotlin { - freeCompilerArgs = ["-Xjsr305=strict"] + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"] + } } compileTestKotlin { - freeCompilerArgs = ["-Xjsr305=strict"] + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"] + } } repositories { diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen index e31d97e2..63b34211 100644 --- a/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen +++ b/initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen @@ -24,10 +24,14 @@ group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.7 compileKotlin { - freeCompilerArgs = ["-Xjsr305=strict"] + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"] + } } compileTestKotlin { - freeCompilerArgs = ["-Xjsr305=strict"] + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"] + } } repositories { diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen index 0333b188..b1d09779 100644 --- a/initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen +++ b/initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen @@ -25,12 +25,16 @@ group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 9 compileKotlin { - freeCompilerArgs = ["-Xjsr305=strict"] - kotlinOptions.jvmTarget = "1.8" + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"] + jvmTarget = "1.8" + } } compileTestKotlin { - freeCompilerArgs = ["-Xjsr305=strict"] - kotlinOptions.jvmTarget = "1.8" + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"] + jvmTarget = "1.8" + } } repositories { diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen index a9a579df..a107d930 100644 --- a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen +++ b/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen @@ -25,12 +25,16 @@ group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.8 compileKotlin { - freeCompilerArgs = ["-Xjsr305=strict"] - kotlinOptions.jvmTarget = "1.8" + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"] + jvmTarget = "1.8" + } } compileTestKotlin { - freeCompilerArgs = ["-Xjsr305=strict"] - kotlinOptions.jvmTarget = "1.8" + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"] + jvmTarget = "1.8" + } } repositories { diff --git a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen index 69447bd8..e9900b13 100644 --- a/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen +++ b/initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen @@ -25,12 +25,16 @@ group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.8 compileKotlin { - freeCompilerArgs = ["-Xjsr305=strict"] - kotlinOptions.jvmTarget = "1.8" + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"] + jvmTarget = "1.8" + } } compileTestKotlin { - freeCompilerArgs = ["-Xjsr305=strict"] - kotlinOptions.jvmTarget = "1.8" + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"] + jvmTarget = "1.8" + } } repositories { diff --git a/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen b/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen index e90663c8..373d97de 100644 --- a/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen +++ b/initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen @@ -24,12 +24,16 @@ group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.8 compileKotlin { - freeCompilerArgs = ["-Xjsr305=strict"] - kotlinOptions.jvmTarget = "1.8" + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"] + jvmTarget = "1.8" + } } compileTestKotlin { - freeCompilerArgs = ["-Xjsr305=strict"] - kotlinOptions.jvmTarget = "1.8" + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"] + jvmTarget = "1.8" + } } repositories { diff --git a/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen b/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen index 9de16ac1..b2dbeea9 100644 --- a/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen +++ b/initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen @@ -25,12 +25,16 @@ group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = 1.8 compileKotlin { - freeCompilerArgs = ["-Xjsr305=strict"] - kotlinOptions.jvmTarget = "1.8" + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"] + jvmTarget = "1.8" + } } compileTestKotlin { - freeCompilerArgs = ["-Xjsr305=strict"] - kotlinOptions.jvmTarget = "1.8" + kotlinOptions { + freeCompilerArgs = ["-Xjsr305=strict"] + jvmTarget = "1.8" + } } repositories {