Fixed issue for java compile, so tasks correctly reflect the compile java version (if set at different times)
This commit is contained in:
parent
935a00bef1
commit
6907581237
@ -342,8 +342,9 @@ open class StaticMethodsAndTools(private val project: Project) {
|
|||||||
project.allprojects.forEach { project ->
|
project.allprojects.forEach { project ->
|
||||||
project.tasks.withType(JavaCompile::class.java) { task ->
|
project.tasks.withType(JavaCompile::class.java) { task ->
|
||||||
task.doFirst {
|
task.doFirst {
|
||||||
println("\tCompiling classes to Java $javaVersion")
|
println("\tCompiling classes to Java ${JavaVersion.toVersion(task.targetCompatibility)}")
|
||||||
}
|
}
|
||||||
|
|
||||||
task.options.encoding = "UTF-8"
|
task.options.encoding = "UTF-8"
|
||||||
|
|
||||||
// -Xlint:deprecation
|
// -Xlint:deprecation
|
||||||
@ -352,7 +353,6 @@ open class StaticMethodsAndTools(private val project: Project) {
|
|||||||
// -Xlint:unchecked
|
// -Xlint:unchecked
|
||||||
task.options.compilerArgs.add("-Xlint:unchecked")
|
task.options.compilerArgs.add("-Xlint:unchecked")
|
||||||
|
|
||||||
|
|
||||||
task.sourceCompatibility = javaVer
|
task.sourceCompatibility = javaVer
|
||||||
task.targetCompatibility = javaVer
|
task.targetCompatibility = javaVer
|
||||||
}
|
}
|
||||||
@ -371,7 +371,7 @@ open class StaticMethodsAndTools(private val project: Project) {
|
|||||||
|
|
||||||
task.kotlinOptions.jvmTarget = kotlinJavaVer
|
task.kotlinOptions.jvmTarget = kotlinJavaVer
|
||||||
|
|
||||||
// default is whatever the version is that we are running, or 1.3 if we cannot figure it out
|
// default is whatever the version is that we are running, or 1.4.32 if we cannot figure it out
|
||||||
task.kotlinOptions.apiVersion = kotlinVer
|
task.kotlinOptions.apiVersion = kotlinVer
|
||||||
task.kotlinOptions.languageVersion = kotlinVer
|
task.kotlinOptions.languageVersion = kotlinVer
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user