Move Kotlin task customization to the bottom

This commit is contained in:
Madhura Bhave 2019-01-08 21:23:49 -08:00 committed by Stephane Nicoll
parent ed5d5398ad
commit 52599b0600
5 changed files with 74 additions and 62 deletions

View File

@ -46,19 +46,7 @@ apply plugin: 'war'
group = '{{groupId}}'
version = '{{version}}'
sourceCompatibility = '{{javaVersion}}'{{#kotlin}}
compileKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']{{#java8OrLater}}
jvmTarget = '1.8'{{/java8OrLater}}
}
}
compileTestKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']{{#java8OrLater}}
jvmTarget = '1.8'{{/java8OrLater}}
}
}{{/kotlin}}
sourceCompatibility = '{{javaVersion}}'
repositories {
mavenCentral()
@ -118,4 +106,20 @@ dependencyManagement {
{{/reversedBoms}}
}
}
{{/hasBoms}}
{{/hasBoms}}
{{#kotlin}}
compileKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']{{#java8OrLater}}
jvmTarget = '1.8'{{/java8OrLater}}
}
}
compileTestKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']{{#java8OrLater}}
jvmTarget = '1.8'{{/java8OrLater}}
}
}
{{/kotlin}}

View File

@ -22,18 +22,6 @@ apply plugin: 'io.spring.dependency-management'
group = 'com.example'
version = '0.0.1-SNAPSHOT'
sourceCompatibility = '11'
compileKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}
compileTestKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}
repositories {
mavenCentral()
@ -45,3 +33,17 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-reflect"
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}
compileKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}
compileTestKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}

View File

@ -21,18 +21,6 @@ apply plugin: 'org.springframework.boot'
group = 'com.example'
version = '0.0.1-SNAPSHOT'
sourceCompatibility = '1.8'
compileKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}
compileTestKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}
repositories {
mavenCentral()
@ -44,3 +32,17 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}"
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}
compileKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}
compileTestKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}

View File

@ -22,18 +22,6 @@ apply plugin: 'io.spring.dependency-management'
group = 'com.example'
version = '0.0.1-SNAPSHOT'
sourceCompatibility = '1.8'
compileKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}
compileTestKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}
repositories {
mavenCentral()
@ -45,3 +33,17 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-reflect"
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}
compileKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}
compileTestKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}

View File

@ -23,18 +23,6 @@ apply plugin: 'war'
group = 'com.example'
version = '0.0.1-SNAPSHOT'
sourceCompatibility = '1.8'
compileKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}
compileTestKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}
repositories {
mavenCentral()
@ -51,3 +39,17 @@ dependencies {
providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}
compileKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}
compileTestKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xjsr305=strict']
jvmTarget = '1.8'
}
}