Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split core into core, api and extension modules #746

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
kt/godot-library/src/main/kotlin/godot/gen/godot/*.kt linguist-generated=true
kt/godot-api-library/src/main/kotlin/godot/api/*.kt linguist-generated=true
harness/tests/.godot/**/* linguist-generated=true
4 changes: 2 additions & 2 deletions .github/workflows/build_jvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: jvm_godot-bootstrap_release
path: modules/kotlin_jvm/kt/godot-core-library/build/libs/godot-bootstrap.jar
path: modules/kotlin_jvm/kt/godot-library/build/libs/godot-bootstrap.jar

- name: Upload debug bootstrap artifact
uses: actions/upload-artifact@v4
with:
name: jvm_godot-bootstrap_debug
path: modules/kotlin_jvm/kt/godot-core-library/build/libs/godot-bootstrap.jar
path: modules/kotlin_jvm/kt/godot-library/build/libs/godot-bootstrap.jar

- name: Upload entry-generator artifact
uses: actions/upload-artifact@v4
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/deploy_jvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,26 @@ jobs:
run: |
modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-core-library:publish -Prelease

- name: Publish godot-api-library debug
shell: sh
run: |
modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-api-library:publish -Pdebug

- name: Publish godot-api-library release
shell: sh
run: |
modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-api-library:publish -Prelease

- name: Publish godot-extension-library debug
shell: sh
run: |
modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-extension-library:publish -Pdebug

- name: Publish godot-extension-library release
shell: sh
run: |
modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ :godot-extension-library:publish -Prelease

- name: Publish godot-coroutine-library debug
shell: sh
run: |
Expand Down
4 changes: 4 additions & 0 deletions harness/flattened-library-tests/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ includeBuild("../../kt") {
substitute(module("com.utopia-rise:godot-gradle-plugin")).using(project(":godot-gradle-plugin"))
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-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-kotlin-symbol-processor")).using(project(":godot-kotlin-symbol-processor"))
substitute(module("com.utopia-rise:godot-entry-generator")).using(project(":godot-entry-generator"))
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package godot.tests.library.flattened

import godot.Node3D
import godot.api.Node3D
import godot.annotation.Export
import godot.annotation.RegisterClass
import godot.annotation.RegisterFunction
Expand Down
4 changes: 4 additions & 0 deletions harness/fqname-library-tests/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ includeBuild("../../kt") {
substitute(module("com.utopia-rise:godot-gradle-plugin")).using(project(":godot-gradle-plugin"))
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-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-kotlin-symbol-processor")).using(project(":godot-kotlin-symbol-processor"))
substitute(module("com.utopia-rise:godot-entry-generator")).using(project(":godot-entry-generator"))
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package godot.tests.library.fqname

import godot.Node3D
import godot.api.Node3D
import godot.annotation.Export
import godot.annotation.RegisterClass
import godot.annotation.RegisterFunction
Expand Down
4 changes: 4 additions & 0 deletions harness/hierarchical-library-tests/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ includeBuild("../../kt") {
substitute(module("com.utopia-rise:godot-gradle-plugin")).using(project(":godot-gradle-plugin"))
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-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-kotlin-symbol-processor")).using(project(":godot-kotlin-symbol-processor"))
substitute(module("com.utopia-rise:godot-entry-generator")).using(project(":godot-entry-generator"))
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package godot.tests.library.hierarchical

import godot.Node3D
import godot.api.Node3D
import godot.annotation.Export
import godot.annotation.RegisterClass
import godot.annotation.RegisterFunction
Expand Down
4 changes: 2 additions & 2 deletions harness/tests/FreeformRegistrationFileTestClass.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.freeform.FreeformRegistrationFileTestClass
relativeSourcePath = src/main/kotlin/godot/tests/freeform/FreeformRegistrationFileTestClass.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import godot.Node3D
import godot.api.Node3D
import godot.annotation.Export
import godot.annotation.RegisterClass
import godot.annotation.RegisterProperty
Expand Down
2 changes: 1 addition & 1 deletion harness/tests/otherSourceDir/CoreTypePropertyChecks.kt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import godot.Node
import godot.api.Node
import godot.annotation.Export
import godot.annotation.RegisterClass
import godot.annotation.RegisterProperty
Expand Down
2 changes: 1 addition & 1 deletion harness/tests/otherSourceDir/ScriptInOtherSourceDir.kt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import godot.Node
import godot.api.Node
import godot.annotation.RegisterClass
import godot.annotation.RegisterFunction

Expand Down
6 changes: 3 additions & 3 deletions harness/tests/scripts/CopyModificationCheckTestClass.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ fqName = CopyModificationCheckTestClass
relativeSourcePath = otherSourceDir/CopyModificationCheckTestClass.kt
baseType = Node3D
supertypes = [
godot.Node3D,
godot.Node,
godot.Object,
godot.api.Node3D,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
4 changes: 2 additions & 2 deletions harness/tests/scripts/CoreTypePropertyChecks.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = CoreTypePropertyChecks
relativeSourcePath = otherSourceDir/CoreTypePropertyChecks.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
4 changes: 2 additions & 2 deletions harness/tests/scripts/ScriptInOtherSourceDir.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = ScriptInOtherSourceDir
relativeSourcePath = otherSourceDir/ScriptInOtherSourceDir.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ fqName = godot.tests.library.flattened.Simple
relativeSourcePath = src/main/kotlin/godot/tests/library/flattened/Simple.kt
baseType = Node3D
supertypes = [
godot.Node3D,
godot.Node,
godot.Object,
godot.api.Node3D,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ fqName = godot.tests.library.fqname.Simple
relativeSourcePath = src/main/kotlin/godot/tests/library/fqname/Simple.kt
baseType = Node3D
supertypes = [
godot.Node3D,
godot.Node,
godot.Object,
godot.api.Node3D,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ relativeSourcePath = src/main/kotlin/godot/tests/library/fqname/SimpleChild.kt
baseType = Node3D
supertypes = [
godot.tests.library.fqname.Simple,
godot.Node3D,
godot.Node,
godot.Object,
godot.api.Node3D,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ fqName = godot.tests.library.hierarchical.Simple
relativeSourcePath = src/main/kotlin/godot/tests/library/hierarchical/Simple.kt
baseType = Node3D
supertypes = [
godot.Node3D,
godot.Node,
godot.Object,
godot.api.Node3D,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
4 changes: 2 additions & 2 deletions harness/tests/scripts/godot/tests/CoreTypesIdentityTest.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.CoreTypesIdentityTest
relativeSourcePath = src/main/kotlin/godot/tests/CoreTypesIdentityTest.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
4 changes: 2 additions & 2 deletions harness/tests/scripts/godot/tests/FuncRefTest.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.FuncRefTest
relativeSourcePath = src/main/kotlin/godot/tests/FuncRefTest.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
6 changes: 3 additions & 3 deletions harness/tests/scripts/godot/tests/Invocation.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ fqName = godot.tests.Invocation
relativeSourcePath = src/main/kotlin/godot/tests/Invocation.kt
baseType = Node3D
supertypes = [
godot.Node3D,
godot.Node,
godot.Object,
godot.api.Node3D,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
4 changes: 2 additions & 2 deletions harness/tests/scripts/godot/tests/JavaTestClass.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.JavaTestClass
relativeSourcePath = src/main/java/godot/tests/JavaTestClass.java
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
4 changes: 2 additions & 2 deletions harness/tests/scripts/godot/tests/LambdaCallableTest.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.LambdaCallableTest
relativeSourcePath = src/main/kotlin/godot/tests/LambdaCallableTest.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.MultiArgsConstructorTest
relativeSourcePath = src/main/kotlin/godot/tests/MultiArgsConstructorTest.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.args.ConstructorArgSizeTest
relativeSourcePath = src/main/kotlin/godot/tests/args/ConstructorArgSizeTest.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.args.FunctionArgSizeTest
relativeSourcePath = src/main/kotlin/godot/tests/args/FunctionArgSizeTest.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
4 changes: 2 additions & 2 deletions harness/tests/scripts/godot/tests/binding/BindingA.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.binding.BindingA
relativeSourcePath = src/main/kotlin/godot/tests/binding/BindingA.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
4 changes: 2 additions & 2 deletions harness/tests/scripts/godot/tests/binding/BindingB.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.binding.BindingB
relativeSourcePath = src/main/kotlin/godot/tests/binding/BindingB.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
2 changes: 1 addition & 1 deletion harness/tests/scripts/godot/tests/binding/BindingTest.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ fqName = godot.tests.binding.BindingTest
relativeSourcePath = src/main/kotlin/godot/tests/binding/BindingTest.kt
baseType = Object
supertypes = [
godot.Object,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.callable.CallableMethodBindTest
relativeSourcePath = src/main/kotlin/godot/tests/callable/CallableMethodBindTest.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.constructor.ConstructorRegistrationTest
relativeSourcePath = src/main/kotlin/godot/tests/constructor/ConstructorRegistrationTest.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
4 changes: 2 additions & 2 deletions harness/tests/scripts/godot/tests/coretypes/BasisTest.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.coretypes.BasisTest
relativeSourcePath = src/main/kotlin/godot/tests/coretypes/BasisTest.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
4 changes: 2 additions & 2 deletions harness/tests/scripts/godot/tests/coretypes/StringTest.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.coretypes.StringTest
relativeSourcePath = src/main/kotlin/godot/tests/coretypes/StringTest.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
4 changes: 2 additions & 2 deletions harness/tests/scripts/godot/tests/coretypes/Vector3Test.gdj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fqName = godot.tests.coretypes.Vector3Test
relativeSourcePath = src/main/kotlin/godot/tests/coretypes/Vector3Test.kt
baseType = Node
supertypes = [
godot.Node,
godot.Object,
godot.api.Node,
godot.api.Object,
godot.core.KtObject,
godot.common.interop.NativeWrapper,
godot.common.interop.NativePointer,
Expand Down
Loading
Loading