Rework interaction between KtObject and MemoryManager

utopia-rise · Oct 16, 2024 · 9becd27 · 9becd27
1 parent 7f4614f
commit 9becd27
Show file tree

Hide file tree

Showing 932 changed files with 3,453 additions and 2,472 deletions.
diff --git a/.github/workflows/deploy_jvm.yml b/.github/workflows/deploy_jvm.yml
@@ -72,12 +72,22 @@ jobs:
         run: |
           modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-kotlin-symbol-processor:publish
 
-      - name: Publish godot-library debug
+      - name: Publish godot-internal-library debug
+        shell: sh
+        run: |
+          modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-internal-library:publish -Pdebug
+
+      - name: Publish godot-internal-library release
+        shell: sh
+        run: |
+          modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-internal-library:publish -Prelease
+
+      - name: Publish godot-core-library debug
         shell: sh
         run: |
           modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-core-library:publish -Pdebug
 
-      - name: Publish godot-library release
+      - name: Publish godot-core-library release
         shell: sh
         run: |
           modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-core-library:publish -Prelease

diff --git a/harness/flattened-library-tests/settings.gradle.kts b/harness/flattened-library-tests/settings.gradle.kts
@@ -8,7 +8,8 @@ includeBuild("../../kt/api-generator") {
 includeBuild("../../kt") {
     dependencySubstitution {
         substitute(module("com.utopia-rise:godot-gradle-plugin")).using(project(":godot-gradle-plugin"))
-        substitute(module("com.utopia-rise:godot-library")).using(project(":godot-library"))
+        substitute(module("com.utopia-rise:godot-core-library-debug")).using(project(":godot-core-library"))
+        substitute(module("com.utopia-rise:godot-core-library-release")).using(project(":godot-core-library"))
         substitute(module("com.utopia-rise:godot-kotlin-symbol-processor")).using(project(":godot-kotlin-symbol-processor"))
         substitute(module("com.utopia-rise:godot-entry-generator")).using(project(":godot-entry-generator"))
     }

diff --git a/harness/fqname-library-tests/settings.gradle.kts b/harness/fqname-library-tests/settings.gradle.kts
@@ -8,7 +8,8 @@ includeBuild("../../kt/api-generator") {
 includeBuild("../../kt") {
     dependencySubstitution {
         substitute(module("com.utopia-rise:godot-gradle-plugin")).using(project(":godot-gradle-plugin"))
-        substitute(module("com.utopia-rise:godot-library")).using(project(":godot-library"))
+        substitute(module("com.utopia-rise:godot-core-library-debug")).using(project(":godot-core-library"))
+        substitute(module("com.utopia-rise:godot-core-library-release")).using(project(":godot-core-library"))
         substitute(module("com.utopia-rise:godot-kotlin-symbol-processor")).using(project(":godot-kotlin-symbol-processor"))
         substitute(module("com.utopia-rise:godot-entry-generator")).using(project(":godot-entry-generator"))
     }

diff --git a/harness/hierarchical-library-tests/settings.gradle.kts b/harness/hierarchical-library-tests/settings.gradle.kts
@@ -8,7 +8,8 @@ includeBuild("../../kt/api-generator") {
 includeBuild("../../kt") {
     dependencySubstitution {
         substitute(module("com.utopia-rise:godot-gradle-plugin")).using(project(":godot-gradle-plugin"))
-        substitute(module("com.utopia-rise:godot-library")).using(project(":godot-library"))
+        substitute(module("com.utopia-rise:godot-core-library-debug")).using(project(":godot-core-library"))
+        substitute(module("com.utopia-rise:godot-core-library-release")).using(project(":godot-core-library"))
         substitute(module("com.utopia-rise:godot-kotlin-symbol-processor")).using(project(":godot-kotlin-symbol-processor"))
         substitute(module("com.utopia-rise:godot-entry-generator")).using(project(":godot-entry-generator"))
     }

diff --git a/harness/tests/FreeformRegistrationFileTestClass.gdj b/harness/tests/FreeformRegistrationFileTestClass.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/CopyModificationCheckTestClass.gdj b/harness/tests/scripts/CopyModificationCheckTestClass.gdj
@@ -10,6 +10,8 @@ supertypes = [
 	godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/CoreTypePropertyChecks.gdj b/harness/tests/scripts/CoreTypePropertyChecks.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/ScriptInOtherSourceDir.gdj b/harness/tests/scripts/ScriptInOtherSourceDir.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/...s/scripts/dependencies/flattened-library-tests/godot/tests/library/flattened/FLSimple.gdj b/...s/scripts/dependencies/flattened-library-tests/godot/tests/library/flattened/FLSimple.gdj
@@ -10,6 +10,8 @@ supertypes = [
 	godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/...fqname-library-tests/godot/tests/library/fqname/godot_tests_library_fqname_FQNLSimple.gdj b/...fqname-library-tests/godot/tests/library/fqname/godot_tests_library_fqname_FQNLSimple.gdj
@@ -10,6 +10,8 @@ supertypes = [
 	godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/...e-library-tests/godot/tests/library/fqname/godot_tests_library_fqname_FQNLSimpleChild.gdj b/...e-library-tests/godot/tests/library/fqname/godot_tests_library_fqname_FQNLSimpleChild.gdj
@@ -11,6 +11,8 @@ supertypes = [
 	godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/...pts/dependencies/hierarchical-library-tests/godot/tests/library/hierarchical/HLSimple.gdj b/...pts/dependencies/hierarchical-library-tests/godot/tests/library/hierarchical/HLSimple.gdj
@@ -10,6 +10,8 @@ supertypes = [
 	godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/CoreTypesIdentityTest.gdj b/harness/tests/scripts/godot/tests/CoreTypesIdentityTest.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/FuncRefTest.gdj b/harness/tests/scripts/godot/tests/FuncRefTest.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/Invocation.gdj b/harness/tests/scripts/godot/tests/Invocation.gdj
@@ -10,6 +10,8 @@ supertypes = [
 	godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [
@@ -40,6 +42,7 @@ properties = [
 	nav_meshes_dictionary,
 	nullable_dictionary,
 	color,
+	rid,
 	packed_byte_array,
 	packed_int32_array,
 	packed_float64_array,

diff --git a/harness/tests/scripts/godot/tests/JavaTestClass.gdj b/harness/tests/scripts/godot/tests/JavaTestClass.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [
@@ -30,7 +32,8 @@ properties = [
 	dictionary
 ]
 functions = [
-    greeting,
+    _ready,
+	greeting,
 	connect_and_trigger_signal,
 	signal_callback
 ]
diff --git a/harness/tests/scripts/godot/tests/LambdaCallableTest.gdj b/harness/tests/scripts/godot/tests/LambdaCallableTest.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/MultiArgsConstructorTest.gdj b/harness/tests/scripts/godot/tests/MultiArgsConstructorTest.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/args/ConstructorArgSizeTest.gdj b/harness/tests/scripts/godot/tests/args/ConstructorArgSizeTest.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/args/FunctionArgSizeTest.gdj b/harness/tests/scripts/godot/tests/args/FunctionArgSizeTest.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/binding/BindingA.gdj b/harness/tests/scripts/godot/tests/binding/BindingA.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/binding/BindingB.gdj b/harness/tests/scripts/godot/tests/binding/BindingB.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/binding/BindingTest.gdj b/harness/tests/scripts/godot/tests/binding/BindingTest.gdj
@@ -8,6 +8,8 @@ baseType = Object
 supertypes = [
     godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/callable/CallableMethodBindTest.gdj b/harness/tests/scripts/godot/tests/callable/CallableMethodBindTest.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/constructor/ConstructorRegistrationTest.gdj b/harness/tests/scripts/godot/tests/constructor/ConstructorRegistrationTest.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/coretypes/BasisTest.gdj b/harness/tests/scripts/godot/tests/coretypes/BasisTest.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/coretypes/StringTest.gdj b/harness/tests/scripts/godot/tests/coretypes/StringTest.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/coretypes/Vector3Test.gdj b/harness/tests/scripts/godot/tests/coretypes/Vector3Test.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/coroutine/CoroutineTest.gdj b/harness/tests/scripts/godot/tests/coroutine/CoroutineTest.gdj
@@ -8,6 +8,8 @@ baseType = Object
 supertypes = [
     godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/exception/ExceptionTest.gdj b/harness/tests/scripts/godot/tests/exception/ExceptionTest.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/inheritance/AbstractClassInheritanceChild.gdj b/harness/tests/scripts/godot/tests/inheritance/AbstractClassInheritanceChild.gdj
@@ -10,6 +10,8 @@ supertypes = [
 	godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/inheritance/AbstractClassInheritanceEmptyChild.gdj b/harness/tests/scripts/godot/tests/inheritance/AbstractClassInheritanceEmptyChild.gdj
@@ -14,6 +14,8 @@ supertypes = [
 	godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/inheritance/ClassInheritanceChild.gdj b/harness/tests/scripts/godot/tests/inheritance/ClassInheritanceChild.gdj
@@ -10,6 +10,8 @@ supertypes = [
 	godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/inheritance/ClassInheritanceParent.gdj b/harness/tests/scripts/godot/tests/inheritance/ClassInheritanceParent.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/instance/NodeInstance.gdj b/harness/tests/scripts/godot/tests/instance/NodeInstance.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/instance/ObjectInstance.gdj b/harness/tests/scripts/godot/tests/instance/ObjectInstance.gdj
@@ -8,6 +8,8 @@ baseType = Object
 supertypes = [
     godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/instance/RefCountedInstance.gdj b/harness/tests/scripts/godot/tests/instance/RefCountedInstance.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.RefCounted,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/packedarray/PackedArrayTest.gdj b/harness/tests/scripts/godot/tests/packedarray/PackedArrayTest.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/reflection/BaseReflectionTest.gdj b/harness/tests/scripts/godot/tests/reflection/BaseReflectionTest.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [

diff --git a/harness/tests/scripts/godot/tests/reflection/GH571_ReflectionTest.gdj b/harness/tests/scripts/godot/tests/reflection/GH571_ReflectionTest.gdj
@@ -9,6 +9,8 @@ supertypes = [
     godot.Node,
 	godot.Object,
 	godot.core.KtObject,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer,
 	kotlin.Any
 ]
 signals = [