From 36c7d30f4b05dd9df9be5dc53fba3b4f1605d3bf Mon Sep 17 00:00:00 2001 From: Kamil Szymanski Date: Fri, 16 Dec 2016 17:44:44 +0100 Subject: [PATCH] Remove redundant targetCompatibility from gradle buildscript See gh-330 --- .../src/main/resources/templates/starter-build.gradle | 2 +- .../spring/initializr/test/generator/GradleBuildAssert.groovy | 1 - .../test/resources/project/gradle/bom-property-build.gradle.gen | 2 +- .../project/gradle/compile-only-dependency-build.gradle.gen | 2 +- .../resources/project/gradle/version-override-build.gradle.gen | 2 +- .../src/test/resources/project/groovy/standard/build.gradle.gen | 2 +- .../src/test/resources/project/groovy/war/build.gradle.gen | 2 +- .../src/test/resources/project/java/standard/build.gradle.gen | 2 +- .../src/test/resources/project/java/war/build.gradle.gen | 2 +- .../src/test/resources/project/kotlin/standard/build.gradle.gen | 2 +- .../src/test/resources/project/kotlin/war/build.gradle.gen | 2 +- 11 files changed, 10 insertions(+), 11 deletions(-) diff --git a/initializr-generator/src/main/resources/templates/starter-build.gradle b/initializr-generator/src/main/resources/templates/starter-build.gradle index 62dba40c..146a1699 100644 --- a/initializr-generator/src/main/resources/templates/starter-build.gradle +++ b/initializr-generator/src/main/resources/templates/starter-build.gradle @@ -27,8 +27,8 @@ apply plugin: 'war'<% } %> baseName = '${artifactId}' version = '${version}' } + sourceCompatibility = ${javaVersion} -targetCompatibility = ${javaVersion} repositories { mavenCentral()<% if (repositories) { repositories.each { key, repo -> %> diff --git a/initializr-generator/src/test/groovy/io/spring/initializr/test/generator/GradleBuildAssert.groovy b/initializr-generator/src/test/groovy/io/spring/initializr/test/generator/GradleBuildAssert.groovy index 7edc52df..42505c6d 100644 --- a/initializr-generator/src/test/groovy/io/spring/initializr/test/generator/GradleBuildAssert.groovy +++ b/initializr-generator/src/test/groovy/io/spring/initializr/test/generator/GradleBuildAssert.groovy @@ -57,7 +57,6 @@ class GradleBuildAssert { GradleBuildAssert hasJavaVersion(String javaVersion) { contains("sourceCompatibility = $javaVersion") - contains("targetCompatibility = $javaVersion") } GradleBuildAssert hasSnapshotRepository() { diff --git a/initializr-generator/src/test/resources/project/gradle/bom-property-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/bom-property-build.gradle.gen index cefb83c1..07bfb7a4 100644 --- a/initializr-generator/src/test/resources/project/gradle/bom-property-build.gradle.gen +++ b/initializr-generator/src/test/resources/project/gradle/bom-property-build.gradle.gen @@ -20,8 +20,8 @@ jar { baseName = 'demo' version = '0.0.1-SNAPSHOT' } + sourceCompatibility = 1.8 -targetCompatibility = 1.8 repositories { mavenCentral() diff --git a/initializr-generator/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen index 4d0f4514..3cdc04a0 100644 --- a/initializr-generator/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen +++ b/initializr-generator/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen @@ -20,8 +20,8 @@ jar { baseName = 'demo' version = '0.0.1-SNAPSHOT' } + sourceCompatibility = 1.8 -targetCompatibility = 1.8 repositories { mavenCentral() diff --git a/initializr-generator/src/test/resources/project/gradle/version-override-build.gradle.gen b/initializr-generator/src/test/resources/project/gradle/version-override-build.gradle.gen index 18316806..b168037a 100644 --- a/initializr-generator/src/test/resources/project/gradle/version-override-build.gradle.gen +++ b/initializr-generator/src/test/resources/project/gradle/version-override-build.gradle.gen @@ -20,8 +20,8 @@ jar { baseName = 'demo' version = '0.0.1-SNAPSHOT' } + sourceCompatibility = 1.8 -targetCompatibility = 1.8 repositories { mavenCentral() diff --git a/initializr-generator/src/test/resources/project/groovy/standard/build.gradle.gen b/initializr-generator/src/test/resources/project/groovy/standard/build.gradle.gen index 3d6b96d3..f93e22ba 100644 --- a/initializr-generator/src/test/resources/project/groovy/standard/build.gradle.gen +++ b/initializr-generator/src/test/resources/project/groovy/standard/build.gradle.gen @@ -20,8 +20,8 @@ jar { baseName = 'demo' version = '0.0.1-SNAPSHOT' } + sourceCompatibility = 1.8 -targetCompatibility = 1.8 repositories { mavenCentral() diff --git a/initializr-generator/src/test/resources/project/groovy/war/build.gradle.gen b/initializr-generator/src/test/resources/project/groovy/war/build.gradle.gen index 63fba61e..942f5653 100644 --- a/initializr-generator/src/test/resources/project/groovy/war/build.gradle.gen +++ b/initializr-generator/src/test/resources/project/groovy/war/build.gradle.gen @@ -21,8 +21,8 @@ war { baseName = 'demo' version = '0.0.1-SNAPSHOT' } + sourceCompatibility = 1.8 -targetCompatibility = 1.8 repositories { mavenCentral() diff --git a/initializr-generator/src/test/resources/project/java/standard/build.gradle.gen b/initializr-generator/src/test/resources/project/java/standard/build.gradle.gen index e79e5186..3b84b738 100644 --- a/initializr-generator/src/test/resources/project/java/standard/build.gradle.gen +++ b/initializr-generator/src/test/resources/project/java/standard/build.gradle.gen @@ -20,8 +20,8 @@ jar { baseName = 'demo' version = '0.0.1-SNAPSHOT' } + sourceCompatibility = 1.8 -targetCompatibility = 1.8 repositories { mavenCentral() diff --git a/initializr-generator/src/test/resources/project/java/war/build.gradle.gen b/initializr-generator/src/test/resources/project/java/war/build.gradle.gen index 308c5495..b58bfd24 100644 --- a/initializr-generator/src/test/resources/project/java/war/build.gradle.gen +++ b/initializr-generator/src/test/resources/project/java/war/build.gradle.gen @@ -21,8 +21,8 @@ war { baseName = 'demo' version = '0.0.1-SNAPSHOT' } + sourceCompatibility = 1.8 -targetCompatibility = 1.8 repositories { mavenCentral() 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 096f154d..b2d32fb6 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,8 +24,8 @@ jar { baseName = 'demo' version = '0.0.1-SNAPSHOT' } + sourceCompatibility = 1.8 -targetCompatibility = 1.8 repositories { mavenCentral() 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 4ceaf639..fb4a8469 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,8 +25,8 @@ war { baseName = 'demo' version = '0.0.1-SNAPSHOT' } + sourceCompatibility = 1.8 -targetCompatibility = 1.8 repositories { mavenCentral()