From d79bc4635cecd8afa0dea81cd5015845ba751eab Mon Sep 17 00:00:00 2001 From: chippmann Date: Fri, 8 Aug 2025 14:04:58 +0200 Subject: [PATCH 1/6] Bump gradle version to 9.0.0 --- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../tests/scripts/godot/tests/Invocation.gdj | 296 +++++++++--------- .../tests/packedarray/PackedArrayTest.gdj | 8 +- kt/gradle/wrapper/gradle-wrapper.properties | 2 +- .../tasks/graal/ios/createIOSStaticLibrary.kt | 17 +- 8 files changed, 172 insertions(+), 159 deletions(-) diff --git a/harness/flattened-library-tests/gradle/wrapper/gradle-wrapper.properties b/harness/flattened-library-tests/gradle/wrapper/gradle-wrapper.properties index ed4c299adb..48b43d3506 100644 --- a/harness/flattened-library-tests/gradle/wrapper/gradle-wrapper.properties +++ b/harness/flattened-library-tests/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/harness/fqname-library-tests/gradle/wrapper/gradle-wrapper.properties b/harness/fqname-library-tests/gradle/wrapper/gradle-wrapper.properties index ed4c299adb..48b43d3506 100644 --- a/harness/fqname-library-tests/gradle/wrapper/gradle-wrapper.properties +++ b/harness/fqname-library-tests/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/harness/hierarchical-library-tests/gradle/wrapper/gradle-wrapper.properties b/harness/hierarchical-library-tests/gradle/wrapper/gradle-wrapper.properties index ed4c299adb..48b43d3506 100644 --- a/harness/hierarchical-library-tests/gradle/wrapper/gradle-wrapper.properties +++ b/harness/hierarchical-library-tests/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/harness/tests/gradle/wrapper/gradle-wrapper.properties b/harness/tests/gradle/wrapper/gradle-wrapper.properties index ed4c299adb..48b43d3506 100644 --- a/harness/tests/gradle/wrapper/gradle-wrapper.properties +++ b/harness/tests/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/harness/tests/scripts/godot/tests/Invocation.gdj b/harness/tests/scripts/godot/tests/Invocation.gdj index fdb7977afc..b6ae0b42f1 100644 --- a/harness/tests/scripts/godot/tests/Invocation.gdj +++ b/harness/tests/scripts/godot/tests/Invocation.gdj @@ -7,160 +7,160 @@ relativeSourcePath = src/main/kotlin/godot/tests/Invocation.kt baseType = Node3D supertypes = [ godot.api.Node3D, - godot.api.Node, - godot.api.Object, - godot.core.KtObject, - godot.common.interop.NativeWrapper, - godot.common.interop.NativePointer, - kotlin.Any + godot.api.Node, + godot.api.Object, + godot.core.KtObject, + godot.common.interop.NativeWrapper, + godot.common.interop.NativePointer, + kotlin.Any ] signals = [ ] properties = [ button, - enum_list, - vector_list, - enum_list_mutable, - register_object, - register_object_nullable, - register_object_nullable_pre_init, - register_object_non_nullable_pre_init, - vector, - x, - y, - z, - custom_name, - invocation, - enum_test, - resource_test, - jvm_id, - test_array_any, - nav_meshes, - nullable_array, - any_to_any_dictionary, - nav_meshes_dictionary, - nullable_dictionary, - color, - rid, - packed_byte_array, - packed_int32_array, - packed_float64_array, - packed_color_array, - packed_string_array, - packed_vector2_array, - packed_vector3_array, - p1, - p1_1, - p2, - p3, - p4, - p5, - p6, - p7, - p8, - p9, - p10, - p11, - p12, - p13, - p14, - p15, - p16, - p17, - stringtemplation, - test_string, - ascii_string, - utf8_string + enum_list, + vector_list, + enum_list_mutable, + register_object, + register_object_nullable, + register_object_nullable_pre_init, + register_object_non_nullable_pre_init, + vector, + x, + y, + z, + custom_name, + invocation, + enum_test, + resource_test, + jvm_id, + test_array_any, + nav_meshes, + nullable_array, + any_to_any_dictionary, + nav_meshes_dictionary, + nullable_dictionary, + color, + rid, + packed_byte_array, + packed_int32_array, + packed_float64_array, + packed_color_array, + packed_string_array, + packed_vector2_array, + packed_vector3_array, + p1, + p1_1, + p2, + p3, + p4, + p5, + p6, + p7, + p8, + p9, + p10, + p11, + p12, + p13, + p14, + p15, + p16, + p17, + stringtemplation, + test_string, + ascii_string, + utf8_string ] functions = [ int_value, - long_value, - float_value, - double_value, - boolean_value, - string_value, - int_addition, - init_nullables, - _enter_tree, - _ready, - get_rid_id, - get_nav_mesh_rid, - append_to_any_dict, - remove_from_any_dict, - get_from_any_dict, - any_dict_size, - append_to_string_nav_mesh_dict, - remove_from_string_nav_mesh_dict, - get_from_string_nav_mesh_dict, - string_nav_mesh_dict_size, - append_to_string_nav_mesh_nullable_dict, - remove_from_string_nav_mesh_nullable_dict, - string_nav_mesh_nullable_dict_size, - append_nullable_standard_nav_mesh, - append_nullable_nav_mesh, - remove_nullable_nav_mesh, - remove_nullable_nav_mesh_with_index, - nullable_nav_meshes_size, - append_standard_nav_mesh, - append_nav_mesh, - remove_nav_mesh, - remove_nav_mesh_with_index, - get_nav_mesh_from_array, - nav_meshes_size, - append_any_to_array, - remove_any_from_array, - get_any_from_array, - array_any_size, - count_namesh_instance, - get_nav_mesh_count, - parent_is_node3_d, - is_object_node3_d, - other_jvm_id, - has_camera_node, - add_byte_to_packed_array, - add_byte_array_to_packed_array, - delete_byte_from_packed_array, - get_byte_from_packed_array, - set_byte_in_packed_array, - resize_byte_packed_array, - add_color_to_packed_array, - add_color_array_to_packed_array, - delete_color_from_packed_array, - get_color_from_packed_array, - set_color_in_packed_array, - resize_color_packed_array, - add_int_to_packed_array, - add_int_array_to_packed_array, - delete_int_from_packed_array, - get_int_from_packed_array, - set_int_in_packed_array, - resize_int_packed_array, - add_real_to_packed_array, - add_real_array_to_packed_array, - read_string_from_byte_array, - delete_real_from_packed_array, - get_real_from_packed_array, - set_real_in_packed_array, - resize_real_packed_array, - add_string_to_packed_array, - add_string_array_to_packed_array, - delete_string_from_packed_array, - get_string_from_packed_array, - set_string_in_packed_array, - resize_string_packed_array, - add_vector2_to_packed_array, - add_vector2_array_to_packed_array, - delete_vector2_from_packed_array, - get_vector2_from_packed_array, - set_vector2_in_packed_array, - resize_vector2_packed_array, - add_vector3_to_packed_array, - add_vector3_array_to_packed_array, - delete_vector3_from_packed_array, - get_vector3_from_packed_array, - set_vector3_in_packed_array, - resize_vector3_packed_array, - is_sent_xr_same_instance_as_jvm_singleton, - create_variant_array_of_user_type -] + long_value, + float_value, + double_value, + boolean_value, + string_value, + int_addition, + init_nullables, + _enter_tree, + _ready, + get_rid_id, + get_nav_mesh_rid, + append_to_any_dict, + remove_from_any_dict, + get_from_any_dict, + any_dict_size, + append_to_string_nav_mesh_dict, + remove_from_string_nav_mesh_dict, + get_from_string_nav_mesh_dict, + string_nav_mesh_dict_size, + append_to_string_nav_mesh_nullable_dict, + remove_from_string_nav_mesh_nullable_dict, + string_nav_mesh_nullable_dict_size, + append_nullable_standard_nav_mesh, + append_nullable_nav_mesh, + remove_nullable_nav_mesh, + remove_nullable_nav_mesh_with_index, + nullable_nav_meshes_size, + append_standard_nav_mesh, + append_nav_mesh, + remove_nav_mesh, + remove_nav_mesh_with_index, + get_nav_mesh_from_array, + nav_meshes_size, + append_any_to_array, + remove_any_from_array, + get_any_from_array, + array_any_size, + count_namesh_instance, + get_nav_mesh_count, + parent_is_node3_d, + is_object_node3_d, + other_jvm_id, + has_camera_node, + add_byte_to_packed_array, + add_byte_array_to_packed_array, + delete_byte_from_packed_array, + get_byte_from_packed_array, + set_byte_in_packed_array, + resize_byte_packed_array, + add_color_to_packed_array, + add_color_array_to_packed_array, + delete_color_from_packed_array, + get_color_from_packed_array, + set_color_in_packed_array, + resize_color_packed_array, + add_int_to_packed_array, + add_int_array_to_packed_array, + delete_int_from_packed_array, + get_int_from_packed_array, + set_int_in_packed_array, + resize_int_packed_array, + add_real_to_packed_array, + add_real_array_to_packed_array, + read_string_from_byte_array, + delete_real_from_packed_array, + get_real_from_packed_array, + set_real_in_packed_array, + resize_real_packed_array, + add_string_to_packed_array, + add_string_array_to_packed_array, + delete_string_from_packed_array, + get_string_from_packed_array, + set_string_in_packed_array, + resize_string_packed_array, + add_vector2_to_packed_array, + add_vector2_array_to_packed_array, + delete_vector2_from_packed_array, + get_vector2_from_packed_array, + set_vector2_in_packed_array, + resize_vector2_packed_array, + add_vector3_to_packed_array, + add_vector3_array_to_packed_array, + delete_vector3_from_packed_array, + get_vector3_from_packed_array, + set_vector3_in_packed_array, + resize_vector3_packed_array, + is_sent_xr_same_instance_as_jvm_singleton, + create_variant_array_of_user_type +] \ No newline at end of file diff --git a/harness/tests/scripts/godot/tests/packedarray/PackedArrayTest.gdj b/harness/tests/scripts/godot/tests/packedarray/PackedArrayTest.gdj index 07fa993352..1cd0293fda 100644 --- a/harness/tests/scripts/godot/tests/packedarray/PackedArrayTest.gdj +++ b/harness/tests/scripts/godot/tests/packedarray/PackedArrayTest.gdj @@ -25,9 +25,15 @@ functions = [ convert_long_array, convert_float_array, convert_double_array, + convert_vector2_array, + convert_vector3_array, + convert_vector4_array, get_byte_array_value, get_int_array_value, get_long_array_value, get_float_array_value, - get_double_array_value + get_double_array_value, + get_vector2_array_value, + get_vector3_array_value, + get_vector4_array_value ] \ No newline at end of file diff --git a/kt/gradle/wrapper/gradle-wrapper.properties b/kt/gradle/wrapper/gradle-wrapper.properties index ed4c299adb..48b43d3506 100644 --- a/kt/gradle/wrapper/gradle-wrapper.properties +++ b/kt/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/createIOSStaticLibrary.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/createIOSStaticLibrary.kt index 8f556f08ab..018847bab9 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/createIOSStaticLibrary.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/createIOSStaticLibrary.kt @@ -21,15 +21,22 @@ fun Project.createIOSStaticLibraryTask( doFirst { val iosLibDir = project.layout.buildDirectory.asFile.get().resolve("libs").resolve("ios") + val userCodePath = iosLibDir + .listFiles() + ?.filter { file -> file.isDirectory && file.name.startsWith("SVM-") } + ?.maxByOrNull { file -> file.lastModified() } + ?.resolve("usercode.o") + ?.absolutePath + + requireNotNull(userCodePath) { + "usercode.o was not generated. Make sure that this task runs after `createIOSGraalNativeImage`" + } + commandLine( "ar", "-r", "${iosLibDir.absolutePath}/usercode.a", - iosLibDir.listFiles() - ?.filter { file -> file.isDirectory && file.name.startsWith("SVM-") } - ?.maxByOrNull { file -> file.lastModified() } - ?.resolve("usercode.o") - ?.absolutePath, + userCodePath, ) logger.quiet(commandLine.joinToString(" ")) From 7cfe746d78c165cd4128146466cb71dbba35f35e Mon Sep 17 00:00:00 2001 From: chippmann Date: Fri, 8 Aug 2025 14:32:26 +0200 Subject: [PATCH 2/6] Update dependencies --- .../godot/tests/CoreTypesIdentityTest.gdj | 6 ++--- .../scripts/godot/tests/JavaTestClass.gdj | 4 +-- .../godot/codegen/generation/rule/FileRule.kt | 6 ++--- .../godot/codegen/models/ApiDescription.kt | 20 +++++++------- .../kotlin/godot/codegen/models/Argument.kt | 8 +++--- .../godot/codegen/models/BuiltinClass.kt | 24 ++++++++--------- .../models/BuiltinClassMemberOffsets.kt | 4 +-- .../godot/codegen/models/BuiltinClassSizes.kt | 4 +-- .../main/kotlin/godot/codegen/models/Class.kt | 24 ++++++++--------- .../codegen/models/ClassMemberOffsets.kt | 4 +-- .../kotlin/godot/codegen/models/Constant.kt | 10 +++---- .../godot/codegen/models/Constructor.kt | 8 +++--- .../main/kotlin/godot/codegen/models/Enum.kt | 6 ++--- .../kotlin/godot/codegen/models/EnumValue.kt | 6 ++--- .../kotlin/godot/codegen/models/Header.kt | 12 ++++----- .../kotlin/godot/codegen/models/Member.kt | 8 +++--- .../godot/codegen/models/MemberOffset.kt | 6 ++--- .../kotlin/godot/codegen/models/Method.kt | 26 +++++++++---------- .../godot/codegen/models/NativeStructure.kt | 4 +-- .../kotlin/godot/codegen/models/Operator.kt | 10 +++---- .../kotlin/godot/codegen/models/Property.kt | 14 +++++----- .../godot/codegen/models/ReturnValue.kt | 4 +-- .../kotlin/godot/codegen/models/Signal.kt | 8 +++--- .../kotlin/godot/codegen/models/Singleton.kt | 4 +-- .../main/kotlin/godot/codegen/models/Size.kt | 4 +-- .../godot/codegen/models/UtilityFunction.kt | 16 ++++++------ .../RegisteredClassMetadataContainerExt.kt | 3 +-- kt/gradle.properties | 1 + kt/gradle/libs.versions.toml | 23 ++++++++-------- 29 files changed, 139 insertions(+), 138 deletions(-) diff --git a/harness/tests/scripts/godot/tests/CoreTypesIdentityTest.gdj b/harness/tests/scripts/godot/tests/CoreTypesIdentityTest.gdj index c542b7be20..a8dfc940d7 100644 --- a/harness/tests/scripts/godot/tests/CoreTypesIdentityTest.gdj +++ b/harness/tests/scripts/godot/tests/CoreTypesIdentityTest.gdj @@ -33,10 +33,10 @@ functions = [ basis, color, plane, - quat, rect2, - transform, transform2_d, vector2, - vector3 + vector3, + quat, + transform ] \ No newline at end of file diff --git a/harness/tests/scripts/godot/tests/JavaTestClass.gdj b/harness/tests/scripts/godot/tests/JavaTestClass.gdj index 655a8a716a..39cc387528 100644 --- a/harness/tests/scripts/godot/tests/JavaTestClass.gdj +++ b/harness/tests/scripts/godot/tests/JavaTestClass.gdj @@ -32,8 +32,8 @@ properties = [ dictionary ] functions = [ - _ready, - greeting, + greeting, + _ready, connect_and_trigger_signal, signal_callback ] \ No newline at end of file diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/generation/rule/FileRule.kt b/kt/api-generator/src/main/kotlin/godot/codegen/generation/rule/FileRule.kt index 7f12d8e0a0..36f3d5b6fe 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/generation/rule/FileRule.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/generation/rule/FileRule.kt @@ -55,8 +55,8 @@ class WarningRule() : GodotApiRule() { } class StaticRule : GodotApiRule() { - override fun apply(fileTask: FileTask, context: GenerationContext) = configure(fileTask.builder) { - for (classTask in fileTask.classes) { + override fun apply(task: FileTask, context: GenerationContext) = configure(task.builder) { + for (classTask in task.classes) { for (method in classTask.enrichedStaticMethods) { method.builder.addAnnotation(JvmStatic::class) } @@ -114,7 +114,7 @@ class DocumentationRule : GodotApiRule() { private val codeBlockRegex = Regex("""```[\s\S]*?```""") private val doubleSkipRegex = Regex("(?, - @JsonProperty("builtin_class_member_offsets") val builtinClassMemberOffsets: List, - @JsonProperty("global_constants") val globalConstants: List, - @JsonProperty("global_enums") val globalEnums: List, - @JsonProperty("utility_functions") val utilityFunctions: List, - @JsonProperty("builtin_classes") val builtinClasses: List, - @JsonProperty("classes") val classes: List, - @JsonProperty("singletons") val singletons: List, - @JsonProperty("native_structures") val nativeStructures: List + @param:JsonProperty("header") val header: Header, + @param:JsonProperty("builtin_class_sizes") val builtinClassSizes: List, + @param:JsonProperty("builtin_class_member_offsets") val builtinClassMemberOffsets: List, + @param:JsonProperty("global_constants") val globalConstants: List, + @param:JsonProperty("global_enums") val globalEnums: List, + @param:JsonProperty("utility_functions") val utilityFunctions: List, + @param:JsonProperty("builtin_classes") val builtinClasses: List, + @param:JsonProperty("classes") val classes: List, + @param:JsonProperty("singletons") val singletons: List, + @param:JsonProperty("native_structures") val nativeStructures: List ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/Argument.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/Argument.kt index fe4800ea71..35580653f3 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/Argument.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/Argument.kt @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class Argument @JsonCreator constructor( - @JsonProperty("name") val name: String, - @JsonProperty("type") val type: String, - @JsonProperty("meta") val meta: String?, - @JsonProperty("default_value") val defaultValue: String? + @param:JsonProperty("name") val name: String, + @param:JsonProperty("type") val type: String, + @param:JsonProperty("meta") val meta: String?, + @param:JsonProperty("default_value") val defaultValue: String? ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClass.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClass.kt index 4ea07f3896..b83b1d462f 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClass.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClass.kt @@ -4,16 +4,16 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class BuiltinClass @JsonCreator constructor( - @JsonProperty("name") val name: String, - @JsonProperty("is_keyed") val isKeyed: Boolean, - @JsonProperty("operators") val operators: List, - @JsonProperty("constructors") val constructors: List, - @JsonProperty("has_destructor") val hasDestructor: Boolean, - @JsonProperty("methods") val methods: List?, - @JsonProperty("members") val members: List?, - @JsonProperty("constants") val constants: List?, - @JsonProperty("enums") val enums: List?, - @JsonProperty("indexing_return_type") val indexingReturnType: String?, - @JsonProperty("description") val description: String?, - @JsonProperty("brief_description") val briefDescription: String? + @param:JsonProperty("name") val name: String, + @param:JsonProperty("is_keyed") val isKeyed: Boolean, + @param:JsonProperty("operators") val operators: List, + @param:JsonProperty("constructors") val constructors: List, + @param:JsonProperty("has_destructor") val hasDestructor: Boolean, + @param:JsonProperty("methods") val methods: List?, + @param:JsonProperty("members") val members: List?, + @param:JsonProperty("constants") val constants: List?, + @param:JsonProperty("enums") val enums: List?, + @param:JsonProperty("indexing_return_type") val indexingReturnType: String?, + @param:JsonProperty("description") val description: String?, + @param:JsonProperty("brief_description") val briefDescription: String? ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClassMemberOffsets.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClassMemberOffsets.kt index b9eb1568b9..6557144d7f 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClassMemberOffsets.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClassMemberOffsets.kt @@ -4,6 +4,6 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class BuiltinClassMemberOffsets @JsonCreator constructor( - @JsonProperty("build_configuration") val buildConfiguration: String, - @JsonProperty("classes") val classes: List + @param:JsonProperty("build_configuration") val buildConfiguration: String, + @param:JsonProperty("classes") val classes: List ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClassSizes.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClassSizes.kt index 49a8a04d82..b7b835175a 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClassSizes.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/BuiltinClassSizes.kt @@ -4,6 +4,6 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class BuiltinClassSizes @JsonCreator constructor( - @JsonProperty("build_configuration") val buildConfiguration: String, - @JsonProperty("sizes") val sizes: List + @param:JsonProperty("build_configuration") val buildConfiguration: String, + @param:JsonProperty("sizes") val sizes: List ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/Class.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/Class.kt index d31b35d860..60fae50736 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/Class.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/Class.kt @@ -4,18 +4,18 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class Class @JsonCreator constructor( - @JsonProperty("name") val name: String, - @JsonProperty("is_refcounted") val isRefCounted: Boolean, - @JsonProperty("is_instantiable") val isInstantiable: Boolean, - @JsonProperty("inherits") val inherits: String?, - @JsonProperty("api_type") val apiType: String, - @JsonProperty("enums") val enums: List?, - @JsonProperty("methods") val methods: List?, - @JsonProperty("properties") val properties: List?, - @JsonProperty("constants") val constants: List?, - @JsonProperty("signals") val signals: List?, - @JsonProperty("description") val description: String?, - @JsonProperty("brief_description") val briefDescription: String? + @param:JsonProperty("name") val name: String, + @param:JsonProperty("is_refcounted") val isRefCounted: Boolean, + @param:JsonProperty("is_instantiable") val isInstantiable: Boolean, + @param:JsonProperty("inherits") val inherits: String?, + @param:JsonProperty("api_type") val apiType: String, + @param:JsonProperty("enums") val enums: List?, + @param:JsonProperty("methods") val methods: List?, + @param:JsonProperty("properties") val properties: List?, + @param:JsonProperty("constants") val constants: List?, + @param:JsonProperty("signals") val signals: List?, + @param:JsonProperty("description") val description: String?, + @param:JsonProperty("brief_description") val briefDescription: String? ) { fun copy(newName: String) = Class( newName, diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/ClassMemberOffsets.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/ClassMemberOffsets.kt index 17e3bdbc77..941b12c7f5 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/ClassMemberOffsets.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/ClassMemberOffsets.kt @@ -3,6 +3,6 @@ package godot.codegen.models import com.fasterxml.jackson.annotation.JsonProperty data class ClassMemberOffsets( - @JsonProperty("name") val name: String, - @JsonProperty("members") val members: List + @param:JsonProperty("name") val name: String, + @param:JsonProperty("members") val members: List ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/Constant.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/Constant.kt index 4a990833bb..2ba17e927f 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/Constant.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/Constant.kt @@ -4,9 +4,9 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class Constant @JsonCreator constructor( - @JsonProperty("name") val name: String, - @JsonProperty("type") val type: String?, - @JsonProperty("value") val value: String, - @JsonProperty("description") val description: String?, - @JsonProperty("brief_description") val briefDescription: String? + @param:JsonProperty("name") val name: String, + @param:JsonProperty("type") val type: String?, + @param:JsonProperty("value") val value: String, + @param:JsonProperty("description") val description: String?, + @param:JsonProperty("brief_description") val briefDescription: String? ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/Constructor.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/Constructor.kt index cb90d9d27a..705abeaccb 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/Constructor.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/Constructor.kt @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class Constructor @JsonCreator constructor( - @JsonProperty("index") val index: Int, - @JsonProperty("arguments") val arguments: List?, - @JsonProperty("description") val description: String?, - @JsonProperty("brief_description") val briefDescription: String? + @param:JsonProperty("index") val index: Int, + @param:JsonProperty("arguments") val arguments: List?, + @param:JsonProperty("description") val description: String?, + @param:JsonProperty("brief_description") val briefDescription: String? ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/Enum.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/Enum.kt index 60f7918a53..8ad6c1e128 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/Enum.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/Enum.kt @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class Enum @JsonCreator constructor( - @JsonProperty("name") val name: String, - @JsonProperty("values") val values: List, - @JsonProperty("is_bitfield") val isBitField: Boolean = false + @param:JsonProperty("name") val name: String, + @param:JsonProperty("values") val values: List, + @param:JsonProperty("is_bitfield") val isBitField: Boolean = false ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/EnumValue.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/EnumValue.kt index c4b2817f95..6d5cda3b53 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/EnumValue.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/EnumValue.kt @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class EnumValue @JsonCreator constructor( - @JsonProperty("name") val name: String, - @JsonProperty("value") val value: Long, - @JsonProperty("description") val description: String? = null + @param:JsonProperty("name") val name: String, + @param:JsonProperty("value") val value: Long, + @param:JsonProperty("description") val description: String? = null ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/Header.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/Header.kt index 8880518105..31913e219f 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/Header.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/Header.kt @@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class Header @JsonCreator constructor( - @JsonProperty("version_major") val versionMajor: Int, - @JsonProperty("version_minor") val versionMinor: Int, - @JsonProperty("version_patch") val versionPatch: Int, - @JsonProperty("version_status") val versionStatus: String, - @JsonProperty("version_build") val versionBuild: String, - @JsonProperty("version_full_name") val versionFullName: String + @param:JsonProperty("version_major") val versionMajor: Int, + @param:JsonProperty("version_minor") val versionMinor: Int, + @param:JsonProperty("version_patch") val versionPatch: Int, + @param:JsonProperty("version_status") val versionStatus: String, + @param:JsonProperty("version_build") val versionBuild: String, + @param:JsonProperty("version_full_name") val versionFullName: String ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/Member.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/Member.kt index 243ab0a9f7..49dac54e53 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/Member.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/Member.kt @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class Member @JsonCreator constructor( - @JsonProperty("name") val name: String, - @JsonProperty("type") val type: String, - @JsonProperty("description") val description: String?, - @JsonProperty("brief_description") val briefDescription: String? + @param:JsonProperty("name") val name: String, + @param:JsonProperty("type") val type: String, + @param:JsonProperty("description") val description: String?, + @param:JsonProperty("brief_description") val briefDescription: String? ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/MemberOffset.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/MemberOffset.kt index 81bc17bc16..6c1a6fd253 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/MemberOffset.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/MemberOffset.kt @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class MemberOffset @JsonCreator constructor( - @JsonProperty("member") val member: String, - @JsonProperty("offset") val offset: Int, - @JsonProperty("meta") val meta: String? + @param:JsonProperty("member") val member: String, + @param:JsonProperty("offset") val offset: Int, + @param:JsonProperty("meta") val meta: String? ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/Method.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/Method.kt index 6e03738732..0825876f61 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/Method.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/Method.kt @@ -4,17 +4,17 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class Method @JsonCreator constructor( - @JsonProperty("name") val name: String, - @JsonProperty("is_const") val isConst: Boolean, - @JsonProperty("is_vararg") val isVararg: Boolean, - @JsonProperty("is_virtual") val isVirtual: Boolean, - @JsonProperty("is_static") val isStatic: Boolean, - @JsonProperty("is_required") val isRequired: Boolean, - @JsonProperty("hash") val hash: Long, - @JsonProperty("hash_compatibility") val hashCompatibility: List?, - @JsonProperty("return_value") val returnValue: ReturnValue?, - @JsonProperty("return_type") val returnType: String?, - @JsonProperty("arguments") val arguments: List?, - @JsonProperty("description") val description: String?, - @JsonProperty("brief_description") val briefDescription: String? + @param:JsonProperty("name") val name: String, + @param:JsonProperty("is_const") val isConst: Boolean, + @param:JsonProperty("is_vararg") val isVararg: Boolean, + @param:JsonProperty("is_virtual") val isVirtual: Boolean, + @param:JsonProperty("is_static") val isStatic: Boolean, + @param:JsonProperty("is_required") val isRequired: Boolean, + @param:JsonProperty("hash") val hash: Long, + @param:JsonProperty("hash_compatibility") val hashCompatibility: List?, + @param:JsonProperty("return_value") val returnValue: ReturnValue?, + @param:JsonProperty("return_type") val returnType: String?, + @param:JsonProperty("arguments") val arguments: List?, + @param:JsonProperty("description") val description: String?, + @param:JsonProperty("brief_description") val briefDescription: String? ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/NativeStructure.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/NativeStructure.kt index ade489649a..196d5a4787 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/NativeStructure.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/NativeStructure.kt @@ -4,6 +4,6 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class NativeStructure @JsonCreator constructor( - @JsonProperty("name") val name: String, - @JsonProperty("format") val format: String + @param:JsonProperty("name") val name: String, + @param:JsonProperty("format") val format: String ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/Operator.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/Operator.kt index 211c5d9290..e464a88422 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/Operator.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/Operator.kt @@ -4,9 +4,9 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class Operator @JsonCreator constructor( - @JsonProperty("name") val name: String, - @JsonProperty("right_type") val rightType: String?, - @JsonProperty("return_type") val returnType: String, - @JsonProperty("description") val description: String?, - @JsonProperty("brief_description") val briefDescription: String? + @param:JsonProperty("name") val name: String, + @param:JsonProperty("right_type") val rightType: String?, + @param:JsonProperty("return_type") val returnType: String, + @param:JsonProperty("description") val description: String?, + @param:JsonProperty("brief_description") val briefDescription: String? ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/Property.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/Property.kt index f883ad2a5b..841aa16b7a 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/Property.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/Property.kt @@ -4,11 +4,11 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class Property @JsonCreator constructor( - @JsonProperty("type") val type: String, - @JsonProperty("name") val name: String, - @JsonProperty("setter") val setter: String?, - @JsonProperty("getter") val getter: String, - @JsonProperty("index") val index: Int?, - @JsonProperty("description") val description: String?, - @JsonProperty("brief_description") val briefDescription: String? + @param:JsonProperty("type") val type: String, + @param:JsonProperty("name") val name: String, + @param:JsonProperty("setter") val setter: String?, + @param:JsonProperty("getter") val getter: String, + @param:JsonProperty("index") val index: Int?, + @param:JsonProperty("description") val description: String?, + @param:JsonProperty("brief_description") val briefDescription: String? ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/ReturnValue.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/ReturnValue.kt index c7241c9847..7ea254d540 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/ReturnValue.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/ReturnValue.kt @@ -4,6 +4,6 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class ReturnValue @JsonCreator constructor( - @JsonProperty("type") val type: String, - @JsonProperty("meta") val meta: String?, + @param:JsonProperty("type") val type: String, + @param:JsonProperty("meta") val meta: String?, ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/Signal.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/Signal.kt index aec3a4f75c..baf5e880aa 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/Signal.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/Signal.kt @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class Signal @JsonCreator constructor( - @JsonProperty("name") val name: String, - @JsonProperty("arguments") val arguments: List?, - @JsonProperty("description") val description: String?, - @JsonProperty("brief_description") val briefDescription: String? + @param:JsonProperty("name") val name: String, + @param:JsonProperty("arguments") val arguments: List?, + @param:JsonProperty("description") val description: String?, + @param:JsonProperty("brief_description") val briefDescription: String? ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/Singleton.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/Singleton.kt index d09f1f8304..15f8ec877c 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/Singleton.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/Singleton.kt @@ -4,6 +4,6 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class Singleton @JsonCreator constructor( - @JsonProperty("name") val name: String, - @JsonProperty("type") val type: String + @param:JsonProperty("name") val name: String, + @param:JsonProperty("type") val type: String ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/Size.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/Size.kt index 51e314c072..837023523f 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/Size.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/Size.kt @@ -4,6 +4,6 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class Size @JsonCreator constructor( - @JsonProperty("name") val name: String, - @JsonProperty("size") val size: Int + @param:JsonProperty("name") val name: String, + @param:JsonProperty("size") val size: Int ) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/models/UtilityFunction.kt b/kt/api-generator/src/main/kotlin/godot/codegen/models/UtilityFunction.kt index c22db0b8cf..38565821e0 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/models/UtilityFunction.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/models/UtilityFunction.kt @@ -4,12 +4,12 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty data class UtilityFunction @JsonCreator constructor( - @JsonProperty("name") val name: String, - @JsonProperty("return_type") val returnType: String?, - @JsonProperty("category") val category: String, - @JsonProperty("is_vararg") val isVararg: Boolean, - @JsonProperty("hash") val hash: Long, - @JsonProperty("arguments") val arguments: List?, - @JsonProperty("description") val description: String?, - @JsonProperty("brief_description") val briefDescription: String? + @param:JsonProperty("name") val name: String, + @param:JsonProperty("return_type") val returnType: String?, + @param:JsonProperty("category") val category: String, + @param:JsonProperty("is_vararg") val isVararg: Boolean, + @param:JsonProperty("hash") val hash: Long, + @param:JsonProperty("arguments") val arguments: List?, + @param:JsonProperty("description") val description: String?, + @param:JsonProperty("brief_description") val briefDescription: String? ) diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/RegisteredClassMetadataContainerExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/RegisteredClassMetadataContainerExt.kt index eed2ea5df6..51447ea468 100644 --- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/RegisteredClassMetadataContainerExt.kt +++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/RegisteredClassMetadataContainerExt.kt @@ -2,7 +2,6 @@ package godot.annotation.processor.ext import godot.annotation.processor.Settings import godot.tools.common.constants.FileExtensions -import org.jetbrains.kotlin.konan.properties.suffix internal fun provideRegistrationFilePathForInitialGenerationWithoutExtension( settings: Settings, @@ -28,5 +27,5 @@ internal fun provideRegistrationFilePathForInitialGenerationWithoutExtension( "${registrationFileOutDir}/$localResourcePath" } else { "${registrationFileOutDir}/dependencies/${classProjectName}/$localResourcePath" - }.suffix(FileExtensions.GodotKotlinJvm.registrationFile) + }.let { "${it}.${FileExtensions.GodotKotlinJvm.registrationFile}" } } diff --git a/kt/gradle.properties b/kt/gradle.properties index a807b47cb8..36d99b0149 100644 --- a/kt/gradle.properties +++ b/kt/gradle.properties @@ -1 +1,2 @@ org.gradle.jvmargs=-Xmx3G +ksp.useKSP2=true diff --git a/kt/gradle/libs.versions.toml b/kt/gradle/libs.versions.toml index c9ac1a6931..cac39d2d88 100644 --- a/kt/gradle/libs.versions.toml +++ b/kt/gradle/libs.versions.toml @@ -1,31 +1,32 @@ [versions] godotKotlinJvm = "0.13.1" -kotlin = "2.1.10" # https://kotlinlang.org/docs/releases.html#release-details -kotlinCoroutine = "1.10.1" # https://github.com/Kotlin/kotlinx.coroutines/releases +kotlin = "2.2.0" # https://kotlinlang.org/docs/releases.html#release-details +kotlinCoroutine = "1.10.2" # https://github.com/Kotlin/kotlinx.coroutines/releases godot = "4.4.1" -ideaPluginDefaultIntellijVersion = "2025.1" +ideaPluginDefaultIntellijVersion = "2025.2" toolchain-jvm="11" -shadowJar = "8.3.6" # https://github.com/johnrengelman/shadow/releases +# Migrate to 9.0.0 ASAP +shadowJar = "8.3.9" # https://github.com/johnrengelman/shadow/releases # TODO: bump kotlin poet version once: https://github.com/square/kotlinpoet/issues/1759 is fixed #kotlinPoet = "1.18.0" # https://github.com/square/kotlinpoet/releases kotlinPoet = "1.12.0" # https://github.com/square/kotlinpoet/releases -ksp = "2.1.10-1.0.30" # https://github.com/google/ksp/releases +ksp = "2.2.0-2.0.2" # https://github.com/google/ksp/releases -jacksonDataBind = "2.18.2" # https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -jacksonDataFormatXml = "2.18.2" # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml +jacksonDataBind = "2.19.2" # https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind +jacksonDataFormatXml = "2.19.2" # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml -grgit = "5.3.0" # https://github.com/ajoberstar/grgit/releases +grgit = "5.3.2" # https://github.com/ajoberstar/grgit/releases gradlePublish = "1.3.1" # https://plugins.gradle.org/plugin/com.gradle.plugin-publish maven-publish="0.32.0" # https://github.com/vanniktech/gradle-maven-publish-plugin/releases -changelog = "2.2.1" # https://github.com/JetBrains/gradle-changelog-plugin/releases -gradleIntelliJPlugin = "2.3.0" # https://github.com/JetBrains/intellij-platform-gradle-plugin/releases -ideaSync = "1.1.10" # https://plugins.gradle.org/plugin/org.jetbrains.gradle.plugin.idea-ext +changelog = "2.4.0" # https://github.com/JetBrains/gradle-changelog-plugin/releases +gradleIntelliJPlugin = "2.7.0" # https://github.com/JetBrains/intellij-platform-gradle-plugin/releases +ideaSync = "1.2" # https://plugins.gradle.org/plugin/org.jetbrains.gradle.plugin.idea-ext kotlinPreProcessors = "0.2.0" # https://github.com/utopia-rise/kotlin-preprocessors/tags iosJdk = "21" From fa296ddc6f8e68272df1a146ac08e97cd24b4409 Mon Sep 17 00:00:00 2001 From: chippmann Date: Fri, 8 Aug 2025 15:43:57 +0200 Subject: [PATCH 3/6] Downgrade --- kt/gradle/libs.versions.toml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/kt/gradle/libs.versions.toml b/kt/gradle/libs.versions.toml index cac39d2d88..995c5af8a7 100644 --- a/kt/gradle/libs.versions.toml +++ b/kt/gradle/libs.versions.toml @@ -1,32 +1,31 @@ [versions] godotKotlinJvm = "0.13.1" -kotlin = "2.2.0" # https://kotlinlang.org/docs/releases.html#release-details +kotlin = "2.1.10" # https://kotlinlang.org/docs/releases.html#release-details kotlinCoroutine = "1.10.2" # https://github.com/Kotlin/kotlinx.coroutines/releases godot = "4.4.1" -ideaPluginDefaultIntellijVersion = "2025.2" +ideaPluginDefaultIntellijVersion = "2025.1" toolchain-jvm="11" -# Migrate to 9.0.0 ASAP -shadowJar = "8.3.9" # https://github.com/johnrengelman/shadow/releases +shadowJar = "8.3.6" # https://github.com/johnrengelman/shadow/releases # TODO: bump kotlin poet version once: https://github.com/square/kotlinpoet/issues/1759 is fixed #kotlinPoet = "1.18.0" # https://github.com/square/kotlinpoet/releases kotlinPoet = "1.12.0" # https://github.com/square/kotlinpoet/releases -ksp = "2.2.0-2.0.2" # https://github.com/google/ksp/releases +ksp = "2.1.10-1.0.30" # https://github.com/google/ksp/releases -jacksonDataBind = "2.19.2" # https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -jacksonDataFormatXml = "2.19.2" # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml +jacksonDataBind = "2.18.2" # https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind +jacksonDataFormatXml = "2.18.2" # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml -grgit = "5.3.2" # https://github.com/ajoberstar/grgit/releases +grgit = "5.3.0" # https://github.com/ajoberstar/grgit/releases gradlePublish = "1.3.1" # https://plugins.gradle.org/plugin/com.gradle.plugin-publish maven-publish="0.32.0" # https://github.com/vanniktech/gradle-maven-publish-plugin/releases -changelog = "2.4.0" # https://github.com/JetBrains/gradle-changelog-plugin/releases -gradleIntelliJPlugin = "2.7.0" # https://github.com/JetBrains/intellij-platform-gradle-plugin/releases -ideaSync = "1.2" # https://plugins.gradle.org/plugin/org.jetbrains.gradle.plugin.idea-ext +changelog = "2.2.1" # https://github.com/JetBrains/gradle-changelog-plugin/releases +gradleIntelliJPlugin = "2.3.0" # https://github.com/JetBrains/intellij-platform-gradle-plugin/releases +ideaSync = "1.1.10" # https://plugins.gradle.org/plugin/org.jetbrains.gradle.plugin.idea-ext kotlinPreProcessors = "0.2.0" # https://github.com/utopia-rise/kotlin-preprocessors/tags iosJdk = "21" From 66214a8337d9e45cffbc5e8b6fc07f5ea9a625c6 Mon Sep 17 00:00:00 2001 From: chippmann Date: Fri, 8 Aug 2025 15:45:12 +0200 Subject: [PATCH 4/6] Use explicit return types for kotlin poet upgrade --- .../codegen/generation/rule/MethodRule.kt | 2 + .../impl/LambdaCallableGenerationService.kt | 21 +- .../services/impl/SignalGenerationService.kt | 3 + .../main/kotlin/godot/api/AnimatedSprite2D.kt | 6 +- .../main/kotlin/godot/api/AnimatedSprite3D.kt | 6 +- .../src/main/kotlin/godot/api/Animation.kt | 10 +- .../main/kotlin/godot/api/AnimationLibrary.kt | 4 +- .../main/kotlin/godot/api/AnimationMixer.kt | 11 +- .../main/kotlin/godot/api/AnimationNode.kt | 6 +- .../godot/api/AnimationNodeAnimation.kt | 2 +- .../godot/api/AnimationNodeBlendTree.kt | 12 +- .../godot/api/AnimationNodeStateMachine.kt | 14 +- .../api/AnimationNodeStateMachinePlayback.kt | 4 +- .../AnimationNodeStateMachineTransition.kt | 2 +- .../main/kotlin/godot/api/AnimationPlayer.kt | 25 +- .../main/kotlin/godot/api/AnimationTree.kt | 5 +- .../src/main/kotlin/godot/api/Area2D.kt | 2 +- .../src/main/kotlin/godot/api/Area3D.kt | 7 +- .../src/main/kotlin/godot/api/ArrayMesh.kt | 4 +- .../kotlin/godot/api/AudioEffectCompressor.kt | 11 +- .../src/main/kotlin/godot/api/AudioServer.kt | 2 +- .../godot/api/AudioStreamInteractive.kt | 2 +- .../api/AudioStreamPlaybackInteractive.kt | 2 +- .../kotlin/godot/api/AudioStreamPlayer.kt | 2 +- .../kotlin/godot/api/AudioStreamPlayer2D.kt | 2 +- .../kotlin/godot/api/AudioStreamPlayer3D.kt | 2 +- .../main/kotlin/godot/api/BoneAttachment3D.kt | 2 +- .../src/main/kotlin/godot/api/BoneMap.kt | 2 +- .../src/main/kotlin/godot/api/CSGPolygon3D.kt | 2 +- .../src/main/kotlin/godot/api/CanvasItem.kt | 2 +- .../src/main/kotlin/godot/api/Control.kt | 32 +- .../src/main/kotlin/godot/api/Engine.kt | 4 +- .../main/kotlin/godot/api/EngineDebugger.kt | 17 +- .../main/kotlin/godot/api/GLTFAnimation.kt | 2 +- .../src/main/kotlin/godot/api/GLTFLight.kt | 2 +- .../src/main/kotlin/godot/api/GLTFMesh.kt | 2 +- .../src/main/kotlin/godot/api/GLTFNode.kt | 2 +- .../godot/api/GLTFObjectModelProperty.kt | 5 +- .../src/main/kotlin/godot/api/GLTFState.kt | 2 +- .../main/kotlin/godot/api/GPUParticles2D.kt | 2 +- .../main/kotlin/godot/api/GPUParticles3D.kt | 2 +- .../kotlin/godot/api/GeometryInstance3D.kt | 2 +- .../src/main/kotlin/godot/api/GraphEdit.kt | 9 +- .../godot/api/ImporterMeshInstance3D.kt | 2 +- .../src/main/kotlin/godot/api/Input.kt | 4 +- .../main/kotlin/godot/api/InputEventAction.kt | 2 +- .../src/main/kotlin/godot/api/InputMap.kt | 12 +- .../src/main/kotlin/godot/api/Joint2D.kt | 4 +- .../src/main/kotlin/godot/api/Joint3D.kt | 4 +- .../main/kotlin/godot/api/LightmapGIData.kt | 2 +- .../main/kotlin/godot/api/LookAtModifier3D.kt | 5 +- .../main/kotlin/godot/api/MeshInstance3D.kt | 2 +- .../main/kotlin/godot/api/MultiplayerAPI.kt | 2 +- .../kotlin/godot/api/MultiplayerSpawner.kt | 2 +- .../godot/api/MultiplayerSynchronizer.kt | 2 +- .../main/kotlin/godot/api/NavigationMesh.kt | 3 +- .../kotlin/godot/api/NavigationPolygon.kt | 2 +- .../src/main/kotlin/godot/api/Node.kt | 13 +- .../src/main/kotlin/godot/api/Node3D.kt | 3 +- .../src/main/kotlin/godot/api/OpenXRHand.kt | 2 +- .../src/main/kotlin/godot/api/Performance.kt | 5 +- .../main/kotlin/godot/api/PhysicalBone2D.kt | 2 +- .../src/main/kotlin/godot/api/Polygon2D.kt | 6 +- .../src/main/kotlin/godot/api/RDShaderFile.kt | 2 +- .../kotlin/godot/api/RemoteTransform2D.kt | 2 +- .../kotlin/godot/api/RemoteTransform3D.kt | 2 +- .../kotlin/godot/api/RenderSceneBuffersRD.kt | 2 +- .../main/kotlin/godot/api/RenderingServer.kt | 16 +- .../kotlin/godot/api/ResourcePreloader.kt | 6 +- .../main/kotlin/godot/api/RootMotionView.kt | 2 +- .../main/kotlin/godot/api/SceneMultiplayer.kt | 2 +- .../godot/api/SceneReplicationConfig.kt | 12 +- .../src/main/kotlin/godot/api/SceneTree.kt | 14 +- .../src/main/kotlin/godot/api/Shader.kt | 2 +- .../main/kotlin/godot/api/ShaderMaterial.kt | 2 +- .../src/main/kotlin/godot/api/Skeleton3D.kt | 2 +- .../src/main/kotlin/godot/api/SkeletonIK3D.kt | 6 +- .../godot/api/SkeletonModification2DCCDIK.kt | 7 +- .../godot/api/SkeletonModification2DFABRIK.kt | 4 +- .../godot/api/SkeletonModification2DJiggle.kt | 4 +- .../godot/api/SkeletonModification2DLookAt.kt | 4 +- .../SkeletonModification2DPhysicalBones.kt | 2 +- .../api/SkeletonModification2DTwoBoneIK.kt | 6 +- .../main/kotlin/godot/api/SkeletonProfile.kt | 14 +- .../src/main/kotlin/godot/api/Skin.kt | 2 +- .../src/main/kotlin/godot/api/SoftBody3D.kt | 4 +- .../kotlin/godot/api/SpringBoneSimulator3D.kt | 6 +- .../src/main/kotlin/godot/api/SpriteFrames.kt | 21 +- .../main/kotlin/godot/api/StatusIndicator.kt | 2 +- .../src/main/kotlin/godot/api/Theme.kt | 50 +-- .../src/main/kotlin/godot/api/Translation.kt | 6 +- .../kotlin/godot/api/TranslationServer.kt | 2 +- .../src/main/kotlin/godot/api/TreeItem.kt | 4 +- .../src/main/kotlin/godot/api/UndoRedo.kt | 4 +- .../kotlin/godot/api/VideoStreamPlayer.kt | 2 +- .../main/kotlin/godot/api/ViewportTexture.kt | 17 +- .../godot/api/VisibleOnScreenEnabler2D.kt | 3 +- .../godot/api/VisibleOnScreenEnabler3D.kt | 3 +- .../src/main/kotlin/godot/api/VisualShader.kt | 2 +- .../kotlin/godot/api/WebRTCPeerConnection.kt | 2 +- .../src/main/kotlin/godot/api/Window.kt | 26 +- .../main/kotlin/godot/api/XRBodyModifier3D.kt | 2 +- .../main/kotlin/godot/api/XRFaceModifier3D.kt | 4 +- .../main/kotlin/godot/api/XRHandModifier3D.kt | 2 +- .../src/main/kotlin/godot/api/XRInterface.kt | 2 +- .../src/main/kotlin/godot/api/XRNode3D.kt | 5 +- .../src/main/kotlin/godot/api/XRPose.kt | 2 +- .../kotlin/godot/api/XRPositionalTracker.kt | 6 +- .../src/main/kotlin/godot/api/XRTracker.kt | 2 +- .../src/main/kotlin/gen/godot/api/Object.kt | 18 +- .../main/kotlin/gen/godot/core/Callables.kt | 410 ++++++++++-------- .../src/main/kotlin/gen/godot/core/Signals.kt | 104 +++-- 112 files changed, 623 insertions(+), 542 deletions(-) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/generation/rule/MethodRule.kt b/kt/api-generator/src/main/kotlin/godot/codegen/generation/rule/MethodRule.kt index 61543b280a..97b7b78ac0 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/generation/rule/MethodRule.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/generation/rule/MethodRule.kt @@ -38,6 +38,8 @@ interface BaseMethodeRule { val shouldReturn = method.getTypeName() != UNIT if (shouldReturn) { returns(methodTypeName) + } else { + returns(UNIT) } generateParameters(method, context) diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/LambdaCallableGenerationService.kt b/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/LambdaCallableGenerationService.kt index fa09b25091..b37cd80fb8 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/LambdaCallableGenerationService.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/LambdaCallableGenerationService.kt @@ -249,8 +249,14 @@ object LambdaCallableGenerationService : ILambdaCallableGenerationService { val typeVariables = typeVariableNames.toMutableList() var removedTypeVariables = 0 while (typeVariables.isNotEmpty()) { - val bindReturnType = - ClassName(godotCorePackage, "$LAMBDA_CALLABLE_NAME${typeVariableNames.size - typeVariables.size}") + val bindReturnType = ClassName(godotCorePackage, "$LAMBDA_CALLABLE_NAME${typeVariableNames.size - typeVariables.size}") + + val returnType = if (removedTypeVariables > 0) { + bindReturnType.parameterizedBy(*typeVariableNames.take(typeVariableNames.size - typeVariables.size).toTypedArray(), returnTypeParameter) + } else { + bindReturnType.parameterizedBy(returnTypeParameter) + } + classBuilder.addFunction( FunSpec.builder("bind") .addParameters( @@ -291,6 +297,7 @@ object LambdaCallableGenerationService : ILambdaCallableGenerationService { bindReturnType, *typeVariableNames.take(removedTypeVariables).toTypedArray() ) + .returns(returnType) .build() ) @@ -304,6 +311,13 @@ object LambdaCallableGenerationService : ILambdaCallableGenerationService { callableFileSpec.addType(classBuilder.build()) val variantMapperMember = MemberName(godotCorePackage, "variantMapper") + + val returnTypeName = if (argCount > 0) { + ktCallableClassName.parameterizedBy(*typeVariableNames.toTypedArray(), returnTypeParameter) + } else { + ktCallableClassName.parameterizedBy(returnTypeParameter) + } + callableFileSpec.addFunction( FunSpec.builder(CALLABLE_FUNCTION_NAME + argCount) .addTypeVariables(typeVariableNames.map { it.copy(reified = true) }) @@ -347,6 +361,7 @@ object LambdaCallableGenerationService : ILambdaCallableGenerationService { .toTypedArray() ) ) + .returns(returnTypeName) .build() ) @@ -366,6 +381,7 @@ object LambdaCallableGenerationService : ILambdaCallableGenerationService { .build() ) .addCode("return·$CALLABLE_FUNCTION_NAME$argCount($ON_CANCEL_CALL_ARGUMENT_NAME,·this)") + .returns(returnTypeName) .build() ) } @@ -437,6 +453,7 @@ object LambdaCallableGenerationService : ILambdaCallableGenerationService { .addMember("\"create\"") .build() ) + .returns(genericClassNameInfo.className.parameterizedBy(*genericClassNameInfo.genericTypes.toTypedArray(), returnTypeParameter)) .build() ) .build() diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/SignalGenerationService.kt b/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/SignalGenerationService.kt index 173454e9b0..c668073816 100644 --- a/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/SignalGenerationService.kt +++ b/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/SignalGenerationService.kt @@ -290,6 +290,7 @@ object SignalGenerationService : ISignalGenerationService { .addMember("\"create\"") .build() ) + .returns(genericClassNameInfo.genericClassName) .build() ) .build() @@ -314,6 +315,7 @@ object SignalGenerationService : ISignalGenerationService { .addMember("\"FUNCTION_NAME\"") .build() ) + .returns(genericClassNameInfo.genericClassName) .build() } @@ -331,6 +333,7 @@ object SignalGenerationService : ISignalGenerationService { CodeBlock.of("return·%T.$DELEGATE_PROPERTY_NAME·as·%T", genericClassNameInfo.className, genericReadOnlyPropertyClassName) } ) + .returns(genericReadOnlyPropertyClassName) .apply { if (argCount != 0) { addAnnotation( diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimatedSprite2D.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimatedSprite2D.kt index fc72f78c94..a363cfa962 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimatedSprite2D.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimatedSprite2D.kt @@ -426,7 +426,7 @@ public open class AnimatedSprite2D : Node2D() { return (TransferContext.readReturnValue(DOUBLE) as Double).toFloat() } - public final fun setAnimation(name: String) = setAnimation(name.asCachedStringName()) + public final fun setAnimation(name: String): Unit = setAnimation(name.asCachedStringName()) /** * Plays the animation with key [name]. If [customSpeed] is negative and [fromEnd] is `true`, the @@ -440,7 +440,7 @@ public open class AnimatedSprite2D : Node2D() { name: String, customSpeed: Float = 1.0f, fromEnd: Boolean = false, - ) = play(name.asCachedStringName(), customSpeed, fromEnd) + ): Unit = play(name.asCachedStringName(), customSpeed, fromEnd) /** * Plays the animation with key [name] in reverse. @@ -448,7 +448,7 @@ public open class AnimatedSprite2D : Node2D() { * This method is a shorthand for [play] with `custom_speed = -1.0` and `from_end = true`, so see * its description for more information. */ - public final fun playBackwards(name: String) = playBackwards(name.asCachedStringName()) + public final fun playBackwards(name: String): Unit = playBackwards(name.asCachedStringName()) public companion object diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimatedSprite3D.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimatedSprite3D.kt index 703bad1b8b..f6fc952447 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimatedSprite3D.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimatedSprite3D.kt @@ -303,7 +303,7 @@ public open class AnimatedSprite3D : SpriteBase3D() { return (TransferContext.readReturnValue(DOUBLE) as Double).toFloat() } - public final fun setAnimation(name: String) = setAnimation(name.asCachedStringName()) + public final fun setAnimation(name: String): Unit = setAnimation(name.asCachedStringName()) /** * Plays the animation with key [name]. If [customSpeed] is negative and [fromEnd] is `true`, the @@ -317,7 +317,7 @@ public open class AnimatedSprite3D : SpriteBase3D() { name: String, customSpeed: Float = 1.0f, fromEnd: Boolean = false, - ) = play(name.asCachedStringName(), customSpeed, fromEnd) + ): Unit = play(name.asCachedStringName(), customSpeed, fromEnd) /** * Plays the animation with key [name] in reverse. @@ -325,7 +325,7 @@ public open class AnimatedSprite3D : SpriteBase3D() { * This method is a shorthand for [play] with `custom_speed = -1.0` and `from_end = true`, so see * its description for more information. */ - public final fun playBackwards(name: String) = playBackwards(name.asCachedStringName()) + public final fun playBackwards(name: String): Unit = playBackwards(name.asCachedStringName()) public companion object diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Animation.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Animation.kt index c8d5454602..4708cc12c1 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Animation.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Animation.kt @@ -1045,7 +1045,7 @@ public open class Animation : Resource() { * * For example, `"character/skeleton:ankle"` or `"character/mesh:transform/local"`. */ - public final fun trackSetPath(trackIdx: Int, path: String) = + public final fun trackSetPath(trackIdx: Int, path: String): Unit = trackSetPath(trackIdx, path.asCachedNodePath()) /** @@ -1072,18 +1072,18 @@ public open class Animation : Resource() { trackIdx: Int, keyIdx: Int, animation: String, - ) = animationTrackSetKeyAnimation(trackIdx, keyIdx, animation.asCachedStringName()) + ): Unit = animationTrackSetKeyAnimation(trackIdx, keyIdx, animation.asCachedStringName()) /** * Adds a marker to this Animation. */ - public final fun addMarker(name: String, time: Double) = + public final fun addMarker(name: String, time: Double): Unit = addMarker(name.asCachedStringName(), time) /** * Removes the marker with the given name from this Animation. */ - public final fun removeMarker(name: String) = removeMarker(name.asCachedStringName()) + public final fun removeMarker(name: String): Unit = removeMarker(name.asCachedStringName()) /** * Returns `true` if this Animation contains a marker with the given name. @@ -1103,7 +1103,7 @@ public open class Animation : Resource() { /** * Sets the given marker's color. */ - public final fun setMarkerColor(name: String, color: Color) = + public final fun setMarkerColor(name: String, color: Color): Unit = setMarkerColor(name.asCachedStringName(), color) public enum class TrackType( diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationLibrary.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationLibrary.kt index e23cf7a69f..ff4f5da97e 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationLibrary.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationLibrary.kt @@ -133,12 +133,12 @@ public open class AnimationLibrary : Resource() { /** * Removes the [Animation] with the key [name]. */ - public final fun removeAnimation(name: String) = removeAnimation(name.asCachedStringName()) + public final fun removeAnimation(name: String): Unit = removeAnimation(name.asCachedStringName()) /** * Changes the key of the [Animation] associated with the key [name] to [newname]. */ - public final fun renameAnimation(name: String, newname: String) = + public final fun renameAnimation(name: String, newname: String): Unit = renameAnimation(name.asCachedStringName(), newname.asCachedStringName()) /** diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationMixer.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationMixer.kt index aa6dce9e30..ce40ad5c5e 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationMixer.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationMixer.kt @@ -761,13 +761,13 @@ public open class AnimationMixer internal constructor() : Node() { /** * Removes the [AnimationLibrary] associated with the key [name]. */ - public final fun removeAnimationLibrary(name: String) = + public final fun removeAnimationLibrary(name: String): Unit = removeAnimationLibrary(name.asCachedStringName()) /** * Moves the [AnimationLibrary] associated with the key [name] to the key [newname]. */ - public final fun renameAnimationLibrary(name: String, newname: String) = + public final fun renameAnimationLibrary(name: String, newname: String): Unit = renameAnimationLibrary(name.asCachedStringName(), newname.asCachedStringName()) /** @@ -795,9 +795,10 @@ public open class AnimationMixer internal constructor() : Node() { */ public final fun getAnimation(name: String): Animation? = getAnimation(name.asCachedStringName()) - public final fun setRootNode(path: String) = setRootNode(path.asCachedNodePath()) + public final fun setRootNode(path: String): Unit = setRootNode(path.asCachedNodePath()) - public final fun setRootMotionTrack(path: String) = setRootMotionTrack(path.asCachedNodePath()) + public final fun setRootMotionTrack(path: String): Unit = + setRootMotionTrack(path.asCachedNodePath()) /** * If the animation track specified by [name] has an option [Animation.UPDATE_CAPTURE], stores @@ -818,7 +819,7 @@ public open class AnimationMixer internal constructor() : Node() { duration: Double, transType: Tween.TransitionType = Tween.TransitionType.LINEAR, easeType: Tween.EaseType = Tween.EaseType.IN, - ) = capture(name.asCachedStringName(), duration, transType, easeType) + ): Unit = capture(name.asCachedStringName(), duration, transType, easeType) public enum class AnimationCallbackModeProcess( id: Long, diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNode.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNode.kt index 6347089175..0aba507318 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNode.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNode.kt @@ -371,7 +371,7 @@ public open class AnimationNode : Resource() { /** * Adds or removes a path for the filter. */ - public final fun setFilterPath(path: String, enable: Boolean) = + public final fun setFilterPath(path: String, enable: Boolean): Unit = setFilterPath(path.asCachedNodePath(), enable) /** @@ -395,7 +395,7 @@ public open class AnimationNode : Resource() { isExternalSeeking: Boolean, blend: Float, loopedFlag: Animation.LoopedFlag = Animation.LoopedFlag.NONE, - ) = + ): Unit = blendAnimation(animation.asCachedStringName(), time, delta, seeked, isExternalSeeking, blend, loopedFlag) /** @@ -421,7 +421,7 @@ public open class AnimationNode : Resource() { * Sets a custom parameter. These are used as local memory, because resources can be reused across * the tree or scenes. */ - public final fun setParameter(name: String, `value`: Any?) = + public final fun setParameter(name: String, `value`: Any?): Unit = setParameter(name.asCachedStringName(), value) /** diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeAnimation.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeAnimation.kt index 1eea452bdf..7180f54cb5 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeAnimation.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeAnimation.kt @@ -229,7 +229,7 @@ public open class AnimationNodeAnimation : AnimationRootNode() { return Animation.LoopMode.from(TransferContext.readReturnValue(LONG) as Long) } - public final fun setAnimation(name: String) = setAnimation(name.asCachedStringName()) + public final fun setAnimation(name: String): Unit = setAnimation(name.asCachedStringName()) public enum class PlayMode( id: Long, diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeBlendTree.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeBlendTree.kt index cea9776520..955903de8e 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeBlendTree.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeBlendTree.kt @@ -193,7 +193,7 @@ public open class AnimationNodeBlendTree : AnimationRootNode() { name: String, node: AnimationNode?, position: Vector2 = Vector2(0, 0), - ) = addNode(name.asCachedStringName(), node, position) + ): Unit = addNode(name.asCachedStringName(), node, position) /** * Returns the sub animation node with the specified [name]. @@ -203,12 +203,12 @@ public open class AnimationNodeBlendTree : AnimationRootNode() { /** * Removes a sub animation node. */ - public final fun removeNode(name: String) = removeNode(name.asCachedStringName()) + public final fun removeNode(name: String): Unit = removeNode(name.asCachedStringName()) /** * Changes the name of a sub animation node. */ - public final fun renameNode(name: String, newName: String) = + public final fun renameNode(name: String, newName: String): Unit = renameNode(name.asCachedStringName(), newName.asCachedStringName()) /** @@ -224,18 +224,18 @@ public open class AnimationNodeBlendTree : AnimationRootNode() { inputNode: String, inputIndex: Int, outputNode: String, - ) = connectNode(inputNode.asCachedStringName(), inputIndex, outputNode.asCachedStringName()) + ): Unit = connectNode(inputNode.asCachedStringName(), inputIndex, outputNode.asCachedStringName()) /** * Disconnects the animation node connected to the specified input. */ - public final fun disconnectNode(inputNode: String, inputIndex: Int) = + public final fun disconnectNode(inputNode: String, inputIndex: Int): Unit = disconnectNode(inputNode.asCachedStringName(), inputIndex) /** * Modifies the position of a sub animation node. */ - public final fun setNodePosition(name: String, position: Vector2) = + public final fun setNodePosition(name: String, position: Vector2): Unit = setNodePosition(name.asCachedStringName(), position) /** diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeStateMachine.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeStateMachine.kt index 3c4bc16ea6..130cff83c6 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeStateMachine.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeStateMachine.kt @@ -305,12 +305,12 @@ public open class AnimationNodeStateMachine : AnimationRootNode() { name: String, node: AnimationNode?, position: Vector2 = Vector2(0, 0), - ) = addNode(name.asCachedStringName(), node, position) + ): Unit = addNode(name.asCachedStringName(), node, position) /** * Replaces the given animation node with a new animation node. */ - public final fun replaceNode(name: String, node: AnimationNode?) = + public final fun replaceNode(name: String, node: AnimationNode?): Unit = replaceNode(name.asCachedStringName(), node) /** @@ -321,12 +321,12 @@ public open class AnimationNodeStateMachine : AnimationRootNode() { /** * Deletes the given animation node from the graph. */ - public final fun removeNode(name: String) = removeNode(name.asCachedStringName()) + public final fun removeNode(name: String): Unit = removeNode(name.asCachedStringName()) /** * Renames the given animation node. */ - public final fun renameNode(name: String, newName: String) = + public final fun renameNode(name: String, newName: String): Unit = renameNode(name.asCachedStringName(), newName.asCachedStringName()) /** @@ -337,7 +337,7 @@ public open class AnimationNodeStateMachine : AnimationRootNode() { /** * Sets the animation node's coordinates. Used for display in the editor. */ - public final fun setNodePosition(name: String, position: Vector2) = + public final fun setNodePosition(name: String, position: Vector2): Unit = setNodePosition(name.asCachedStringName(), position) /** @@ -359,12 +359,12 @@ public open class AnimationNodeStateMachine : AnimationRootNode() { from: String, to: String, transition: AnimationNodeStateMachineTransition?, - ) = addTransition(from.asCachedStringName(), to.asCachedStringName(), transition) + ): Unit = addTransition(from.asCachedStringName(), to.asCachedStringName(), transition) /** * Deletes the transition between the two specified animation nodes. */ - public final fun removeTransition(from: String, to: String) = + public final fun removeTransition(from: String, to: String): Unit = removeTransition(from.asCachedStringName(), to.asCachedStringName()) public enum class StateMachineType( diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeStateMachinePlayback.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeStateMachinePlayback.kt index 2897a679f0..849a42d859 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeStateMachinePlayback.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeStateMachinePlayback.kt @@ -165,7 +165,7 @@ public open class AnimationNodeStateMachinePlayback : Resource() { * cause a teleportation. */ @JvmOverloads - public final fun travel(toNode: String, resetOnTeleport: Boolean = true) = + public final fun travel(toNode: String, resetOnTeleport: Boolean = true): Unit = travel(toNode.asCachedStringName(), resetOnTeleport) /** @@ -174,7 +174,7 @@ public open class AnimationNodeStateMachinePlayback : Resource() { * If [reset] is `true`, the animation is played from the beginning. */ @JvmOverloads - public final fun start(node: String, reset: Boolean = true) = + public final fun start(node: String, reset: Boolean = true): Unit = start(node.asCachedStringName(), reset) public companion object diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeStateMachineTransition.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeStateMachineTransition.kt index adea86df26..9d82a59d02 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeStateMachineTransition.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationNodeStateMachineTransition.kt @@ -272,7 +272,7 @@ public open class AnimationNodeStateMachineTransition : Resource() { return (TransferContext.readReturnValue(STRING) as String) } - public final fun setAdvanceCondition(name: String) = + public final fun setAdvanceCondition(name: String): Unit = setAdvanceCondition(name.asCachedStringName()) public enum class SwitchMode( diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationPlayer.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationPlayer.kt index 9e9294ad83..7ba5973bdf 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationPlayer.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationPlayer.kt @@ -745,7 +745,7 @@ public open class AnimationPlayer : AnimationMixer() { /** * Triggers the [animationTo] animation when the [animationFrom] animation completes. */ - public final fun animationSetNext(animationFrom: String, animationTo: String) = + public final fun animationSetNext(animationFrom: String, animationTo: String): Unit = animationSetNext(animationFrom.asCachedStringName(), animationTo.asCachedStringName()) /** @@ -761,7 +761,7 @@ public open class AnimationPlayer : AnimationMixer() { animationFrom: String, animationTo: String, sec: Double, - ) = setBlendTime(animationFrom.asCachedStringName(), animationTo.asCachedStringName(), sec) + ): Unit = setBlendTime(animationFrom.asCachedStringName(), animationTo.asCachedStringName(), sec) /** * Returns the blend time (in seconds) between two animations, referenced by their keys. @@ -791,7 +791,7 @@ public open class AnimationPlayer : AnimationMixer() { customBlend: Double = -1.0, customSpeed: Float = 1.0f, fromEnd: Boolean = false, - ) = play(name.asCachedStringName(), customBlend, customSpeed, fromEnd) + ): Unit = play(name.asCachedStringName(), customBlend, customSpeed, fromEnd) /** * Plays the animation with key [name] and the section starting from [startMarker] and ending on @@ -808,7 +808,7 @@ public open class AnimationPlayer : AnimationMixer() { customBlend: Double = -1.0, customSpeed: Float = 1.0f, fromEnd: Boolean = false, - ) = + ): Unit = playSectionWithMarkers(name.asCachedStringName(), startMarker.asCachedStringName(), endMarker.asCachedStringName(), customBlend, customSpeed, fromEnd) /** @@ -828,7 +828,8 @@ public open class AnimationPlayer : AnimationMixer() { customBlend: Double = -1.0, customSpeed: Float = 1.0f, fromEnd: Boolean = false, - ) = playSection(name.asCachedStringName(), startTime, endTime, customBlend, customSpeed, fromEnd) + ): Unit = + playSection(name.asCachedStringName(), startTime, endTime, customBlend, customSpeed, fromEnd) /** * Plays the animation with key [name] in reverse. @@ -837,7 +838,7 @@ public open class AnimationPlayer : AnimationMixer() { * its description for more information. */ @JvmOverloads - public final fun playBackwards(name: String, customBlend: Double = -1.0) = + public final fun playBackwards(name: String, customBlend: Double = -1.0): Unit = playBackwards(name.asCachedStringName(), customBlend) /** @@ -853,7 +854,7 @@ public open class AnimationPlayer : AnimationMixer() { startMarker: String, endMarker: String, customBlend: Double = -1.0, - ) = + ): Unit = playSectionWithMarkersBackwards(name.asCachedStringName(), startMarker.asCachedStringName(), endMarker.asCachedStringName(), customBlend) /** @@ -869,7 +870,7 @@ public open class AnimationPlayer : AnimationMixer() { startTime: Double = -1.0, endTime: Double = -1.0, customBlend: Double = -1.0, - ) = playSectionBackwards(name.asCachedStringName(), startTime, endTime, customBlend) + ): Unit = playSectionBackwards(name.asCachedStringName(), startTime, endTime, customBlend) /** * See also [AnimationMixer.capture]. @@ -902,7 +903,7 @@ public open class AnimationPlayer : AnimationMixer() { fromEnd: Boolean = false, transType: Tween.TransitionType = Tween.TransitionType.LINEAR, easeType: Tween.EaseType = Tween.EaseType.IN, - ) = + ): Unit = playWithCapture(name.asCachedStringName(), duration, customBlend, customSpeed, fromEnd, transType, easeType) /** @@ -912,7 +913,7 @@ public open class AnimationPlayer : AnimationMixer() { * **Note:** If a looped animation is currently playing, the queued animation will never play * unless the looped animation is stopped somehow. */ - public final fun queue(name: String) = queue(name.asCachedStringName()) + public final fun queue(name: String): Unit = queue(name.asCachedStringName()) /** * Changes the start and end markers of the section being played. The current playback position @@ -921,13 +922,13 @@ public open class AnimationPlayer : AnimationMixer() { * If the argument is empty, the section uses the beginning or end of the animation. If both are * empty, it means that the section is not set. */ - public final fun setSectionWithMarkers(startMarker: String, endMarker: String) = + public final fun setSectionWithMarkers(startMarker: String, endMarker: String): Unit = setSectionWithMarkers(startMarker.asCachedStringName(), endMarker.asCachedStringName()) /** * Sets the node which node path references will travel from. */ - public final fun setRoot(path: String) = setRoot(path.asCachedNodePath()) + public final fun setRoot(path: String): Unit = setRoot(path.asCachedNodePath()) public enum class AnimationProcessCallback( id: Long, diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationTree.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationTree.kt index 2b942f6ac3..67f896c5c1 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationTree.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimationTree.kt @@ -127,10 +127,11 @@ public open class AnimationTree : AnimationMixer() { return AnimationProcessCallback.from(TransferContext.readReturnValue(LONG) as Long) } - public final fun setAdvanceExpressionBaseNode(path: String) = + public final fun setAdvanceExpressionBaseNode(path: String): Unit = setAdvanceExpressionBaseNode(path.asCachedNodePath()) - public final fun setAnimationPlayer(path: String) = setAnimationPlayer(path.asCachedNodePath()) + public final fun setAnimationPlayer(path: String): Unit = + setAnimationPlayer(path.asCachedNodePath()) public enum class AnimationProcessCallback( id: Long, diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Area2D.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Area2D.kt index 49fca5d5d0..9a8504a576 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Area2D.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Area2D.kt @@ -634,7 +634,7 @@ public open class Area2D : CollisionObject2D() { return (TransferContext.readReturnValue(BOOL) as Boolean) } - public final fun setAudioBusName(name: String) = setAudioBusName(name.asCachedStringName()) + public final fun setAudioBusName(name: String): Unit = setAudioBusName(name.asCachedStringName()) public enum class SpaceOverride( id: Long, diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Area3D.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Area3D.kt index 273e6ae610..2a2598daf3 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Area3D.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Area3D.kt @@ -810,12 +810,13 @@ public open class Area3D : CollisionObject3D() { return (TransferContext.readReturnValue(DOUBLE) as Double).toFloat() } - public final fun setWindSourcePath(windSourcePath: String) = + public final fun setWindSourcePath(windSourcePath: String): Unit = setWindSourcePath(windSourcePath.asCachedNodePath()) - public final fun setAudioBusName(name: String) = setAudioBusName(name.asCachedStringName()) + public final fun setAudioBusName(name: String): Unit = setAudioBusName(name.asCachedStringName()) - public final fun setReverbBusName(name: String) = setReverbBusName(name.asCachedStringName()) + public final fun setReverbBusName(name: String): Unit = + setReverbBusName(name.asCachedStringName()) public enum class SpaceOverride( id: Long, diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/ArrayMesh.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/ArrayMesh.kt index bde12de478..35e49bfa3e 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/ArrayMesh.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/ArrayMesh.kt @@ -517,12 +517,12 @@ public open class ArrayMesh : Mesh() { * Adds name for a blend shape that will be added with [addSurfaceFromArrays]. Must be called * before surface is added. */ - public final fun addBlendShape(name: String) = addBlendShape(name.asCachedStringName()) + public final fun addBlendShape(name: String): Unit = addBlendShape(name.asCachedStringName()) /** * Sets the name of the blend shape at this index. */ - public final fun setBlendShapeName(index: Int, name: String) = + public final fun setBlendShapeName(index: Int, name: String): Unit = setBlendShapeName(index, name.asCachedStringName()) public companion object diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioEffectCompressor.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioEffectCompressor.kt index 68a4d5eaee..162e7f612e 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioEffectCompressor.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioEffectCompressor.kt @@ -18,7 +18,6 @@ import godot.core.asCachedStringName import kotlin.Double import kotlin.Float import kotlin.Int -import kotlin.NotImplementedError import kotlin.String import kotlin.Suppress import kotlin.Unit @@ -206,14 +205,8 @@ public open class AudioEffectCompressor : AudioEffect() { return (TransferContext.readReturnValue(STRING_NAME) as StringName) } - /** - * Virtual method inherited from base class implemented in non-JVM code. Don't call it. - */ - public override fun _instantiate(): AudioEffectInstance? { - throw NotImplementedError("AudioEffectCompressor::_instantiate can't be called from the JVM.") - } - - public final fun setSidechain(sidechain: String) = setSidechain(sidechain.asCachedStringName()) + public final fun setSidechain(sidechain: String): Unit = + setSidechain(sidechain.asCachedStringName()) public companion object diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioServer.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioServer.kt index 620ffed1be..694e639370 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioServer.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioServer.kt @@ -664,7 +664,7 @@ public object AudioServer : Object() { * Connects the output of the bus at [busIdx] to the bus named [send]. */ @JvmStatic - public final fun setBusSend(busIdx: Int, send: String) = + public final fun setBusSend(busIdx: Int, send: String): Unit = setBusSend(busIdx, send.asCachedStringName()) public enum class SpeakerMode( diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamInteractive.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamInteractive.kt index a635afbfbe..87f3a8e454 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamInteractive.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamInteractive.kt @@ -291,7 +291,7 @@ public open class AudioStreamInteractive : AudioStream() { /** * Set the name of the current clip (for easier identification). */ - public final fun setClipName(clipIndex: Int, name: String) = + public final fun setClipName(clipIndex: Int, name: String): Unit = setClipName(clipIndex, name.asCachedStringName()) public enum class TransitionFromTime( diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlaybackInteractive.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlaybackInteractive.kt index 42997a73dd..c7714cfb90 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlaybackInteractive.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlaybackInteractive.kt @@ -67,7 +67,7 @@ public open class AudioStreamPlaybackInteractive internal constructor() : AudioS /** * Switch to a clip (by name). */ - public final fun switchToClipByName(clipName: String) = + public final fun switchToClipByName(clipName: String): Unit = switchToClipByName(clipName.asCachedStringName()) public companion object diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlayer.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlayer.kt index 9d34c525da..75077330ab 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlayer.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlayer.kt @@ -376,7 +376,7 @@ public open class AudioStreamPlayer : Node() { return AudioServer.PlaybackType.from(TransferContext.readReturnValue(LONG) as Long) } - public final fun setBus(bus: String) = setBus(bus.asCachedStringName()) + public final fun setBus(bus: String): Unit = setBus(bus.asCachedStringName()) public enum class MixTarget( id: Long, diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlayer2D.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlayer2D.kt index c4d1bd6a65..55682b56b5 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlayer2D.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlayer2D.kt @@ -430,7 +430,7 @@ public open class AudioStreamPlayer2D : Node2D() { return AudioServer.PlaybackType.from(TransferContext.readReturnValue(LONG) as Long) } - public final fun setBus(bus: String) = setBus(bus.asCachedStringName()) + public final fun setBus(bus: String): Unit = setBus(bus.asCachedStringName()) public companion object diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlayer3D.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlayer3D.kt index 4e81346b85..13f43b1414 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlayer3D.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AudioStreamPlayer3D.kt @@ -618,7 +618,7 @@ public open class AudioStreamPlayer3D : Node3D() { return AudioServer.PlaybackType.from(TransferContext.readReturnValue(LONG) as Long) } - public final fun setBus(bus: String) = setBus(bus.asCachedStringName()) + public final fun setBus(bus: String): Unit = setBus(bus.asCachedStringName()) public enum class AttenuationModel( id: Long, diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/BoneAttachment3D.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/BoneAttachment3D.kt index 865c838e6c..f75c3f20c0 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/BoneAttachment3D.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/BoneAttachment3D.kt @@ -170,7 +170,7 @@ public open class BoneAttachment3D : Node3D() { * Sets the [NodePath] to the external skeleton that the BoneAttachment3D node should use. See * [setUseExternalSkeleton] to enable the external [Skeleton3D] node. */ - public final fun setExternalSkeleton(externalSkeleton: String) = + public final fun setExternalSkeleton(externalSkeleton: String): Unit = setExternalSkeleton(externalSkeleton.asCachedNodePath()) public companion object diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/BoneMap.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/BoneMap.kt index 1a69fe5754..952abd29e9 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/BoneMap.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/BoneMap.kt @@ -116,7 +116,7 @@ public open class BoneMap : Resource() { * * In the retargeting process, the setting bone name is the bone name of the source skeleton. */ - public final fun setSkeletonBoneName(profileBoneName: String, skeletonBoneName: String) = + public final fun setSkeletonBoneName(profileBoneName: String, skeletonBoneName: String): Unit = setSkeletonBoneName(profileBoneName.asCachedStringName(), skeletonBoneName.asCachedStringName()) /** diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/CSGPolygon3D.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/CSGPolygon3D.kt index ef662c262c..dc373df7d1 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/CSGPolygon3D.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/CSGPolygon3D.kt @@ -493,7 +493,7 @@ public open class CSGPolygon3D : CSGPrimitive3D() { return (TransferContext.readReturnValue(BOOL) as Boolean) } - public final fun setPathNode(path: String) = setPathNode(path.asCachedNodePath()) + public final fun setPathNode(path: String): Unit = setPathNode(path.asCachedNodePath()) public enum class Mode( id: Long, diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/CanvasItem.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/CanvasItem.kt index efe469e6cd..7c8d129fbc 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/CanvasItem.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/CanvasItem.kt @@ -1489,7 +1489,7 @@ public open class CanvasItem internal constructor() : Node() { * **Note:** [name] is case-sensitive and must match the name of the uniform in the code exactly * (not the capitalized name in the inspector). */ - public final fun setInstanceShaderParameter(name: String, `value`: Any?) = + public final fun setInstanceShaderParameter(name: String, `value`: Any?): Unit = setInstanceShaderParameter(name.asCachedStringName(), value) /** diff --git a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Control.kt b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Control.kt index 80f5370ebd..f75ebf2e58 100644 --- a/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Control.kt +++ b/kt/godot-library/godot-api-library/src/main/kotlin/godot/api/Control.kt @@ -2423,7 +2423,7 @@ public open class Control : CanvasItem() { return (TransferContext.readReturnValue(BOOL) as Boolean) } - public final fun setThemeTypeVariation(themeType: String) = + public final fun setThemeTypeVariation(themeType: String): Unit = setThemeTypeVariation(themeType.asCachedStringName()) /** @@ -2433,7 +2433,7 @@ public open class Control : CanvasItem() { * * See also [getThemeIcon]. */ - public final fun addThemeIconOverride(name: String, texture: Texture2D?) = + public final fun addThemeIconOverride(name: String, texture: Texture2D?): Unit = addThemeIconOverride(name.asCachedStringName(), texture) /** @@ -2472,7 +2472,7 @@ public open class Control : CanvasItem() { * GetNode