From b2e5ed83a4092f012398114ed1ae16e0f1a9038f Mon Sep 17 00:00:00 2001 From: JFronny Date: Mon, 3 Jun 2024 15:01:55 +0200 Subject: [PATCH] chore: update to JVM 22 --- .woodpecker.yml | 10 +++++----- gradle/libs.versions.toml | 4 ++-- launcher-gtk/build.gradle.kts | 8 ++------ .../io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.kt | 4 +--- .../inceptum/gtk/window/dialog/MicrosoftLoginDialog.kt | 6 ++---- .../gtk/window/dialog/ProcessStateWatcherDialog.kt | 2 +- .../inceptum/gtk/window/dialog/StringInputDialog.kt | 2 +- .../inceptum/gtk/window/settings/instance/ExportTab.kt | 2 +- .../gtk/window/settings/instance/GeneralTab.kt | 2 +- 9 files changed, 16 insertions(+), 24 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 2891c35..5b7dd1d 100644 --- a/.woodpecker.yml +++ b/.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 ] diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c8def95..8f985f3 100644 --- a/gradle/libs.versions.toml +++ b/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" -kotlin = "1.9.20" +javagi = "0.10.1" +kotlin = "2.0.0" [libraries] plugin-shadow = "gradle.plugin.com.github.johnrengelman:shadow:7.1.2" diff --git a/launcher-gtk/build.gradle.kts b/launcher-gtk/build.gradle.kts index 8bdb807..e94e4a0 100644 --- a/launcher-gtk/build.gradle.kts +++ b/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 { - options.compilerArgs.add("--enable-preview") +tasks.shadowJar { + 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") } \ No newline at end of file diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.kt index 3571c50..fba13ed 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.kt @@ -40,11 +40,9 @@ object GtkEnvBackend : EnvBackend { ok: Consumer, 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, diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/MicrosoftLoginDialog.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/MicrosoftLoginDialog.kt index 3d151db..74f27e8 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/MicrosoftLoginDialog.kt +++ b/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 { - var flags = DialogFlags.DESTROY_WITH_PARENT - if (modal) flags = flags.or(DialogFlags.MODAL) - return flags + private fun flags(modal: Boolean): Set { + return if (!modal) setOf(DialogFlags.DESTROY_WITH_PARENT) else setOf(DialogFlags.DESTROY_WITH_PARENT, DialogFlags.MODAL) } } } diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/ProcessStateWatcherDialog.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/ProcessStateWatcherDialog.kt index a04b72f..90f3cb2 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/ProcessStateWatcherDialog.kt +++ b/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 diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/StringInputDialog.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/StringInputDialog.kt index 98fe1b8..ce9dcbb 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/StringInputDialog.kt +++ b/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, type: MessageType, buttons: ButtonsType, message: String, value: String) : MessageDialog(parent, flags, type, buttons, message) { private val entry = Entry() init { diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ExportTab.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ExportTab.kt index 72865e5..3e3594f 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ExportTab.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ExportTab.kt @@ -58,7 +58,7 @@ class ExportTab(window: InstanceSettingsWindow) : SectionedSettingsTab