Skip to content

Commit 018d284

Browse files
committed
Fix JNI signatures
1 parent f82ec23 commit 018d284

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

harness/tests/scripts/CoreTypePropertyChecks.gdj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ signals = [
1616
]
1717
properties = [
1818
exported_normal_core_type,
19-
normal_core_type,
20-
normal_non_null_core_type
19+
normal_core_type
2120
]
2221
functions = [
2322

harness/tests/scripts/godot/tests/Invocation.gdj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,5 @@ functions = [
166166
set_vector3_in_packed_array,
167167
resize_vector3_packed_array,
168168
is_sent_xr_same_instance_as_jvm_singleton,
169-
nullable_string_is_null,
170-
nullable_return_type,
171169
create_variant_array_of_user_type
172170
]

harness/tests/scripts/godot/tests/JavaTestClass.gdj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ properties = [
2525
exported_string,
2626
exported_byte,
2727
exported_button,
28-
signal_emitted
28+
signal_emitted,
29+
variant_array,
30+
dictionary
2931
]
3032
functions = [
3133
greeting,

kt/plugins/godot-gradle-plugin/src/main/resources/godot/gradle/godot-kotlin-graal-jni-config.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
{ "name" : "engine_call_constructor", "parameterTypes" : [] },
169169

170170
{ "name" : "engine_call_constructor_object_string_name", "parameterTypes" : [] },
171-
{ "name" : "engine_call_constructor_kt_custom_callable", "parameterTypes" : ["godot.core.callable.KtCallable", "int", "int"] },
171+
{ "name" : "engine_call_constructor_kt_custom_callable", "parameterTypes" : ["godot.core.KtCallable", "int", "int"] },
172172
{ "name" : "engine_call_copy_constructor", "parameterTypes" : [] },
173173

174174
{ "name" : "engine_call_bind", "parameterTypes" : ["long"] },
@@ -192,12 +192,12 @@
192192
]
193193
},
194194
{
195-
"name" : "godot.core.callable.KtCallable$Bridge",
195+
"name" : "godot.core.KtCallable$Bridge",
196196
"fields" : [
197197
{ "name" : "INSTANCE" }
198198
],
199199
"methods" : [
200-
{ "name" : "wrap_in_custom_callable", "parameterTypes" : ["godot.core.callable.KtCallable", "int", "int"] }
200+
{ "name" : "wrap_in_custom_callable", "parameterTypes" : ["godot.core.KtCallable", "int", "int"] }
201201
]
202202
},
203203
{

src/jvm_wrapper/bridge/kt_callable_bridge.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "jvm_wrapper/jvm_singleton_wrapper.h"
66

77
namespace bridges {
8-
JVM_SINGLETON_WRAPPER(KtCallableBridge, "godot.core.callable.KtCallable$Bridge") {
8+
JVM_SINGLETON_WRAPPER(KtCallableBridge, "godot.core.KtCallable$Bridge") {
99
SINGLETON_CLASS(KtCallableBridge)
1010

1111
// clang-format off

0 commit comments

Comments
 (0)