kscience/gradle-tools
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 9 Wiki Activity

Fix JVM version

Browse Source
This commit is contained in:
Alexander Nozik 2020-05-05 22:20:45 +03:00
parent 9e37d6f752
commit 7a282fa207
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/Scientifik.kt
View File

@ -1,10 +1,14 @@
import org.gradle.api.JavaVersion
/**
* Build constants
*/
object Scientifik {
const val coroutinesVersion = "1.3.4"
const val serializationVersion = "0.20.0"
const val JVM_VERSION = "11"
val JVM_TARGET = JavaVersion.VERSION_11
// val JVM_VERSION = JVM_TARGET.toString()
object Serialization{
const val xmlVersion = "0.20.0.0"

4
src/main/kotlin/scientifik/ScientifikJVMPlugin.kt
View File

@ -22,12 +22,12 @@ open class ScientifikJVMPlugin : Plugin<Project> {
repositories.applyRepos()
extensions.findByType<JavaPluginExtension>()?.apply {
targetCompatibility = enumValueOf(Scientifik.JVM_VERSION)
targetCompatibility = Scientifik.JVM_TARGET
}
tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = Scientifik.JVM_VERSION
jvmTarget = Scientifik.JVM_TARGET.toString()
}
}

2
src/main/kotlin/scientifik/ScientifikMPPlugin.kt
View File

@ -26,7 +26,7 @@ open class ScientifikMPPlugin : Plugin<Project> {
jvm {
compilations.all {
kotlinOptions {
jvmTarget = Scientifik.JVM_VERSION
jvmTarget = Scientifik.JVM_TARGET.toString()
}
}
}