Update to Kotlin 2.0.0

This commit is contained in:
Edwin Jakobs
2024-05-28 15:47:41 +02:00
parent 3350274efb
commit 577e0c2f9a
7 changed files with 25 additions and 24 deletions

View File

@@ -26,4 +26,4 @@ gradlePlugin {
implementationClass = "org.openrndr.template.OpenrndrPlugin"
}
}
}
}

View File

@@ -4,4 +4,4 @@ dependencyResolutionManagement {
from(files("../gradle/libs.versions.toml"))
}
}
}
}

View File

@@ -66,4 +66,3 @@ runtime {
options.set(listOf("--strip-debug", "--compress", "1", "--no-header-files", "--no-man-pages"))
modules.set(listOf("jdk.unsupported", "java.management", "java.desktop"))
}

View File

@@ -1,14 +1,13 @@
package org.openrndr.template.convention
import org.gradle.accessors.dm.LibrariesForLibs
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
val libs = the<LibrariesForLibs>()
plugins {
kotlin("jvm")
application
}
//application {
@@ -19,15 +18,16 @@ plugins {
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "11"
compilerOptions {
jvmTarget.set(JvmTarget.valueOf("JVM_${libs.versions.jvmTarget.get()}"))
}
}
java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvmTarget.get()}")
targetCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvmTarget.get()}")
}
repositories {
mavenCentral()
mavenLocal()
@@ -39,10 +39,7 @@ dependencies {
implementation(libs.kotlin.logging)
implementation(libs.openrndr.application)
implementation(libs.openrndr.svg)
implementation(libs.openrndr.animatable)
implementation(libs.openrndr.dialogs)
implementation(libs.openrndr.extensions)
//implementation(libs.openrndr.filters)
}

View File

@@ -160,4 +160,4 @@ class OpenrndrPlugin : Plugin<Project> {
})
}
}
}
}