Enable strict null-safety for Kotlin projects

Closes gh-591
This commit is contained in:
Stephane Nicoll
2018-02-07 16:13:48 +01:00
parent ba164fc6df
commit e58b7bf701
16 changed files with 52 additions and 4 deletions

View File

@@ -46,13 +46,15 @@ apply plugin: 'war'
group = '{{groupId}}' group = '{{groupId}}'
version = '{{version}}' version = '{{version}}'
sourceCompatibility = {{javaVersion}}{{#kotlin}}{{#java8OrLater}} sourceCompatibility = {{javaVersion}}{{#kotlin}}
compileKotlin { compileKotlin {
kotlinOptions.jvmTarget = "1.8" freeCompilerArgs = ["-Xjsr305=strict"]{{#java8OrLater}}
kotlinOptions.jvmTarget = "1.8"{{/java8OrLater}}
} }
compileTestKotlin { compileTestKotlin {
kotlinOptions.jvmTarget = "1.8" freeCompilerArgs = ["-Xjsr305=strict"]{{#java8OrLater}}
}{{/java8OrLater}}{{/kotlin}} kotlinOptions.jvmTarget = "1.8"{{/java8OrLater}}
}{{/kotlin}}
repositories { repositories {
mavenCentral() mavenCentral()

View File

@@ -177,6 +177,9 @@
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
{{/kotlinSupport}} {{/kotlinSupport}}
<configuration> <configuration>
<args>
<arg>-Xjsr305=strict</arg>
</args>
<compilerPlugins> <compilerPlugins>
<plugin>spring</plugin> <plugin>spring</plugin>
</compilerPlugins> </compilerPlugins>

View File

@@ -23,6 +23,12 @@ apply plugin: 'io.spring.dependency-management'
group = 'com.example' group = 'com.example'
version = '0.0.1-SNAPSHOT' version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.6 sourceCompatibility = 1.6
compileKotlin {
freeCompilerArgs = ["-Xjsr305=strict"]
}
compileTestKotlin {
freeCompilerArgs = ["-Xjsr305=strict"]
}
repositories { repositories {
mavenCentral() mavenCentral()

View File

@@ -23,6 +23,12 @@ apply plugin: 'io.spring.dependency-management'
group = 'com.example' group = 'com.example'
version = '0.0.1-SNAPSHOT' version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.7 sourceCompatibility = 1.7
compileKotlin {
freeCompilerArgs = ["-Xjsr305=strict"]
}
compileTestKotlin {
freeCompilerArgs = ["-Xjsr305=strict"]
}
repositories { repositories {
mavenCentral() mavenCentral()

View File

@@ -25,9 +25,11 @@ group = 'com.example'
version = '0.0.1-SNAPSHOT' version = '0.0.1-SNAPSHOT'
sourceCompatibility = 9 sourceCompatibility = 9
compileKotlin { compileKotlin {
freeCompilerArgs = ["-Xjsr305=strict"]
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }
compileTestKotlin { compileTestKotlin {
freeCompilerArgs = ["-Xjsr305=strict"]
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }

View File

@@ -25,9 +25,11 @@ group = 'com.example'
version = '0.0.1-SNAPSHOT' version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8 sourceCompatibility = 1.8
compileKotlin { compileKotlin {
freeCompilerArgs = ["-Xjsr305=strict"]
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }
compileTestKotlin { compileTestKotlin {
freeCompilerArgs = ["-Xjsr305=strict"]
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }

View File

@@ -25,9 +25,11 @@ group = 'com.example'
version = '0.0.1-SNAPSHOT' version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8 sourceCompatibility = 1.8
compileKotlin { compileKotlin {
freeCompilerArgs = ["-Xjsr305=strict"]
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }
compileTestKotlin { compileTestKotlin {
freeCompilerArgs = ["-Xjsr305=strict"]
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }

View File

@@ -24,9 +24,11 @@ group = 'com.example'
version = '0.0.1-SNAPSHOT' version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8 sourceCompatibility = 1.8
compileKotlin { compileKotlin {
freeCompilerArgs = ["-Xjsr305=strict"]
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }
compileTestKotlin { compileTestKotlin {
freeCompilerArgs = ["-Xjsr305=strict"]
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }

View File

@@ -61,6 +61,9 @@
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
<configuration> <configuration>
<args>
<arg>-Xjsr305=strict</arg>
</args>
<compilerPlugins> <compilerPlugins>
<plugin>spring</plugin> <plugin>spring</plugin>
</compilerPlugins> </compilerPlugins>

View File

@@ -25,9 +25,11 @@ group = 'com.example'
version = '0.0.1-SNAPSHOT' version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8 sourceCompatibility = 1.8
compileKotlin { compileKotlin {
freeCompilerArgs = ["-Xjsr305=strict"]
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }
compileTestKotlin { compileTestKotlin {
freeCompilerArgs = ["-Xjsr305=strict"]
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }

View File

@@ -66,6 +66,9 @@
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
<configuration> <configuration>
<args>
<arg>-Xjsr305=strict</arg>
</args>
<compilerPlugins> <compilerPlugins>
<plugin>spring</plugin> <plugin>spring</plugin>
</compilerPlugins> </compilerPlugins>

View File

@@ -61,6 +61,9 @@
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
<configuration> <configuration>
<args>
<arg>-Xjsr305=strict</arg>
</args>
<compilerPlugins> <compilerPlugins>
<plugin>spring</plugin> <plugin>spring</plugin>
</compilerPlugins> </compilerPlugins>

View File

@@ -61,6 +61,9 @@
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
<configuration> <configuration>
<args>
<arg>-Xjsr305=strict</arg>
</args>
<compilerPlugins> <compilerPlugins>
<plugin>spring</plugin> <plugin>spring</plugin>
</compilerPlugins> </compilerPlugins>

View File

@@ -58,6 +58,9 @@
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<configuration> <configuration>
<args>
<arg>-Xjsr305=strict</arg>
</args>
<compilerPlugins> <compilerPlugins>
<plugin>spring</plugin> <plugin>spring</plugin>
</compilerPlugins> </compilerPlugins>

View File

@@ -61,6 +61,9 @@
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
<configuration> <configuration>
<args>
<arg>-Xjsr305=strict</arg>
</args>
<compilerPlugins> <compilerPlugins>
<plugin>spring</plugin> <plugin>spring</plugin>
</compilerPlugins> </compilerPlugins>

View File

@@ -58,6 +58,9 @@
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<configuration> <configuration>
<args>
<arg>-Xjsr305=strict</arg>
</args>
<compilerPlugins> <compilerPlugins>
<plugin>spring</plugin> <plugin>spring</plugin>
</compilerPlugins> </compilerPlugins>