chore: update to JVM 22

.woodpecker.yml

@@ -1,9 +1,9 @@
 #link https://pages.frohnmeyer-wds.de/scripts/docs.yml
 #include https://pages.frohnmeyer-wds.de/scripts/clone.yml
 
-pipeline:
+steps:
   export_metadata:
-    image: gradle:jdk21-jammy
+    image: gradle:jdk22-jammy
     pull: true
     commands:
       - mkdir public
@@ -15,20 +15,20 @@ pipeline:
     commands:
       - ./platform_jars.sh
   build_wrapper:
-    image: gradle:jdk21-jammy
+    image: gradle:jdk22-jammy
     commands:
       - gradle --build-cache :wrapper:build -Pflavor=windows -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
       - cp wrapper/build/libs/*.exe public/wrapper.exe
       - cp wrapper/build/libs/*-all.jar public/wrapper.jar
   publish_debug:
-    image: gradle:jdk21-jammy
+    image: gradle:jdk22-jammy
     commands:
       - gradle --build-cache build publish -Pflavor=maven -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
     secrets: [ maven_token, maven_name ]
     when:
       - branch: master
   publish_release:
-    image: gradle:jdk21-jammy
+    image: gradle:jdk22-jammy
     commands:
       - gradle --build-cache build publish -Pflavor=maven -Ppublic -Prelease
     secrets: [ maven_token, maven_name ]

gradle/libs.versions.toml

@@ -3,8 +3,8 @@ jf-commons = "1.7-SNAPSHOT"
 annotations = "24.0.1"
 lwjgl = "3.3.2"
 imgui = "1.86.10"
-javagi = "0.9.0"
+javagi = "0.10.1"
-kotlin = "1.9.20"
+kotlin = "2.0.0"
 
 [libraries]
 plugin-shadow = "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"

launcher-gtk/build.gradle.kts

@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     inceptum.application
     com.github.johnrengelman.shadow
@@ -20,8 +18,8 @@ dependencies {
     implementation(projects.launcher)
 }
 
-tasks.compileJava {
+tasks.shadowJar {
-    options.compilerArgs.add("--enable-preview")
+    mergeServiceFiles()
 }
 
 tasks.runShadow {
@@ -43,5 +41,3 @@ tasks.runShadow {
     environment("GTK_DEBUG", "interactive") // interactive:actions
     jvmArgs("--enable-preview", "--enable-native-access=ALL-UNNAMED")
 }
-
-tasks.withType(KotlinCompile::class) { compilerOptions.freeCompilerArgs.addAll("-Xlambdas=indy") }

launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.kt

@@ -40,11 +40,9 @@ object GtkEnvBackend : EnvBackend {
         ok: Consumer<String>,
         cancel: Runnable
     ) = schedule {
-        var flags = DialogFlags.DESTROY_WITH_PARENT
-        if (dialogParent != null) flags = flags.or(DialogFlags.MODAL)
         val dialog = StringInputDialog(
             dialogParent,
-            flags,
+            if (dialogParent == null) setOf(DialogFlags.DESTROY_WITH_PARENT) else setOf(DialogFlags.DESTROY_WITH_PARENT, DialogFlags.MODAL),
             MessageType.QUESTION,
             ButtonsType.OK_CANCEL,
             details,

launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/MicrosoftLoginDialog.kt

@@ -66,10 +66,8 @@ class MicrosoftLoginDialog(
     }
 
     companion object {
-        private fun flags(modal: Boolean): DialogFlags {
+        private fun flags(modal: Boolean): Set<DialogFlags> {
-            var flags = DialogFlags.DESTROY_WITH_PARENT
+            return if (!modal) setOf(DialogFlags.DESTROY_WITH_PARENT) else setOf(DialogFlags.DESTROY_WITH_PARENT, DialogFlags.MODAL)
-            if (modal) flags = flags.or(DialogFlags.MODAL)
-            return flags
         }
     }
 }

launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/ProcessStateWatcherDialog.kt

@@ -19,7 +19,7 @@ class ProcessStateWatcherDialog(
     executor: ThrowingRunnable<*>
 ) : MessageDialog(
     parent,
-    DialogFlags.MODAL.or(DialogFlags.DESTROY_WITH_PARENT),
+    setOf(DialogFlags.MODAL, DialogFlags.DESTROY_WITH_PARENT),
     MessageType.INFO,
     ButtonsType.NONE,
     null

launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/StringInputDialog.kt

@@ -2,7 +2,7 @@ package io.gitlab.jfronny.inceptum.gtk.window.dialog
 
 import org.gnome.gtk.*
 
-class StringInputDialog(parent: Window?, flags: DialogFlags, type: MessageType, buttons: ButtonsType, message: String, value: String) : MessageDialog(parent, flags, type, buttons, message) {
+class StringInputDialog(parent: Window?, flags: Set<DialogFlags>, type: MessageType, buttons: ButtonsType, message: String, value: String) : MessageDialog(parent, flags, type, buttons, message) {
     private val entry = Entry()
 
     init {

launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ExportTab.kt

@@ -58,7 +58,7 @@ class ExportTab(window: InstanceSettingsWindow) : SectionedSettingsTab<InstanceS
             schedule {
                 val success = MessageDialog(
                     window,
-                    DialogFlags.MODAL.or(DialogFlags.DESTROY_WITH_PARENT),
+                    setOf(DialogFlags.MODAL, DialogFlags.DESTROY_WITH_PARENT),
                     MessageType.INFO,
                     ButtonsType.NONE,
                     I18n["instance.settings.export.dialog.success", instance.name, path.toString()]

launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/GeneralTab.kt

@@ -205,7 +205,7 @@ class GeneralTab(window: InstanceSettingsWindow) : SectionedSettingsTab<Instance
                 setButton("instance.delete") {
                     val dialog = MessageDialog(
                         window,
-                        DialogFlags.MODAL.or(DialogFlags.DESTROY_WITH_PARENT),
+                        setOf(DialogFlags.MODAL, DialogFlags.DESTROY_WITH_PARENT),
                         MessageType.WARNING,
                         ButtonsType.OK_CANCEL,
                         null