Update to java21 and kotlin 2

Author: Hanseter

.sdkmanrc

@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=21.0.4-tem

pom.xml

@@ -17,7 +17,7 @@
         <kotlin.compiler.jvmTarget>21</kotlin.compiler.jvmTarget>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <kotlin.version>2.0.10</kotlin.version>
-        <javafx.version>21.0.2</javafx.version>
+        <javafx.version>21.0.4</javafx.version>
         <slf4j.version>1.7.32</slf4j.version>
     </properties>
 

src/test/kotlin/com/github/hanseter/json/editor/AllOfTest.kt

@@ -60,7 +60,10 @@ class AllOfTest {
     }]}}}""")
 
         val data = JSONObject()
-        editor.display("foo", "foo", data, schema) { it }
+        WaitForAsyncUtils.asyncFx {
+            editor.display("foo", "foo", data, schema) { it }
+        }
+        WaitForAsyncUtils.waitForFxEvents()
         val objectEntry = editor.getItemTable().root.children.first().findChildWithKey("notRoot")!!
         assertThat(objectEntry.children.size, `is`(0))
         (objectEntry.value.createControl()?.control as TypeWithChildrenStatusControl).button.fire()

src/test/kotlin/com/github/hanseter/json/editor/NumberTest.kt

@@ -1,5 +1,6 @@
 package com.github.hanseter.json.editor
 
+import com.github.hanseter.json.editor.base.TestUtils.waitForAsyncFx
 import com.github.hanseter.json.editor.util.ViewOptions
 import javafx.scene.control.Spinner
 import javafx.stage.Stage
@@ -35,7 +36,9 @@ class NumberTest {
     @Test
     fun displayExistingValue() {
         val schema = JSONObject("""{"type":"object","properties":{"num":{"type":"number"}}}""")
-        editor.display("1", "1", JSONObject().put("num", 723.168), schema) { it }
+        waitForAsyncFx {
+            editor.display("1", "1", JSONObject().put("num", 723.168), schema) { it }
+        }
         val itemTable = editor.getItemTable()
         val numberControl = editor.getControlInTable("num") as Spinner<Number>
         val converted = numberControl.valueFactory.converter.toString(723.168)
@@ -118,7 +121,9 @@ class NumberTest {
     fun displaysCorrectDefaultValue() {
         val schema =
             JSONObject("""{"type":"object","properties":{"num":{"type":"number","default":723.168}}}""")
-        editor.display("1", "1", JSONObject(), schema) { it }
+        waitForAsyncFx {
+            editor.display("1", "1", JSONObject(), schema) { it }
+        }
         val itemTable = editor.getItemTable()
         val numberControl = editor.getControlInTable("num") as Spinner<Number>
         val converted = numberControl.valueFactory.converter.toString(723.168)

src/test/kotlin/com/github/hanseter/json/editor/base/TestUtils.kt

@@ -3,6 +3,7 @@ package com.github.hanseter.json.editor.base
 import org.controlsfx.control.SearchableComboBox
 import org.json.JSONObject
 import org.json.JSONTokener
+import org.testfx.util.WaitForAsyncUtils
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.stream.Collectors
@@ -22,4 +23,11 @@ object TestUtils {
     fun createSchemaComboBox() = SearchableComboBox<String>().apply {
         items.addAll(getAllSchemas())
     }
+
+    fun <T> waitForAsyncFx(callback: () -> T): T? {
+        var ret: T? = null
+        WaitForAsyncUtils.asyncFx { ret = callback() }
+        WaitForAsyncUtils.waitForFxEvents()
+        return ret
+    }
 }