Skip to content

Commit 92ac75f

Browse files
authored
Feature/rework bootstrap (#886)
* feat: isolate bootstrap in its own module * feat: move registration code to new bootstrap module * feat: Seperate initialization of engine types and initialization of user code * enh: Remove Entry.Context class * feat: Add publish of new bootstrap module
1 parent e0b79b0 commit 92ac75f

File tree

38 files changed

+188
-68
lines changed

38 files changed

+188
-68
lines changed

.github/workflows/deploy_jvm.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,16 @@ jobs:
102102
run: |
103103
modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-api-library:publish -Prelease
104104
105+
- name: Publish godot-bootstrap-library debug
106+
shell: sh
107+
run: |
108+
modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-bootstrap-library:publish -Pdebug
109+
110+
- name: Publish godot-bootstrap-library release
111+
shell: sh
112+
run: |
113+
modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-bootstrap-library:publish -Prelease
114+
105115
- name: Publish godot-extension-library debug
106116
shell: sh
107117
run: |
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// THIS FILE IS GENERATED! DO NOT EDIT OR DELETE IT. EDIT OR DELETE THE ASSOCIATED SOURCE CODE FILE INSTEAD
2+
// 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.
3+
4+
registeredName = InterfaceChild
5+
fqName = godot.tests.inheritance.InterfaceChild
6+
baseType = Node
7+
supertypes = [
8+
godot.api.Node,
9+
godot.api.Object,
10+
godot.core.KtObject,
11+
godot.tests.inheritance.TestInterface,
12+
godot.common.interop.NativeWrapper,
13+
godot.common.interop.NativePointer
14+
]
15+
signals = [
16+
17+
]
18+
properties = [
19+
20+
]
21+
functions = [
22+
do_thing
23+
]

harness/tests/settings.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ includeBuild("../../kt/api-generator") {
88
includeBuild("../../kt") {
99
dependencySubstitution {
1010
substitute(module("com.utopia-rise:godot-gradle-plugin")).using(project(":godot-gradle-plugin"))
11-
substitute(module("com.utopia-rise:godot-internal-library-debug")).using(project(":godot-core-library"))
12-
substitute(module("com.utopia-rise:godot-internal-library-release")).using(project(":godot-core-library"))
11+
substitute(module("com.utopia-rise:godot-internal-library-debug")).using(project(":godot-internal-library"))
12+
substitute(module("com.utopia-rise:godot-internal-library-release")).using(project(":godot-internal-library"))
1313
substitute(module("com.utopia-rise:godot-core-library-debug")).using(project(":godot-core-library"))
1414
substitute(module("com.utopia-rise:godot-core-library-release")).using(project(":godot-core-library"))
1515
substitute(module("com.utopia-rise:godot-api-library-debug")).using(project(":godot-api-library"))
1616
substitute(module("com.utopia-rise:godot-api-library-release")).using(project(":godot-api-library"))
17+
substitute(module("com.utopia-rise:godot-bootstrap-library-debug")).using(project(":godot-bootstrap-library"))
18+
substitute(module("com.utopia-rise:godot-bootstrap-library-release")).using(project(":godot-bootstrap-library"))
1719
substitute(module("com.utopia-rise:godot-extension-library-debug")).using(project(":godot-extension-library"))
1820
substitute(module("com.utopia-rise:godot-extension-library-release")).using(project(":godot-extension-library"))
1921
substitute(module("com.utopia-rise:godot-coroutine-library-debug")).using(project(":godot-coroutine-library"))

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package godot.tests.args
22

33
import godot.api.Node
4-
import godot.api.Resource
54
import godot.annotation.RegisterClass
65
import godot.annotation.RegisterFunction
7-
import godot.core.Dictionary
86
import godot.core.VariantArray
97
import godot.core.variantArrayOf
108

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package godot.tests.coretypes
33
import godot.api.Node
44
import godot.annotation.RegisterClass
55
import godot.annotation.RegisterFunction
6-
import godot.core.StringName
76
import godot.core.asStringName
87
import godot.core.Vector2
98

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package godot.tests.inheritance
2+
3+
import godot.annotation.RegisterClass
4+
import godot.annotation.RegisterFunction
5+
import godot.api.Node
6+
7+
@RegisterClass
8+
class InterfaceChild : Node(), TestInterface {
9+
@RegisterFunction
10+
override fun doThing() {
11+
12+
}
13+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package godot.tests.inheritance
2+
3+
import godot.annotation.RegisterFunction
4+
5+
interface TestInterface {
6+
@RegisterFunction
7+
fun doThing()
8+
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import godot.api.Node
55
import godot.api.ProjectSettings
66
import godot.annotation.RegisterClass
77
import godot.annotation.RegisterFunction
8-
import godot.core.Color
98

109
@RegisterClass
1110
class CallStaticTest: Node() {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package godot.tests.subpackage
22

33
import godot.api.Node
4-
import godot.api.Node3D
54
import godot.annotation.RegisterClass
65
import godot.annotation.RegisterFunction
76

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ kotlin {
1212

1313
dependencies {
1414
implementation("com.utopia-rise:tools-common:$fullGodotKotlinJvmVersion")
15-
implementation(project(":godot-core-library"))
15+
implementation(project(":godot-bootstrap-library"))
1616
implementation(project(":godot-entry-generator"))
1717

1818
implementation(libs.classGraph)

0 commit comments

Comments
 (0)