dorkbox/GradleUtils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed issue for java compile, so tasks correctly reflect the compile java version (if set at different times)

Browse Source
This commit is contained in:
Robinson 2021-04-11 23:15:45 +02:00
parent 935a00bef1
commit 6907581237
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dorkbox/gradle/StaticMethodsAndTools.kt
View File

@ -342,8 +342,9 @@ open class StaticMethodsAndTools(private val project: Project) {
project.allprojects.forEach { project ->
project.tasks.withType(JavaCompile::class.java) { task ->
task.doFirst {
println("\tCompiling classes to Java $javaVersion")
println("\tCompiling classes to Java ${JavaVersion.toVersion(task.targetCompatibility)}")
}
task.options.encoding = "UTF-8"
// -Xlint:deprecation
@ -352,7 +353,6 @@ open class StaticMethodsAndTools(private val project: Project) {
// -Xlint:unchecked
task.options.compilerArgs.add("-Xlint:unchecked")
task.sourceCompatibility = javaVer
task.targetCompatibility = javaVer
}
@ -371,7 +371,7 @@ open class StaticMethodsAndTools(private val project: Project) {
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.languageVersion = kotlinVer