Use jvmTarget, kotlinLanguage and kotlinApi from libs.versions.toml
This commit is contained in:
@@ -16,7 +16,6 @@ dependencies {
|
||||
implementation(openrndr.ffmpeg)
|
||||
implementation(orx.bundles.basic)
|
||||
implementation(orx.olive)
|
||||
|
||||
implementation(libs.kotlinx.coroutines.core)
|
||||
implementation(libs.kotlinx.serialization.core)
|
||||
implementation(libs.kotlinx.serialization.json)
|
||||
|
||||
@@ -3,6 +3,8 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
|
||||
|
||||
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
|
||||
|
||||
plugins {
|
||||
java
|
||||
kotlin("jvm")
|
||||
@@ -15,15 +17,15 @@ repositories {
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.valueOf("VERSION_${libs.findVersion("jvmTarget").get().displayName}")
|
||||
sourceCompatibility = JavaVersion.valueOf("VERSION_${libs.findVersion("jvmTarget").get().displayName}")
|
||||
}
|
||||
|
||||
kotlin {
|
||||
compilerOptions {
|
||||
languageVersion = KotlinVersion.KOTLIN_2_0
|
||||
apiVersion = KotlinVersion.KOTLIN_2_0
|
||||
jvmTarget = JvmTarget.JVM_17
|
||||
apiVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.findVersion("kotlinApi").get().displayName.replace(".", "_")}"))
|
||||
languageVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.findVersion("kotlinLanguage").get().displayName.replace(".", "_")}"))
|
||||
jvmTarget.set(JvmTarget.valueOf("JVM_${libs.findVersion("jvmTarget").get().displayName}"))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
[versions]
|
||||
jvmTarget = "17"
|
||||
kotlin = "2.2.10"
|
||||
kotlinApi = "2.2"
|
||||
kotlinLanguage = "2.2"
|
||||
|
||||
openrndr = "0.5.0-SNAPSHOT"
|
||||
orx = "0.5.0-SNAPSHOT"
|
||||
orsl = "0.4.5-alpha5"
|
||||
orml = "0.4.1"
|
||||
|
||||
slf4j = "2.0.17"
|
||||
log4j = "2.23.1"
|
||||
jackson = "2.17.2"
|
||||
|
||||
Reference in New Issue
Block a user