diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index be139881..4170b6f0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] java = "21" -kotlin = "1.9.24" -coroutines = "1.8.1" +kotlin = "2.0.21" +coroutines = "1.9.0" flatlaf = "3.5.1" kotest = "5.9.1" ignition = "8.1.20" @@ -18,7 +18,7 @@ dokka = { id = "org.jetbrains.dokka", version = "1.9.20" } # core functionality coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" } coroutines-swing = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-swing", version.ref = "coroutines" } -serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.6.3" } +serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.2" } xerial-jdbc = { group = "org.xerial", name = "sqlite-jdbc", version = "3.46.1.0" } logback = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.8" } hsql = { group = "org.hsqldb", name = "hsqldb", version = "2.7.3" } diff --git a/src/main/kotlin/io/github/inductiveautomation/kindling/idb/ImagesTab.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/ImagesTab.kt index 91170b60..e29ee8f6 100644 --- a/src/main/kotlin/io/github/inductiveautomation/kindling/idb/ImagesTab.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/idb/ImagesTab.kt @@ -1,6 +1,7 @@ package io.github.inductiveautomation.kindling.idb import com.formdev.flatlaf.extras.FlatSVGIcon +import com.github.weisj.jsvg.parser.LoaderContext import com.github.weisj.jsvg.parser.SVGLoader import com.inductiveautomation.ignition.gateway.images.ImageFormat import io.github.inductiveautomation.kindling.core.ToolPanel @@ -209,7 +210,7 @@ private class ImageRow( val image: BufferedImage? by lazy { if (type == ImageFormat.SVG) { - return@lazy SVGLoader().load(data.inputStream())?.let { svg -> + return@lazy SVGLoader().load(data.inputStream(), null, LoaderContext.createDefault())?.let { svg -> val size = svg.size() svg.render(size.width.toInt().coerceAtLeast(20), size.height.toInt().coerceAtLeast(20)) } diff --git a/src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/ThreadDump.kt b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/ThreadDump.kt index 0d2a20fb..ef098f39 100644 --- a/src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/ThreadDump.kt +++ b/src/main/kotlin/io/github/inductiveautomation/kindling/thread/model/ThreadDump.kt @@ -11,6 +11,7 @@ import java.io.InputStream import java.lang.Thread.State as ThreadState @Serializable +@ConsistentCopyVisibility data class ThreadDump internal constructor( val version: String, val threads: List,