Fix JNI signatures

utopia-rise · Sep 14, 2024 · 21283d1 · 21283d1
1 parent f82ec23
commit 21283d1
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/harness/tests/scripts/CoreTypePropertyChecks.gdj b/harness/tests/scripts/CoreTypePropertyChecks.gdj
@@ -16,8 +16,7 @@ signals = [
 ]
 properties = [
     exported_normal_core_type,
-	normal_core_type,
-	normal_non_null_core_type
+	normal_core_type
 ]
 functions = [
 

diff --git a/harness/tests/scripts/godot/tests/Invocation.gdj b/harness/tests/scripts/godot/tests/Invocation.gdj
@@ -166,7 +166,5 @@ functions = [
 	set_vector3_in_packed_array,
 	resize_vector3_packed_array,
 	is_sent_xr_same_instance_as_jvm_singleton,
-	nullable_string_is_null,
-	nullable_return_type,
 	create_variant_array_of_user_type
 ]
diff --git a/harness/tests/scripts/godot/tests/JavaTestClass.gdj b/harness/tests/scripts/godot/tests/JavaTestClass.gdj
@@ -25,7 +25,9 @@ properties = [
 	exported_string,
 	exported_byte,
 	exported_button,
-	signal_emitted
+	signal_emitted,
+	variant_array,
+	dictionary
 ]
 functions = [
     greeting,

diff --git a/...ns/godot-gradle-plugin/src/main/resources/godot/gradle/godot-kotlin-graal-jni-config.json b/...ns/godot-gradle-plugin/src/main/resources/godot/gradle/godot-kotlin-graal-jni-config.json
@@ -168,7 +168,7 @@
       { "name" : "engine_call_constructor", "parameterTypes" : [] },
 
       { "name" : "engine_call_constructor_object_string_name", "parameterTypes" : [] },
-      { "name" : "engine_call_constructor_kt_custom_callable", "parameterTypes" : ["godot.core.callable.KtCallable", "int", "int"] },
+      { "name" : "engine_call_constructor_kt_custom_callable", "parameterTypes" : ["godot.core.KtCallable", "int", "int"] },
       { "name" : "engine_call_copy_constructor", "parameterTypes" : [] },
 
       { "name" : "engine_call_bind", "parameterTypes" : ["long"] },
@@ -192,12 +192,12 @@
     ]
   },
   {
-    "name" : "godot.core.callable.KtCallable$Bridge",
+    "name" : "godot.core.KtCallable$Bridge",
     "fields" : [
       { "name" : "INSTANCE" }
     ],
     "methods" : [
-      { "name" : "wrap_in_custom_callable", "parameterTypes" : ["godot.core.callable.KtCallable", "int", "int"] }
+      { "name" : "wrap_in_custom_callable", "parameterTypes" : ["godot.core.KtCallable", "int", "int"] }
     ]
   },
   {
@@ -728,7 +728,7 @@
     ]
   },
   {
-    "name":"godot.core.callable.KtCallable",
+    "name":"godot.core.KtCallable",
     "methods":[
       {"name":"getParameterCount","parameterTypes":[] },
       {"name":"invokeNoReturn","parameterTypes":[] },

diff --git a/src/jvm_wrapper/bridge/callable_bridge.h b/src/jvm_wrapper/bridge/callable_bridge.h
@@ -11,7 +11,7 @@ namespace bridges {
         INIT_JNI_BINDINGS(
             INIT_NATIVE_METHOD("engine_call_constructor", "()J", CallableBridge::engine_call_constructor)
             INIT_NATIVE_METHOD("engine_call_constructor_object_string_name", "()J", CallableBridge::engine_call_constructor_object_string_name)
-            INIT_NATIVE_METHOD("engine_call_constructor_kt_custom_callable", "(Lgodot/core/callable/KtCallable;II)J", CallableBridge::engine_call_constructor_kt_custom_callable)
+            INIT_NATIVE_METHOD("engine_call_constructor_kt_custom_callable", "(Lgodot/core/KtCallable;II)J", CallableBridge::engine_call_constructor_kt_custom_callable)
             INIT_NATIVE_METHOD("engine_call_copy_constructor", "()J", CallableBridge::engine_call_copy_constructor)
             INIT_NATIVE_METHOD("engine_call_bind", "(J)V", CallableBridge::engine_call_bind)
             INIT_NATIVE_METHOD("engine_call_bindv", "(J)V", CallableBridge::engine_call_bindv)

diff --git a/src/jvm_wrapper/bridge/kt_callable_bridge.h b/src/jvm_wrapper/bridge/kt_callable_bridge.h
@@ -5,12 +5,12 @@
 #include "jvm_wrapper/jvm_singleton_wrapper.h"
 
 namespace bridges {
-    JVM_SINGLETON_WRAPPER(KtCallableBridge, "godot.core.callable.KtCallable$Bridge") {
+    JVM_SINGLETON_WRAPPER(KtCallableBridge, "godot.core.KtCallable$Bridge") {
         SINGLETON_CLASS(KtCallableBridge)
 
         // clang-format off
         INIT_JNI_BINDINGS(
-            INIT_NATIVE_METHOD("wrap_in_custom_callable", "(Lgodot/core/callable/KtCallable;II)J", KtCallableBridge::wrap_in_custom_callable)
+            INIT_NATIVE_METHOD("wrap_in_custom_callable", "(Lgodot/core/KtCallable;II)J", KtCallableBridge::wrap_in_custom_callable)
         )
         // clang-format on
 

diff --git a/src/kotlin_callable_custom.h b/src/kotlin_callable_custom.h
@@ -5,7 +5,7 @@
 #include "jvm_wrapper/jvm_instance_wrapper.h"
 #include "core/variant/callable.h"
 
-JVM_INSTANCE_WRAPPER(KtCallable, "godot.core.callable.KtCallable") {
+JVM_INSTANCE_WRAPPER(KtCallable, "godot.core.KtCallable") {
     JVM_CLASS(KtCallable)
     // clang-format off