From 577e0c2f9abadb8a10e97e7263c8a1f407afe115 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Tue, 28 May 2024 15:47:41 +0200 Subject: [PATCH] Update to Kotlin 2.0.0 --- build.gradle.kts | 4 +++- buildSrc/build.gradle.kts | 2 +- buildSrc/settings.gradle.kts | 2 +- .../convention/distribution-jvm.gradle.kts | 1 - .../convention/openrndr-jvm.gradle.kts | 15 +++++------- .../kotlin/org/openrndr/template/openrndr.kt | 2 +- gradle/libs.versions.toml | 23 +++++++++++-------- 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ab6ebbc..f9a6ca1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,9 @@ openrndr { orxFeatures = setOf( libs.orx.olive, libs.orx.color, - libs.orx.gui + libs.orx.shapes, + libs.orx.gui, + libs.orx.svg ) openrndrFeatures = setOf( libs.openrndr.ffmpeg, diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 4d5fc73..34442a9 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -26,4 +26,4 @@ gradlePlugin { implementationClass = "org.openrndr.template.OpenrndrPlugin" } } -} \ No newline at end of file +} diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index fa8bc74..b5a0fab 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -4,4 +4,4 @@ dependencyResolutionManagement { from(files("../gradle/libs.versions.toml")) } } -} \ No newline at end of file +} diff --git a/buildSrc/src/main/kotlin/org/openrndr/template/convention/distribution-jvm.gradle.kts b/buildSrc/src/main/kotlin/org/openrndr/template/convention/distribution-jvm.gradle.kts index e7b4db4..118ba97 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/template/convention/distribution-jvm.gradle.kts +++ b/buildSrc/src/main/kotlin/org/openrndr/template/convention/distribution-jvm.gradle.kts @@ -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")) } - diff --git a/buildSrc/src/main/kotlin/org/openrndr/template/convention/openrndr-jvm.gradle.kts b/buildSrc/src/main/kotlin/org/openrndr/template/convention/openrndr-jvm.gradle.kts index 8a83811..cae5cae 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/template/convention/openrndr-jvm.gradle.kts +++ b/buildSrc/src/main/kotlin/org/openrndr/template/convention/openrndr-jvm.gradle.kts @@ -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() - plugins { kotlin("jvm") application - } //application { @@ -19,15 +18,16 @@ plugins { tasks.withType { - 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) } - diff --git a/buildSrc/src/main/kotlin/org/openrndr/template/openrndr.kt b/buildSrc/src/main/kotlin/org/openrndr/template/openrndr.kt index 31e4980..cd43234 100644 --- a/buildSrc/src/main/kotlin/org/openrndr/template/openrndr.kt +++ b/buildSrc/src/main/kotlin/org/openrndr/template/openrndr.kt @@ -160,4 +160,4 @@ class OpenrndrPlugin : Plugin { }) } } -} \ No newline at end of file +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f07318c..7f551e7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,14 @@ [versions] -kotlin = "1.9.23" -openrndr = "0.4.5-alpha2" -orx = "0.4.5-alpha2" +kotlin = "2.0.0" +openrndr = "0.4.5-SNAPSHOT" +orx = "0.4.5-SNAPSHOT" orml = "0.4.1" +jvmTarget = "11" -slf4j = "2.0.12" + +slf4j = "2.0.13" log4j = "2.23.1" -jackson = "2.16.2" +jackson = "2.17.1" [libraries] kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" } @@ -20,11 +22,11 @@ log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version. jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" } jackson-json = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-yaml", version.ref = "jackson" } -kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.3" } -kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.3" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.8.1" } +kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.9" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.2" } -gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" } +gson = { group = "com.google.code.gson", name = "gson", version = "2.11.1" } csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1.9.3" } openrndr-animatable = { group = "org.openrndr", name = "openrndr-animatable", version.ref = "openrndr" } @@ -36,7 +38,6 @@ openrndr-extensions = { group = "org.openrndr", name = "openrndr-extensions", ve openrndr-filter = { group = "org.openrndr", name = "openrndr-filter", version.ref = "openrndr" } openrndr-gl3 = { group = "org.openrndr", name = "openrndr-gl3", version.ref = "openrndr" } openrndr-math = { group = "org.openrndr", name = "openrndr-math", version.ref = "openrndr" } -openrndr-svg = { group = "org.openrndr", name = "openrndr-svg", version.ref = "openrndr" } openrndr-ffmpeg = { group = "org.openrndr", name = "openrndr-ffmpeg", version.ref = "openrndr" } openrndr-nullgl = { group = "org.openrndr", name = "openrndr-nullgl", version.ref = "openrndr" } @@ -55,8 +56,11 @@ orx-olive = { group = "org.openrndr.extra", name = "orx-olive", version.ref = "o orx-panel = { group = "org.openrndr.extra", name = "orx-panel", version.ref = "orx" } orx-shade-styles = { group = "org.openrndr.extra", name = "orx-shade-styles", version.ref = "orx" } orx-shapes = { group = "org.openrndr.extra", name = "orx-shapes", version.ref = "orx" } +orx-svg = { group = "org.openrndr.extra", name = "orx-svg", version.ref = "orx" } + orx-video-profiles = { group = "org.openrndr.extra", name = "orx-video-profiles", version.ref = "orx" } orx-view-box = { group = "org.openrndr.extra", name = "orx-view-box", version.ref = "orx" } + shadow-gradle-plugin = { group = "com.github.johnrengelman", name = "shadow", version = "8.1.1" } runtime-gradle-plugin = { group = "org.beryx", name = "badass-runtime-plugin", version = "1.13.0" } @@ -68,4 +72,3 @@ shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } runtime = { id = "org.beryx.runtime", version = "1.13.1" } gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" } versions = { id = "com.github.ben-manes.versions", version = "0.50.0" } -