From 0fa04dda09b32262fd03641c2253fdbe78747b92 Mon Sep 17 00:00:00 2001 From: CedNaru Date: Wed, 26 Mar 2025 20:25:45 +0100 Subject: [PATCH] include internal module in the bootstrap. --- harness/tests/settings.gradle.kts | 2 ++ .../main/kotlin/godot/gradle/projectExt/projectExtensions.kt | 3 +++ .../gradle/projectExt/setupConfigurationsAndCompilations.kt | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/harness/tests/settings.gradle.kts b/harness/tests/settings.gradle.kts index 0ca0224aa..ea6c36457 100644 --- a/harness/tests/settings.gradle.kts +++ b/harness/tests/settings.gradle.kts @@ -8,6 +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-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-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")) diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/projectExtensions.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/projectExtensions.kt index bd8fadbbb..596372f15 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/projectExtensions.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/projectExtensions.kt @@ -34,6 +34,9 @@ val Project.ideaExtension: IdeaModel val Project.isRelease: Boolean get() = hasProperty("release") +val Project.godotInternalArtifactName: String + get() = "godot-internal-library-${if (isRelease) "release" else "debug"}" + val Project.godotCoreArtifactName: String get() = "godot-core-library-${if (isRelease) "release" else "debug"}" diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/setupConfigurationsAndCompilations.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/setupConfigurationsAndCompilations.kt index 025c09295..b8df9d611 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/setupConfigurationsAndCompilations.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/setupConfigurationsAndCompilations.kt @@ -36,8 +36,9 @@ fun Project.setupConfigurationsAndCompilations() { val bootstrapConfiguration = configurations.create("bootstrap") { with(it.dependencies) { add(dependencies.create("org.jetbrains.kotlin:kotlin-stdlib:${kotlinJvmExtension.coreLibrariesVersion}")) - add(dependencies.create("com.utopia-rise:common:${GodotBuildProperties.assembledGodotKotlinJvmVersion}")) add(dependencies.create("com.utopia-rise:godot-build-props:${GodotBuildProperties.assembledGodotKotlinJvmVersion}")) + add(dependencies.create("com.utopia-rise:common:${GodotBuildProperties.assembledGodotKotlinJvmVersion}")) + 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:$godotExtensionArtifactName:${GodotBuildProperties.assembledGodotKotlinJvmVersion}"))