Update 0.12.1-4.4 (#772)

CedNaru · chippmann · web-flow · commit 60ca2e99047d · 2025-03-16T16:10:39.000+01:00
* Update version
* Fix dependencies

---------

Co-authored-by: chippmann &lt;cedric@hippmann.ch&gt;
diff --git a/.github/workflows/trigger_dev.yml b/.github/workflows/trigger_dev.yml
@@ -66,9 +66,9 @@ jobs:
       - run: |
           echo "Setup done"
     outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
-      godot-kotlin-jvm-version: "0.12.0-4.4"
+      godot-kotlin-jvm-version: "0.12.1-4.4"
       godot-version: "4.4-stable"
-      build-version: "0.12.0"
+      build-version: "0.12.1"
       jvm-version: "17"
 
   build-jvm:
diff --git a/.github/workflows/trigger_on_pull_request.yml b/.github/workflows/trigger_on_pull_request.yml
@@ -14,9 +14,9 @@ jobs:
       - run: |
           echo "Setup done"
     outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
-      godot-kotlin-jvm-version: "0.12.0-4.4"
+      godot-kotlin-jvm-version: "0.12.1-4.4"
       godot-version: "4.4-stable"
-      build-version: "0.12.0"
+      build-version: "0.12.1"
       jvm-version: "17"
 
   build-jvm:
diff --git a/.github/workflows/trigger_on_push_master.yml b/.github/workflows/trigger_on_push_master.yml
@@ -19,9 +19,9 @@ jobs:
       - run: |
           echo "Setup done"
     outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
-      godot-kotlin-jvm-version: "0.12.0-4.4"
+      godot-kotlin-jvm-version: "0.12.1-4.4"
       godot-version: "4.4-stable"
-      build-version: "0.12.0"
+      build-version: "0.12.1"
       jvm-version: "17"
 
   build-jvm:
diff --git a/.github/workflows/trigger_on_tag.yml b/.github/workflows/trigger_on_tag.yml
@@ -26,9 +26,9 @@ jobs:
       - run: |
           echo "Setup done"
     outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
-      godot-kotlin-jvm-version: "0.12.0-4.4"
+      godot-kotlin-jvm-version: "0.12.1-4.4"
       godot-version: "4.4-stable"
-      build-version: "0.12.0"
+      build-version: "0.12.1"
       jvm-version: "17"
 
   build-jvm:
diff --git a/config.py b/config.py
@@ -2,4 +2,4 @@ def can_build(env, platform):
     return True
 
 def configure(env):
-    env.add_module_version_string("jvm.0.12.0")
+    env.add_module_version_string("jvm.0.12.1")
diff --git a/docs/src/doc/index.md b/docs/src/doc/index.md
@@ -64,9 +64,9 @@ While Kotlin and Godot supports a wide range of platforms, this module for the m
 
 The module uses semantic versioning for its own versions but adds a suffix for the supported Godot version:
 
-Full version: `0.12.0-4.4`
+Full version: `0.12.1-4.4`
 
-Module Version: `0.12.0`
+Module Version: `0.12.1`
 
 Supported Godot Version: `4.4`
 
diff --git a/harness/flattened-library-tests/settings.gradle.kts b/harness/flattened-library-tests/settings.gradle.kts
@@ -14,8 +14,17 @@ includeBuild("../../kt") {
         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-coroutine-library-debug")).using(project(":godot-coroutine-library"))
+        substitute(module("com.utopia-rise:godot-coroutine-library-release")).using(project(":godot-coroutine-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"))
+        substitute(module("com.utopia-rise:godot-build-props")).using(project(":godot-build-props"))
+    }
+}
+
+includeBuild("../../kt/common") {
+    dependencySubstitution {
+        substitute(module("com.utopia-rise:common")).using(project(":"))
     }
 }
 
diff --git a/harness/fqname-library-tests/settings.gradle.kts b/harness/fqname-library-tests/settings.gradle.kts
@@ -14,8 +14,17 @@ includeBuild("../../kt") {
         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-coroutine-library-debug")).using(project(":godot-coroutine-library"))
+        substitute(module("com.utopia-rise:godot-coroutine-library-release")).using(project(":godot-coroutine-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"))
+        substitute(module("com.utopia-rise:godot-build-props")).using(project(":godot-build-props"))
+    }
+}
+
+includeBuild("../../kt/common") {
+    dependencySubstitution {
+        substitute(module("com.utopia-rise:common")).using(project(":"))
     }
 }
 
diff --git a/harness/hierarchical-library-tests/settings.gradle.kts b/harness/hierarchical-library-tests/settings.gradle.kts
@@ -14,8 +14,17 @@ includeBuild("../../kt") {
         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-coroutine-library-debug")).using(project(":godot-coroutine-library"))
+        substitute(module("com.utopia-rise:godot-coroutine-library-release")).using(project(":godot-coroutine-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"))
+        substitute(module("com.utopia-rise:godot-build-props")).using(project(":godot-build-props"))
+    }
+}
+
+includeBuild("../../kt/common") {
+    dependencySubstitution {
+        substitute(module("com.utopia-rise:common")).using(project(":"))
     }
 }
 
diff --git a/harness/tests/export_presets.cfg b/harness/tests/export_presets.cfg
@@ -20,8 +20,8 @@ script_export_mode=0
 
 [preset.0.options]
 
-custom_template/debug="D:/Godot/Module/kotlin/bin/godot.windows.template_debug.x86_64.jvm.0.12.0.exe"
-custom_template/release="D:/Godot/Module/kotlin/bin/godot.windows.template_release.x86_64.jvm.0.12.0.exe"
+custom_template/debug="D:/Godot/Module/kotlin/bin/godot.windows.template_debug.x86_64.jvm.0.12.1.exe"
+custom_template/release="D:/Godot/Module/kotlin/bin/godot.windows.template_release.x86_64.jvm.0.12.1.exe"
 debug/export_console_wrapper=1
 binary_format/embed_pck=false
 texture_format/s3tc_bptc=true
diff --git a/harness/tests/settings.gradle.kts b/harness/tests/settings.gradle.kts
@@ -18,6 +18,13 @@ includeBuild("../../kt") {
         substitute(module("com.utopia-rise:godot-coroutine-library-release")).using(project(":godot-coroutine-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"))
+        substitute(module("com.utopia-rise:godot-build-props")).using(project(":godot-build-props"))
+    }
+}
+
+includeBuild("../../kt/common") {
+    dependencySubstitution {
+        substitute(module("com.utopia-rise:common")).using(project(":"))
     }
 }
 
diff --git a/kt/godot-library/godot-api-library/build.gradle.kts b/kt/godot-library/godot-api-library/build.gradle.kts
@@ -24,9 +24,9 @@ java {
 }
 
 dependencies {
-    compileOnly("com.utopia-rise:common:$fullGodotKotlinJvmVersion")
-    compileOnly(project(":godot-internal-library"))
-    compileOnly(project(":godot-core-library"))
+    api("com.utopia-rise:common:$fullGodotKotlinJvmVersion")
+    implementation(project(":godot-internal-library"))
+    api(project(":godot-core-library"))
 }
 
 tasks {
diff --git a/kt/godot-library/godot-coroutine-library/build.gradle.kts b/kt/godot-library/godot-coroutine-library/build.gradle.kts
@@ -27,11 +27,11 @@ java {
 
 dependencies {
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${libs.versions.kotlinCoroutine.get()}")
-    compileOnly("com.utopia-rise:common:$fullGodotKotlinJvmVersion")
-    compileOnly(project(":godot-internal-library"))
-    compileOnly(project(":godot-core-library"))
-    compileOnly(project(":godot-api-library"))
-    compileOnly(project(":godot-extension-library"))
+    api("com.utopia-rise:common:$fullGodotKotlinJvmVersion")
+    implementation(project(":godot-internal-library"))
+    api(project(":godot-core-library"))
+    api(project(":godot-api-library"))
+    api(project(":godot-extension-library"))
 }
 
 tasks {
diff --git a/kt/godot-library/godot-extension-library/build.gradle.kts b/kt/godot-library/godot-extension-library/build.gradle.kts
@@ -26,10 +26,10 @@ java {
 }
 
 dependencies {
-    compileOnly("com.utopia-rise:common:$fullGodotKotlinJvmVersion")
-    compileOnly(project(":godot-internal-library"))
-    compileOnly(project(":godot-core-library"))
-    compileOnly(project(":godot-api-library"))
+    api("com.utopia-rise:common:$fullGodotKotlinJvmVersion")
+    implementation(project(":godot-internal-library"))
+    api(project(":godot-core-library"))
+    api(project(":godot-api-library"))
 }
 
 tasks {
diff --git a/kt/godot-library/godot-internal-library/build.gradle.kts b/kt/godot-library/godot-internal-library/build.gradle.kts
@@ -26,7 +26,7 @@ java {
 dependencies {
     // added here as a transitive dependency so the user can use reflection
     // we need to add it here so reflection is available where the code is loaded (Bootstrap.kt) otherwise it will not work
-    compileOnly("com.utopia-rise:common:$fullGodotKotlinJvmVersion")
+    api("com.utopia-rise:common:$fullGodotKotlinJvmVersion")
 }
 
 val targetSuffix = if (isRelease) "release" else "debug"
diff --git a/kt/gradle/libs.versions.toml b/kt/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 
-godotKotlinJvm = "0.12.0"
+godotKotlinJvm = "0.12.1"
 kotlin = "2.1.10" # https://kotlinlang.org/docs/releases.html#release-details
 kotlinCoroutine = "1.10.1" # https://github.com/Kotlin/kotlinx.coroutines/releases
 godot = "4.4"
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
@@ -18,6 +18,8 @@ fun Project.setupConfigurationsAndCompilations() {
     //add our dependencies to the main compilation -> convenience for the user
     kotlinJvmExtension.target.compilations.getByName("main").apply {
         dependencies {
+            compileOnly("com.utopia-rise:common:${GodotBuildProperties.assembledGodotKotlinJvmVersion}")
+            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:$godotExtensionArtifactName:${GodotBuildProperties.assembledGodotKotlinJvmVersion}")
@@ -34,6 +36,8 @@ 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:$godotCoreArtifactName:${GodotBuildProperties.assembledGodotKotlinJvmVersion}"))
             add(dependencies.create("com.utopia-rise:$godotApiArtifactName:${GodotBuildProperties.assembledGodotKotlinJvmVersion}"))
             add(dependencies.create("com.utopia-rise:$godotExtensionArtifactName:${GodotBuildProperties.assembledGodotKotlinJvmVersion}"))
diff --git a/src/version.h b/src/version.h
@@ -1,6 +1,6 @@
 #ifndef GODOT_JVM_VERSION_H
 #define GODOT_JVM_VERSION_H
 
-constexpr const char* GODOT_KOTLIN_VERSION = "0.12.0-4.4";
+constexpr const char* GODOT_KOTLIN_VERSION = "0.12.1-4.4";
 
 #endif// GODOT_JVM_VERSION_H
