Feature/rework bootstrap

harness/tests/scripts/godot/tests/inheritance/InterfaceChild.gdj

@@ -0,0 +1,23 @@
+// THIS FILE IS GENERATED! DO NOT EDIT OR DELETE IT. EDIT OR DELETE THE ASSOCIATED SOURCE CODE FILE INSTEAD
+// Note: You can however freely move this file inside your godot project if you want. Keep in mind however, that if you rename the originating source code file, this file will be deleted and regenerated as a new file instead of being updated! Other modifications to the source file however, will result in this file being updated.
+
+registeredName = InterfaceChild
+fqName = godot.tests.inheritance.InterfaceChild
+baseType = Node
+supertypes = [
+    godot.api.Node,
+	godot.api.Object,
+	godot.core.KtObject,
+	godot.tests.inheritance.TestInterface,
+	godot.common.interop.NativeWrapper,
+	godot.common.interop.NativePointer
+]
+signals = [
+
+]
+properties = [
+
+]
+functions = [
+    do_thing
+]

harness/tests/settings.gradle.kts

@@ -8,12 +8,14 @@ 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-internal-library-debug")).using(project(":godot-core-library"))
-        substitute(module("com.utopia-rise:godot-internal-library-release")).using(project(":godot-core-library"))
+        substitute(module("com.utopia-rise:godot-internal-library-debug")).using(project(":godot-internal-library"))
+        substitute(module("com.utopia-rise:godot-internal-library-release")).using(project(":godot-internal-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-api-library-debug")).using(project(":godot-api-library"))
         substitute(module("com.utopia-rise:godot-api-library-release")).using(project(":godot-api-library"))
+        substitute(module("com.utopia-rise:godot-bootstrap-library-debug")).using(project(":godot-bootstrap-library"))
+        substitute(module("com.utopia-rise:godot-bootstrap-library-release")).using(project(":godot-bootstrap-library"))
         substitute(module("com.utopia-rise:godot-extension-library-debug")).using(project(":godot-extension-library"))
         substitute(module("com.utopia-rise:godot-extension-library-release")).using(project(":godot-extension-library"))
         substitute(module("com.utopia-rise:godot-coroutine-library-debug")).using(project(":godot-coroutine-library"))

harness/tests/src/main/kotlin/godot/tests/args/FunctionArgSizeTest.kt

@@ -1,10 +1,8 @@
 package godot.tests.args
 
 import godot.api.Node
-import godot.api.Resource
 import godot.annotation.RegisterClass
 import godot.annotation.RegisterFunction
-import godot.core.Dictionary
 import godot.core.VariantArray
 import godot.core.variantArrayOf
 

harness/tests/src/main/kotlin/godot/tests/coretypes/StringTest.kt

@@ -3,7 +3,6 @@ package godot.tests.coretypes
 import godot.api.Node
 import godot.annotation.RegisterClass
 import godot.annotation.RegisterFunction
-import godot.core.StringName
 import godot.core.asStringName
 import godot.core.Vector2
 

harness/tests/src/main/kotlin/godot/tests/inheritance/InterfaceChild.kt

@@ -0,0 +1,13 @@
+package godot.tests.inheritance
+
+import godot.annotation.RegisterClass
+import godot.annotation.RegisterFunction
+import godot.api.Node
+
+@RegisterClass
+class InterfaceChild : Node(), TestInterface {
+    @RegisterFunction
+    override fun doThing() {
+
+    }
+}

harness/tests/src/main/kotlin/godot/tests/inheritance/TestInterface.kt

@@ -0,0 +1,8 @@
+package godot.tests.inheritance
+
+import godot.annotation.RegisterFunction
+
+interface TestInterface {
+    @RegisterFunction
+    fun doThing()
+}

harness/tests/src/main/kotlin/godot/tests/static/CallStaticTest.kt

@@ -5,7 +5,6 @@ import godot.api.Node
 import godot.api.ProjectSettings
 import godot.annotation.RegisterClass
 import godot.annotation.RegisterFunction
-import godot.core.Color
 
 @RegisterClass
 class CallStaticTest: Node() {

harness/tests/src/main/kotlin/godot/tests/subpackage/OtherScript.kt

@@ -1,7 +1,6 @@
 package godot.tests.subpackage
 
 import godot.api.Node
-import godot.api.Node3D
 import godot.annotation.RegisterClass
 import godot.annotation.RegisterFunction
 

kt/entry-generation/godot-class-graph-symbol-processor/build.gradle.kts

@@ -12,7 +12,7 @@ kotlin {
 
 dependencies {
     implementation("com.utopia-rise:tools-common:$fullGodotKotlinJvmVersion")
-    implementation(project(":godot-core-library"))
+    implementation(project(":godot-bootstrap-library"))
     implementation(project(":godot-entry-generator"))
 
     implementation(libs.classGraph)

kt/entry-generation/godot-class-graph-symbol-processor/src/main/kotlin/godot/annotation/processor/classgraph/extensions/ClassExtentions.kt

@@ -78,11 +78,15 @@ private fun ClassInfo.shouldBeRegistered(
     registeredFunctions: List<RegisteredFunction>,
     registeredProperties: List<RegisteredProperty>,
     registeredSignals: List<RegisteredSignal>
-) = hasAnnotation(RegisterClass::class.java) || isAbstractAndContainsRegisteredMembers(
-    registeredFunctions,
-    registeredProperties,
-    registeredSignals
-) || isAbstractAndInheritsGodotObject
+) = !isInterface && (
+        hasAnnotation(RegisterClass::class.java) ||
+                isAbstractAndContainsRegisteredMembers(
+                    registeredFunctions,
+                    registeredProperties,
+                    registeredSignals
+                ) ||
+                isAbstractAndInheritsGodotObject
+        )
 
 private fun ClassInfo.isAbstractAndContainsRegisteredMembers(
     registeredFunctions: List<RegisteredFunction>,

kt/entry-generation/godot-entry-generator/build.gradle.kts

@@ -12,7 +12,7 @@ kotlin {
 
 dependencies {
     implementation("com.utopia-rise:tools-common:$fullGodotKotlinJvmVersion")
-    implementation(project(":godot-core-library"))
+    implementation(project(":godot-bootstrap-library"))
     implementation(libs.kotlinPoet)
 }
 

kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/filebuilder/MainEntryFileBuilder.kt

@@ -26,14 +26,6 @@ class MainEntryFileBuilder {
         .receiver(ClassName("$godotRegistrationPackage.${GodotKotlinJvmTypes.entry}", GodotKotlinJvmTypes.context))
         .addModifiers(KModifier.OVERRIDE)
 
-    private val initEngineTypesFunSpec = FunSpec
-        .builder("initEngineTypes")
-        .receiver(ClassName("$godotRegistrationPackage.${GodotKotlinJvmTypes.entry}", GodotKotlinJvmTypes.context))
-        .addModifiers(KModifier.OVERRIDE)
-        .addStatement("%M()", MemberName(godotPackage, "registerVariantMapping"))
-        .addStatement("%M()", MemberName(godotPackage, "registerEngineTypes"))
-        .addStatement("%M()", MemberName(godotPackage, "registerEngineTypeMethods"))
-
     private val registerUserTypesVariantMappingsFunSpec = FunSpec
         .builder("getRegisteredClasses")
         .receiver(ClassName("$godotRegistrationPackage.${GodotKotlinJvmTypes.entry}", GodotKotlinJvmTypes.context))
@@ -65,7 +57,6 @@ class MainEntryFileBuilder {
                 .classBuilder(ClassName("$godotEntryBasePackage.$randomPackageForEntryFile", GodotKotlinJvmTypes.entry))
                 .superclass(ClassName(godotRegistrationPackage, GodotKotlinJvmTypes.entry))
                 .addFunction(initFunctionSpec.build())
-                .addFunction(initEngineTypesFunSpec.build())
                 .addFunction(registerUserTypesVariantMappingsFunSpec.build())
                 .addProperty(classRegistrarCountPropertySpec.build())
                 .addProperty(projectNamePropertySpec.build())

kt/godot-library/godot-bootstrap-library/build.gradle.kts

@@ -0,0 +1,54 @@
+import versioninfo.fullGodotKotlinJvmVersion
+
+plugins {
+    alias(libs.plugins.kotlin.jvm)
+    id("com.utopia-rise.godot-publish")
+    id("com.utopia-rise.versioninfo")
+    alias(libs.plugins.kotlinPreProcessors)
+}
+
+val isRelease = project.hasProperty("release")
+
+kotlinDefinitions {
+    definitionsObjectName.set("GodotJvmBuildConfig")
+    define("DEBUG", !isRelease)
+}
+
+kotlin {
+    jvmToolchain(libs.versions.toolchain.jvm.get().toInt())
+}
+
+dependencies {
+    api("com.utopia-rise:common:${fullGodotKotlinJvmVersion}")
+    api(project(":godot-api-library"))
+    implementation(project(":godot-internal-library"))
+}
+
+tasks {
+    compileKotlin {
+        dependsOn(":godot-library:generateAPI")
+    }
+
+    // here so the sourcesJar task has an explicit dependency on the generateApi task. Needed since gradle 8
+    withType<Jar> {
+        dependsOn(":godot-library:generateAPI")
+    }
+}
+
+val targetSuffix = if (isRelease) "release" else "debug"
+
+publishing {
+    publications {
+        @Suppress("UNUSED_VARIABLE", "unused")
+        val godotBootstrapLibraryPublication by registering(MavenPublication::class) {
+            pom {
+                name.set("${project.name}-$targetSuffix")
+                description.set("Contains code needed to bootstrap godot kotlin.")
+            }
+            artifactId = "godot-bootstrap-library-$targetSuffix"
+            description = "Contains code needed to bootstrap godot kotlin."
+
+            from(components["java"])
+        }
+    }
+}

kt/godot-library/godot-core-library/src/main/kotlin/godot/annotation/Export.kt → kt/godot-library/godot-bootstrap-library/src/main/kotlin/godot/annotation/Export.kt

@@ -1,6 +1,5 @@
 package godot.annotation
 
-
 /**
  * Mark a registered property as exported and thus visible in the inspector.
  *
@@ -10,4 +9,4 @@ package godot.annotation
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-annotation class Export
+annotation class Export

kt/godot-library/godot-core-library/src/main/kotlin/godot/annotation/RegisterClass.kt → kt/godot-library/godot-bootstrap-library/src/main/kotlin/godot/annotation/RegisterClass.kt

@@ -7,4 +7,4 @@ package godot.annotation
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-annotation class RegisterClass(val className: String = "")
+annotation class RegisterClass(val className: String = "")

kt/godot-library/godot-core-library/src/main/kotlin/godot/annotation/RegisteredClassMetadata.kt → kt/godot-library/godot-bootstrap-library/src/main/kotlin/godot/annotation/RegisteredClassMetadata.kt

@@ -13,4 +13,4 @@ annotation class RegisteredClassMetadata(
     val properties: String,
     val functions: String,
     val isRegistrationFileHierarchyEnabled: Boolean
-)
+)

kt/godot-library/godot-core-library/src/main/kotlin/godot/annotation/Tool.kt → kt/godot-library/godot-bootstrap-library/src/main/kotlin/godot/annotation/Tool.kt

@@ -1,11 +1,10 @@
 package godot.annotation
 
-
 /**
  * Mark a class as tool class.
  *
  * The class needs to have the @[RegisterClass] annotation added as well
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-annotation class Tool
+annotation class Tool

kt/godot-library/godot-core-library/src/main/kotlin/godot/registration/Entry.kt → kt/godot-library/godot-bootstrap-library/src/main/kotlin/godot/registration/Entry.kt

@@ -5,7 +5,6 @@ import kotlin.reflect.KClass
 abstract class Entry {
     class Context(val registry: ClassRegistry)
     abstract fun Context.init()
-    abstract fun Context.initEngineTypes()
     abstract fun Context.getRegisteredClasses(): List<KClass<*>>
 
     abstract val classRegistrarCount: Int

kt/godot-library/godot-core-library/src/main/kotlin/godot/registration/Registration.kt → kt/godot-library/godot-bootstrap-library/src/main/kotlin/godot/registration/Registration.kt

@@ -35,7 +35,6 @@ import godot.internal.reflection.TypeManager
 import godot.core.VariantParser
 import godot.core.toVariantArray
 import godot.core.variantArrayOf
-import godot.common.constants.Constraints
 import godot.core.VariantCaster
 import godot.core.enumFromGodotOrdinal
 import godot.core.godotOrdinal

kt/godot-library/godot-core-library/src/main/kotlin/godot/runtime/Bootstrap.kt → kt/godot-library/godot-bootstrap-library/src/main/kotlin/godot/runtime/Bootstrap.kt

@@ -6,15 +6,15 @@ import godot.core.VariantParser
 import godot.core.variantMapper
 import godot.internal.logging.JVMLogging
 import godot.internal.reflection.TypeManager
+import godot.registerEngineTypeMethods
+import godot.registerEngineTypes
+import godot.registerVariantMapping
 import godot.registration.ClassRegistry
 import godot.registration.Entry
-import java.util.*
-
+import java.util.ServiceLoader
 
 internal class Bootstrap {
     private lateinit var serviceLoader: ServiceLoader<Entry>
-    private var engineTypeInitialized = false
-
 
     fun initJar(loader: ClassLoader) {
         serviceLoader = ServiceLoader.load(Entry::class.java, loader)
@@ -38,6 +38,16 @@ internal class Bootstrap {
         serviceLoader.reload()
     }
 
+    fun initializeEngineTypes() {
+        registerVariantMapping()
+        registerEngineTypes()
+        registerEngineTypeMethods()
+
+        registerManagedEngineTypes(
+            TypeManager.engineTypeNames.toTypedArray(),
+            TypeManager.engineSingletonsNames.toTypedArray()
+        )
+    }
 
     private fun initializeUsingEntry() {
         val entryIterator = serviceLoader.iterator()
@@ -71,14 +81,6 @@ internal class Bootstrap {
             with(entry) {
                 if (isMainEntry) {
                     mainContext = context
-                    if(!engineTypeInitialized) {
-                        context.initEngineTypes()
-                        engineTypeInitialized = true
-                    }
-                    registerManagedEngineTypes(
-                        TypeManager.engineTypeNames.toTypedArray(),
-                        TypeManager.engineSingletonsNames.toTypedArray()
-                    )
                 }
                 for (clazz in context.getRegisteredClasses()) {
                     variantMapper[clazz] = VariantParser.OBJECT
@@ -130,4 +132,4 @@ internal class Bootstrap {
         engineTypesNames: Array<String>,
         engineSingletonNames: Array<String>
     )
-}
+}

kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/projectExtensions.kt

@@ -35,6 +35,9 @@ val Project.godotCoreArtifactName: String
 val Project.godotApiArtifactName: String
     get() = "godot-api-library-${if (isRelease) "release" else "debug"}"
 
+val Project.godotBootstrapArtifactName: String
+    get() = "godot-bootstrap-library-${if (isRelease) "release" else "debug"}"
+
 val Project.godotExtensionArtifactName: String
     get() = "godot-extension-library-${if (isRelease) "release" else "debug"}"
 

kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/setupConfigurationsAndCompilations.kt

@@ -22,6 +22,7 @@ fun Project.setupConfigurationsAndCompilations() {
             compileOnly("com.utopia-rise:godot-build-props:${GodotBuildProperties.assembledGodotKotlinJvmVersion}")
             compileOnly("com.utopia-rise:$godotCoreArtifactName:${GodotBuildProperties.assembledGodotKotlinJvmVersion}")
             compileOnly("com.utopia-rise:$godotApiArtifactName:${GodotBuildProperties.assembledGodotKotlinJvmVersion}")
+            compileOnly("com.utopia-rise:$godotBootstrapArtifactName:${GodotBuildProperties.assembledGodotKotlinJvmVersion}")
             compileOnly("com.utopia-rise:$godotExtensionArtifactName:${GodotBuildProperties.assembledGodotKotlinJvmVersion}")
             compileOnly("com.utopia-rise:godot-class-graph-symbol-processor:${GodotBuildProperties.assembledGodotKotlinJvmVersion}")
 
@@ -39,6 +40,7 @@ fun Project.setupConfigurationsAndCompilations() {
             add(dependencies.create("com.utopia-rise:$godotInternalArtifactName:${GodotBuildProperties.assembledGodotKotlinJvmVersion}"))
             add(dependencies.create("com.utopia-rise:$godotCoreArtifactName:${GodotBuildProperties.assembledGodotKotlinJvmVersion}"))
             add(dependencies.create("com.utopia-rise:$godotApiArtifactName:${GodotBuildProperties.assembledGodotKotlinJvmVersion}"))
+            add(dependencies.create("com.utopia-rise:$godotBootstrapArtifactName:${GodotBuildProperties.assembledGodotKotlinJvmVersion}"))
             add(dependencies.create("com.utopia-rise:$godotExtensionArtifactName:${GodotBuildProperties.assembledGodotKotlinJvmVersion}"))
             // add reflection explicitly so it's usable in exported projects as well. See: GH-571
             add(dependencies.create("org.jetbrains.kotlin:kotlin-reflect:${GodotBuildProperties.supportedKotlinVersion}"))

kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/packageMainJar.kt

@@ -2,6 +2,7 @@ package godot.gradle.tasks
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import godot.gradle.projectExt.godotApiArtifactName
+import godot.gradle.projectExt.godotBootstrapArtifactName
 import godot.gradle.projectExt.godotCoreArtifactName
 import godot.gradle.projectExt.godotExtensionArtifactName
 import org.gradle.api.Project
@@ -30,6 +31,7 @@ fun Project.packageMainJarTask(
                 dependencyFilter.exclude(dependencyFilter.dependency("org.jetbrains.kotlin:kotlin-stdlib.*"))
                 dependencyFilter.exclude(dependencyFilter.dependency("com.utopia-rise:$godotCoreArtifactName:.*"))
                 dependencyFilter.exclude(dependencyFilter.dependency("com.utopia-rise:$godotApiArtifactName:.*"))
+                dependencyFilter.exclude(dependencyFilter.dependency("com.utopia-rise:$godotBootstrapArtifactName:.*"))
                 dependencyFilter.exclude(dependencyFilter.dependency("com.utopia-rise:$godotExtensionArtifactName:.*"))
             }
         }

kt/settings.gradle.kts

@@ -47,6 +47,7 @@ subdir("godot-library") {
     include("godot-internal-library")
     include("godot-core-library")
     include("godot-api-library")
+    include("godot-bootstrap-library")
     include("godot-extension-library")
     include("godot-coroutine-library")
 }