diff --git a/kt/common/src/main/kotlin/godot/common/Version.kt b/kt/common/src/main/kotlin/godot/common/Version.kt new file mode 100644 index 000000000..e670fb273 --- /dev/null +++ b/kt/common/src/main/kotlin/godot/common/Version.kt @@ -0,0 +1,3 @@ +package godot.common + +const val GODOT_KOTLIN_VERSION = "0.13.1-4.4.1" diff --git a/kt/godot-library/godot-core-library/build.gradle.kts b/kt/godot-library/godot-core-library/build.gradle.kts index 93685e516..926f12dd3 100644 --- a/kt/godot-library/godot-core-library/build.gradle.kts +++ b/kt/godot-library/godot-core-library/build.gradle.kts @@ -26,7 +26,6 @@ java { dependencies { api("com.utopia-rise:common:$fullGodotKotlinJvmVersion") implementation(project(":godot-internal-library")) - implementation(project(":godot-build-props")) testImplementation("junit", "junit", "4.12") testImplementation("com.utopia-rise:common:$fullGodotKotlinJvmVersion") diff --git a/kt/godot-library/godot-core-library/src/main/kotlin/godot/runtime/Bootstrap.kt b/kt/godot-library/godot-core-library/src/main/kotlin/godot/runtime/Bootstrap.kt index 7e1f5fa4f..1c9394706 100644 --- a/kt/godot-library/godot-core-library/src/main/kotlin/godot/runtime/Bootstrap.kt +++ b/kt/godot-library/godot-core-library/src/main/kotlin/godot/runtime/Bootstrap.kt @@ -1,5 +1,6 @@ package godot.runtime +import godot.common.GODOT_KOTLIN_VERSION import godot.core.KtClass import godot.core.VariantParser import godot.core.variantMapper @@ -7,7 +8,6 @@ import godot.internal.logging.JVMLogging import godot.internal.reflection.TypeManager import godot.registration.ClassRegistry import godot.registration.Entry -import godot.utils.GodotBuildProperties import java.util.* @@ -25,11 +25,11 @@ internal class Bootstrap { initializeUsingEntry() } - fun getVersion(): String{ + fun getVersion(): String { // we cannot use the assembled version here as it includes the git hash on local dev builds which is not present // on the cpp side // hence we assemble it manually here - return "${GodotBuildProperties.godotKotlinJvmVersion}-${GodotBuildProperties.godotVersion}" + return GODOT_KOTLIN_VERSION } fun finish() { diff --git a/kt/plugins/godot-gradle-plugin/src/main/resources/godot/gradle/godot-kotlin-graal-jni-config.json b/kt/plugins/godot-gradle-plugin/src/main/resources/godot/gradle/godot-kotlin-graal-jni-config.json index 0c528df69..7bdb6297b 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/resources/godot/gradle/godot-kotlin-graal-jni-config.json +++ b/kt/plugins/godot-gradle-plugin/src/main/resources/godot/gradle/godot-kotlin-graal-jni-config.json @@ -59,7 +59,7 @@ { "name" : "INSTANCE" } ], "methods" : [ - { "name" : "getMethodBindPtr$godot_library", "parameterTypes" : ["java.lang.String", "java.lang.String", "long"] } + { "name" : "getMethodBindPtr", "parameterTypes" : ["java.lang.String", "java.lang.String", "long"] } ] }, { @@ -331,7 +331,10 @@ { "name" : "engine_call_to_float64_array", "parameterTypes" : ["long"] }, { "name" : "engine_call_to_int32_array", "parameterTypes" : ["long"] }, { "name" : "engine_call_to_int64_array", "parameterTypes" : ["long"] }, - { "name" : "engine_call_size", "parameterTypes" : ["long"] } + { "name" : "engine_call_size", "parameterTypes" : ["long"] }, + + { "name" : "engine_convert_to_godot", "parameterTypes" : ["byte[]"] }, + { "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] } ] }, { @@ -399,7 +402,10 @@ { "name" : "engine_call_size", "parameterTypes" : ["long"] }, { "name" : "engine_call_slice", "parameterTypes" : ["long"] }, { "name" : "engine_call_sort", "parameterTypes" : ["long"] }, - { "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] } + { "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] }, + + { "name" : "engine_convert_to_godot", "parameterTypes" : ["float[]"] }, + { "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] } ] }, { @@ -433,7 +439,10 @@ { "name" : "engine_call_size", "parameterTypes" : ["long"] }, { "name" : "engine_call_slice", "parameterTypes" : ["long"] }, { "name" : "engine_call_sort", "parameterTypes" : ["long"] }, - { "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] } + { "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] }, + + { "name" : "engine_convert_to_godot", "parameterTypes" : ["double[]"] }, + { "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] } ] }, { @@ -467,7 +476,10 @@ { "name" : "engine_call_size", "parameterTypes" : ["long"] }, { "name" : "engine_call_slice", "parameterTypes" : ["long"] }, { "name" : "engine_call_sort", "parameterTypes" : ["long"] }, - { "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] } + { "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] }, + + { "name" : "engine_convert_to_godot", "parameterTypes" : ["int[]"] }, + { "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] } ] }, { @@ -501,7 +513,10 @@ { "name" : "engine_call_size", "parameterTypes" : ["long"] }, { "name" : "engine_call_slice", "parameterTypes" : ["long"] }, { "name" : "engine_call_sort", "parameterTypes" : ["long"] }, - { "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] } + { "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] }, + + { "name" : "engine_convert_to_godot", "parameterTypes" : ["long[]"] }, + { "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] } ] }, { @@ -569,7 +584,10 @@ { "name" : "engine_call_size", "parameterTypes" : ["long"] }, { "name" : "engine_call_slice", "parameterTypes" : ["long"] }, { "name" : "engine_call_sort", "parameterTypes" : ["long"] }, - { "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] } + { "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] }, + + { "name" : "engine_convert_to_godot", "parameterTypes" : ["float[]"] }, + { "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] } ] }, { @@ -603,7 +621,10 @@ { "name" : "engine_call_size", "parameterTypes" : ["long"] }, { "name" : "engine_call_slice", "parameterTypes" : ["long"] }, { "name" : "engine_call_sort", "parameterTypes" : ["long"] }, - { "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] } + { "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] }, + + { "name" : "engine_convert_to_godot", "parameterTypes" : ["float[]"] }, + { "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] } ] }, { @@ -637,7 +658,10 @@ { "name" : "engine_call_size", "parameterTypes" : ["long"] }, { "name" : "engine_call_slice", "parameterTypes" : ["long"] }, { "name" : "engine_call_sort", "parameterTypes" : ["long"] }, - { "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] } + { "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] }, + + { "name" : "engine_convert_to_godot", "parameterTypes" : ["float[]"] }, + { "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] } ] }, { @@ -683,7 +707,9 @@ { "name" : "", "parameterTypes" : [] }, { "name" : "loadClasses", "parameterTypes" : ["godot.core.KtClass[]"] }, { "name" : "registerManagedEngineTypes", "parameterTypes" : ["java.lang.String[]", "java.lang.String[]"] }, - { "name" : "init", "parameterTypes": ["java.lang.String", "java.lang.String", "java.lang.ClassLoader"]}, + { "name" : "initJar", "parameterTypes": ["java.lang.ClassLoader"]}, + { "name" : "initNativeImage", "parameterTypes": []}, + { "name" : "getVersion", "parameterTypes": []}, { "name" : "finish", "parameterTypes" : [] } ] }, @@ -716,7 +742,6 @@ {"name":"invokeNoReturn","parameterTypes":[] }, {"name":"invokeWithReturn","parameterTypes":[] }, {"name":"getReturnVariantType","parameterTypes":[] }, - {"name":"hashCode","parameterTypes":[] }, {"name":"onCancel","parameterTypes":[] } ] }, diff --git a/src/jvm_wrapper/kotlin_callable_custom.h b/src/jvm_wrapper/kotlin_callable_custom.h index e6d32601c..eca5befc6 100644 --- a/src/jvm_wrapper/kotlin_callable_custom.h +++ b/src/jvm_wrapper/kotlin_callable_custom.h @@ -11,14 +11,12 @@ JVM_INSTANCE_WRAPPER(LambdaCallable, "godot.core.LambdaCallable") { JNI_VOID_METHOD(INVOKE_NO_RETURN) JNI_OBJECT_METHOD(INVOKE_WITH_RETURN) JNI_INT_METHOD(GET_RETURN_VARIANT_TYPE) - JNI_INT_METHOD(HASH_CODE) JNI_VOID_METHOD(ON_CANCEL) INIT_JNI_BINDINGS( INIT_JNI_METHOD(INVOKE_NO_RETURN, "invokeNoReturn", "()V") INIT_JNI_METHOD(INVOKE_WITH_RETURN, "invokeWithReturn", "()Ljava/lang/Object;") INIT_JNI_METHOD(GET_RETURN_VARIANT_TYPE, "getReturnVariantType", "()I") - INIT_JNI_METHOD(HASH_CODE, "hashCode", "()I") INIT_JNI_METHOD(ON_CANCEL, "onCancel", "()V") ) diff --git a/src/lifecycle/paths.h b/src/lifecycle/paths.h index bf5e35107..9ae35c5eb 100644 --- a/src/lifecycle/paths.h +++ b/src/lifecycle/paths.h @@ -36,7 +36,7 @@ static constexpr const char* ANDROID_RELATIVE_JVM_LIB_PATH {""}; static constexpr const char* IOS_BOOTSTRAP_FILE {""}; static constexpr const char* IOS_USER_CODE_FILE {""}; -static constexpr const char* IOS_GRAAL_NATIVE_IMAGE_FILE {JVM_DIRECTORY "usercode.a"}; +static constexpr const char* IOS_GRAAL_NATIVE_IMAGE_FILE {"usercode.a"}; static constexpr const char* IOS_RELATIVE_JVM_LIB_PATH {""}; #ifdef X11_ENABLED diff --git a/versionBumpGuide.txt b/versionBumpGuide.txt index 9e55ef498..7b66ee3b5 100644 --- a/versionBumpGuide.txt +++ b/versionBumpGuide.txt @@ -1,5 +1,6 @@ When updating this project version, here the list of strings to changes: - src/version.h: GODOT_KOTLIN_VERSION. +- kt/common/src/main/kotlin/Version.kt: GODOT_KOTLIN_VERSION. - kt/gradle/libs.versions.toml: godotKotlinJvm, kotlin and godot variables. - docs/src/index.md: kotlin version, Full version, Module Version and Supported Godot Version fields in "Versioning" block. - config.py: Change the String to "jvm-x.x.x".