Update kotlin to 2.0.10 and update other dependencies

This also prepares the api-gen for a kotlin poet update to the latest version. But because of square/kotlinpoet#1759 the update cannot be performed yet.
utopia-rise · Aug 18, 2024 · 3fb04bb · 3fb04bb
1 parent d9b7cb3
commit 3fb04bb
Show file tree

Hide file tree

Showing 245 changed files with 668 additions and 638 deletions.
diff --git a/docs/src/doc/index.md b/docs/src/doc/index.md
@@ -43,7 +43,7 @@ The main language supported is Kotlin. We do however support Java experimentally
 
 This module relies on a Kotlin *compiler plugin* for registering your classes and members to Godot. As the compiler API from Kotlin is not stable yet, at the moment we can only support specific Kotlin version per release.
 
-The current latest release is compatible with Kotlin version `2.0.0`.
+The current latest release is compatible with Kotlin version `2.0.10`.
 
 !!! info
     It is possible to use this module with other Kotlin versions as well but we do not provide any guarantees for it. You find more infos in the [Gradle Plugin configuration](user-guide/advanced/gradle-plugin-configuration.md#disable-build-failure-on-kotlin-version-mismatch) section.

diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/GenerationService.kt b/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/GenerationService.kt
@@ -25,10 +25,12 @@ import godot.codegen.services.IEnumService
 import godot.codegen.services.IGenerationService
 import godot.codegen.traits.CallableTrait
 import godot.codegen.traits.addKdoc
+import godot.codegen.workarounds.sanitizeApiType
 import godot.tools.common.constants.CORE_TYPE_LOCAL_COPY
 import godot.tools.common.constants.CORE_TYPE_HELPER
 import godot.tools.common.constants.GENERATED_COMMENT
 import godot.tools.common.constants.GODOT_BASE_TYPE
+import godot.tools.common.constants.GODOT_ERROR
 import godot.tools.common.constants.GodotKotlinJvmTypes
 import godot.tools.common.constants.GodotTypes
 import godot.tools.common.constants.KT_OBJECT
@@ -318,8 +320,9 @@ class GenerationService(
             val companion = TypeSpec.companionObjectBuilder()
                 .addFunction(
                     FunSpec.builder("from")
+                        .returns(ClassName("${godotApiPackage}.${containingClassName ?: ""}", enum.name))
                         .addParameter("value", Long::class)
-                        .addStatement("return entries.single { it.%N == %N }", "id", "value")
+                        .addStatement("return·entries.single·{·it.%N·==·%N·}", "id", "value")
                         .build()
                 )
                 .build()
@@ -695,9 +698,10 @@ class GenerationService(
             val kFunctionClassName = ClassName("kotlin.reflect", "KFunction$i")
                 .parameterizedBy(*kFunctionTypeParameters.toTypedArray(), TypeVariableName.invoke("*"))
 
-            RpcFunctionMode.values().forEach { rpcFunctionMode ->
+            RpcFunctionMode.entries.forEach { rpcFunctionMode ->
                 val rpcFunSpec = FunSpec
                     .builder(rpcFunctionMode.functionName)
+                    .returns(GODOT_ERROR)
                     .addModifiers(KModifier.INLINE)
 
                 if (rpcFunctionMode.hasId) {

diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AESContext.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AESContext.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AStarGrid2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AStarGrid2D.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Animation.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Animation.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationMixer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationMixer.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNode.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNode.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeAnimation.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeAnimation.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeBlendSpace1D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeBlendSpace1D.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeBlendSpace2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeBlendSpace2D.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeOneShot.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeOneShot.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeStateMachine.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeStateMachine.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeStateMachineTransition.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeStateMachineTransition.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationPlayer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationPlayer.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationTree.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationTree.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Area2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Area2D.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Area3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Area3D.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AspectRatioContainer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AspectRatioContainer.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffectDistortion.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffectDistortion.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffectFilter.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffectFilter.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffectPitchShift.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffectPitchShift.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffectSpectrumAnalyzer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffectSpectrumAnalyzer.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffectSpectrumAnalyzerInstance.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffectSpectrumAnalyzerInstance.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioServer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioServer.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer3D.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamRandomizer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamRandomizer.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamWAV.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamWAV.kt