diff --git a/.github/workflows/deploy_create_draft_release.yml b/.github/workflows/deploy_create_draft_release.yml index a12243fff8..d914f3bcf5 100644 --- a/.github/workflows/deploy_create_draft_release.yml +++ b/.github/workflows/deploy_create_draft_release.yml @@ -46,8 +46,8 @@ jobs: - name: Output supported godot version file run: echo $(echo "$GITHUB_REF" | grep -Po '^(?:refs\/tags\/\d+.\d+.\d+-)\K(\d+.\d+.\d+)((?=-SNAPSHOT$)|$)') > deploy_godot_version.txt - - name: Output godot kotlin jvm version file - run: echo $(echo "$GITHUB_REF" | grep -Po '(\d+\.\d+\.\d+-\d+\.\d+\.\d+(-SNAPSHOT)?)') > deploy_godot_kotlin_jvm_version.txt + - name: Output Godot-JVM version file + run: echo $(echo "$GITHUB_REF" | grep -Po '(\d+\.\d+\.\d+-\d+\.\d+\.\d+(-SNAPSHOT)?)') > deploy_godot_jvm_version.txt - name: Save Release URL File for publish uses: actions/upload-artifact@v4 @@ -61,8 +61,8 @@ jobs: name: deploy_godot_version path: deploy_godot_version.txt - - name: Save godot kotlin jvm version for publish + - name: Save Godot-JVM version for publish uses: actions/upload-artifact@v4 with: - name: deploy_godot_kotlin_jvm_version - path: deploy_godot_kotlin_jvm_version.txt \ No newline at end of file + name: deploy_godot_jvm_version + path: deploy_godot_jvm_version.txt \ No newline at end of file diff --git a/.github/workflows/trigger_dev.yml b/.github/workflows/trigger_dev.yml index f6e60bf4c4..382b4c5288 100644 --- a/.github/workflows/trigger_dev.yml +++ b/.github/workflows/trigger_dev.yml @@ -66,7 +66,7 @@ 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.14.3-4.5.1" + godot-jvm-version: "0.14.3-4.5.1" godot-version: "4.5.1-stable" build-version: "0.14.3" jvm-version: "17" diff --git a/.github/workflows/trigger_on_tag.yml b/.github/workflows/trigger_on_tag.yml index d7bd59d9bf..285e8cd7e5 100644 --- a/.github/workflows/trigger_on_tag.yml +++ b/.github/workflows/trigger_on_tag.yml @@ -26,7 +26,7 @@ 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.14.3-4.5.1" + godot-jvm-version: "0.14.3-4.5.1" godot-version: "4.5.1-stable" build-version: "0.14.3" jvm-version: "17" @@ -100,7 +100,7 @@ jobs: - build-jvm - build-macos with: - godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }} + godot-jvm-version: ${{ needs.setup-build-variables.outputs['godot-jvm-version'] }} godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }} build-version: ${{ needs.setup-build-variables.outputs['build-version'] }} @@ -111,7 +111,7 @@ jobs: - setup-build-variables - build-ios with: - godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }} + godot-jvm-version: ${{ needs.setup-build-variables.outputs['godot-jvm-version'] }} godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }} build-version: ${{ needs.setup-build-variables.outputs['build-version'] }} @@ -123,7 +123,7 @@ jobs: - build-jvm - build-linux with: - godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }} + godot-jvm-version: ${{ needs.setup-build-variables.outputs['godot-jvm-version'] }} godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }} build-version: ${{ needs.setup-build-variables.outputs['build-version'] }} @@ -135,7 +135,7 @@ jobs: - build-jvm - build-windows with: - godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }} + godot-jvm-version: ${{ needs.setup-build-variables.outputs['godot-jvm-version'] }} godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }} build-version: ${{ needs.setup-build-variables.outputs['build-version'] }} @@ -150,7 +150,7 @@ jobs: - assemble-macos # export templates need to be packed into app - build-windows # uploads finished export template directly with: - godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }} + godot-jvm-version: ${{ needs.setup-build-variables.outputs['godot-jvm-version'] }} godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }} build-version: ${{ needs.setup-build-variables.outputs['build-version'] }} @@ -167,7 +167,7 @@ jobs: - assemble-windows - assemble-export-templates with: - godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }} + godot-jvm-version: ${{ needs.setup-build-variables.outputs['godot-jvm-version'] }} secrets: inherit # needed so that this sub workflow can also access github secrets for this workflow deploy-jvm: @@ -178,7 +178,7 @@ jobs: - build-jvm - deploy-godot # we define an explicit dependency on the github upload in case something goes wrong there. Github release purging is easier than from maven central and the likes with: - godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }} + godot-jvm-version: ${{ needs.setup-build-variables.outputs['godot-jvm-version'] }} godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }} jvm-version: ${{ needs.setup-build-variables.outputs['jvm-version'] }} secrets: inherit # needed so that this sub workflow can also access github secrets for this workflow diff --git a/README.md b/README.md index 58373bc6b0..5d7eb2a3b1 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# Godot Kotlin/JVM +# Godot-JVM ## Kotlin/JVM binding for the Godot Game Engine

-[![GitHub](https://img.shields.io/github/license/utopia-rise/godot-kotlin-jvm?style=for-the-badge)](LICENSE) +[![GitHub](https://img.shields.io/github/license/utopia-rise/godot-jvm?style=for-the-badge)](LICENSE) [![Discord](https://img.shields.io/discord/675058327088136212?style=for-the-badge&label=Discord)](https://discord.gg/zpb5Ru7v9x) [![Website](https://img.shields.io/website?url=https%3A%2F%2Fgodot-kotl.in%2Fen%2Fstable%2F&style=for-the-badge&label=Documentation)](https://godot-kotl.in/en/stable/) @@ -37,7 +37,7 @@ or for [C#](https://docs.godotengine.org/en/3.1/getting_started/scripting/c_shar This version of the binding is currently in **Beta**! While you can fully use the binding, please note that there might still be breaking API changes. We welcome any suggestions you have for improving the project and its API. -To be able to use this binding, you need to download our custom editor build and export templates from the [GitHub releases page](https://github.com/utopia-rise/godot-kotlin-jvm/releases)! The official godot binaries will NOT work! +To be able to use this binding, you need to download our custom editor build and export templates from the [GitHub releases page](https://github.com/utopia-rise/godot-jvm/releases)! The official godot binaries will NOT work! ## Documentation diff --git a/docs/README.md b/docs/README.md index 5d4f83fe75..8688a7b215 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,4 +1,4 @@ -## Godot Kotlin/JVM documentation +## Godot-JVM documentation The bindings documentation is written in markdown files, using [Material for MkDocs](https://squidfunk.github.io/mkdocs-material/). diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 12aa08cd83..3deec987a9 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -1,4 +1,4 @@ -site_name: Godot Kotlin/JVM +site_name: Godot-JVM docs_dir: src/doc repo_name: 'utopia-rise/godot-kotlin-jvm' diff --git a/docs/src/doc/develop-libraries/introduction.md b/docs/src/doc/develop-libraries/introduction.md index 3bc39867e0..c0cea23dfc 100644 --- a/docs/src/doc/develop-libraries/introduction.md +++ b/docs/src/doc/develop-libraries/introduction.md @@ -1,10 +1,10 @@ -Godot Kotlin/JVM libraries are basically the equivalent of Godot Addons, -but specifically for the use in other Godot Kotlin/JVM projects like Games or Applications. +Godot-JVM libraries are basically the equivalent of Godot Addons, +but specifically for the use in other Godot-JVM projects like Games or Applications. !!!Relevance If you build a library which does not register any classes to Godot, you can just create a regular JVM library, and you will have no need for this documentation. ## Overview -A Godot Kotlin/JVM library is just a regular JVM library with additional metadata annotations for registered classes. +A Godot-JVM library is just a regular JVM library with additional metadata annotations for registered classes. For registered classes in a library registration files are generated and provided to the consumer, so they can be used in the consuming project. \ No newline at end of file diff --git a/docs/src/doc/develop-libraries/setup.md b/docs/src/doc/develop-libraries/setup.md index 73949da97a..a8f2d738d4 100644 --- a/docs/src/doc/develop-libraries/setup.md +++ b/docs/src/doc/develop-libraries/setup.md @@ -1,4 +1,4 @@ -The basic project setup is the same as for regular Godot Kotlin/JVM projects. +The basic project setup is the same as for regular Godot-JVM projects. Head over to the corresponding [getting started](../getting-started/requirements.md) guide to set up the basics of the project. ## Library specific setup diff --git a/docs/src/doc/getting-started/setting-up.md b/docs/src/doc/getting-started/setting-up.md index e494e607b8..c76c598c12 100644 --- a/docs/src/doc/getting-started/setting-up.md +++ b/docs/src/doc/getting-started/setting-up.md @@ -30,7 +30,7 @@ is running, open the `Settings` and select the `Plugins` entry. From this view, Type `godot kotlin` into the search bar, and our plugin will be shown as follows. -![Godot Kotlin Plugin](../assets/img/idea-plugin/plugin-godot-kotlin.png) +![Godot-JVM Plugin](../assets/img/idea-plugin/plugin-godot-kotlin.png) Click the `Install` button and wait for the IDE to download the plugin. Once the downloading process is complete, press the `OK` button on the bottom-right. The IDE will prompt a new @@ -43,7 +43,7 @@ To create a new project, please refer to the following instructions: 1. Open IntelliJ IDEA 2. Create a new project clicking on `New Project` -3. In the `New Project` window, select `Godot Kotlin JVM`. +3. In the `New Project` window, select `Godot-JVM JVM`. 4. Fill out the package fields as necessary 5. (Optional) Select the builds that your project is interested in, such as Android or iOS. diff --git a/docs/src/doc/index.md b/docs/src/doc/index.md index 48c44fe9b3..7ac50449d8 100644 --- a/docs/src/doc/index.md +++ b/docs/src/doc/index.md @@ -4,9 +4,9 @@ hide: --- -[![GitHub](https://img.shields.io/github/license/utopia-rise/godot-kotlin-jvm?style=flat-square)](LICENSE) +[![GitHub](https://img.shields.io/github/license/utopia-rise/godot-jvm?style=flat-square)](LICENSE) -**Godot Kotlin/JVM** is a Godot module which allows you to write your game or application logic in Kotlin on the JVM. +**Godot-JVM** is a Godot module which allows you to write your game or application logic in Kotlin on the JVM. If you are looking for the documentation for Godot Kotlin/Native; you can find it [here](https://godot-kotlin.readthedocs.io/en/latest/). @@ -16,7 +16,7 @@ This project is in Beta. While you can fully use the binding, please note that t ## Project templates and demos -This is a minimal list to start off with a new Godot Kotlin/JVM project: +This is a minimal list to start off with a new Godot-JVM project: - [Minimal project template](https://github.com/utopia-rise/godot-kotlin-project-template) - [GDQuest 3D demo converted to Kotlin](https://github.com/utopia-rise/godot-kotlin-3d-demo) @@ -38,12 +38,12 @@ and limitations which will not be or cannot be adressed in the near forseable fu - Only a default no arg constructor can be registered. - No tool mode (you can set it already in the `@RegisterClass` annotation but it has no effect yet). -- No addon support, you cannot use Godot Kotlin/JVM to write plugins and addons yet (you can however [write libraries](develop-libraries/introduction.md) with godot specific code). +- No addon support, you cannot use Godot-JVM to write plugins and addons yet (you can however [write libraries](develop-libraries/introduction.md) with godot specific code). - Web is currently not supported. See [Supported platforms](#supported-platforms) to see what platforms we currently support ### Bug reporting and questions -If you find bugs, please report an [issue on GitHub](https://github.com/utopia-rise/godot-kotlin-jvm/issues) - but check for duplicates first. If you have questions or need help, you can ask on [Discord](https://discord.gg/zpb5Ru7v9x) in the `questions` and `help` channels respectively. +If you find bugs, please report an [issue on GitHub](https://github.com/utopia-rise/godot-jvm/issues) - but check for duplicates first. If you have questions or need help, you can ask on [Discord](https://discord.gg/zpb5Ru7v9x) in the `questions` and `help` channels respectively. If you don't have Discord or you don't want to use it, please file an issue on GitHub. ## Supported languages @@ -79,7 +79,7 @@ The current latest release is compatible with Kotlin version `2.0.21`. ## Custom engine builds -Get our pre-built engine builds and export templates from the latest [GitHub releases](https://github.com/utopia-rise/godot-kotlin-jvm/releases). +Get our pre-built engine builds and export templates from the latest [GitHub releases](https://github.com/utopia-rise/godot-jvm/releases). Contrary to the official binaries, there are two builds of the editor per Platform: debug and release. `release` editors are the editors you use normally. `debug` editors provide debug symbols and are intended to provide better stacktraces in case of crashes of the editor. Please use those when submitting bugreports. diff --git a/docs/src/doc/user-guide/advanced/commandline-args-and-configuration.md b/docs/src/doc/user-guide/advanced/commandline-args-and-configuration.md index 642ec776c0..b82a60cc9e 100644 --- a/docs/src/doc/user-guide/advanced/commandline-args-and-configuration.md +++ b/docs/src/doc/user-guide/advanced/commandline-args-and-configuration.md @@ -1,5 +1,5 @@ The following arguments can be either used in the command line or the `godot_kotlin_configuration.json` file at the root -of the project to customize the behaviour of the Godot Kotlin/JVM binding. +of the project to customize the behaviour of the Godot-JVM binding. !!! info Note that in case the same argument is used in both JSON and command-line, the command-line argument got the priority. diff --git a/docs/src/doc/user-guide/api-differences.md b/docs/src/doc/user-guide/api-differences.md index 372c50725c..a154f906ac 100644 --- a/docs/src/doc/user-guide/api-differences.md +++ b/docs/src/doc/user-guide/api-differences.md @@ -1,6 +1,6 @@ # Registration files and attaching scripts -Godot Kotlin/JVM offers two different ways to attach scripts: +Godot-JVM offers two different ways to attach scripts: - Source files - Registration files. diff --git a/docs/src/doc/user-guide/classes.md b/docs/src/doc/user-guide/classes.md index e8c7375ab7..46def75e8d 100644 --- a/docs/src/doc/user-guide/classes.md +++ b/docs/src/doc/user-guide/classes.md @@ -141,7 +141,7 @@ This also works for any type you define. Godot requires you to have a default constructor on your classes. These are automatically registered for you. Registering constructor with arguments is currently not supported. But you can freely use them from Kotlin/Java/Scala -just not from GDScript or any other non Godot Kotlin/JVM language. +just not from GDScript or any other non Godot-JVM language. ### Instantiate Kotlin script classes in GDScript diff --git a/docs/src/doc/user-guide/consuming-libraries.md b/docs/src/doc/user-guide/consuming-libraries.md index bb2b881c82..ad2bc2c8d1 100644 --- a/docs/src/doc/user-guide/consuming-libraries.md +++ b/docs/src/doc/user-guide/consuming-libraries.md @@ -10,7 +10,7 @@ dependencies { } ``` -# Godot Kotlin/JVM libraries +# Godot-JVM libraries Can also be used the same way as for regular Gradle projects: diff --git a/harness/tests/README.md b/harness/tests/README.md index 8fec0ab3d7..4b06fa27af 100644 --- a/harness/tests/README.md +++ b/harness/tests/README.md @@ -1,4 +1,4 @@ -# Unit tests for Godot Kotlin/JVM +# Unit tests for Godot-JVM ## Setup instructions ### Gradle task diff --git a/harness/tests/project.godot b/harness/tests/project.godot index 2f37dfce33..9c30210997 100644 --- a/harness/tests/project.godot +++ b/harness/tests/project.godot @@ -10,7 +10,7 @@ config_version=5 [application] -config/name="Godot Kotlin Tests" +config/name="Godot-JVM Tests" run/main_scene="res://test/GutTests.tscn" config/features=PackedStringArray("4.5") config/icon="res://icon.png" diff --git a/harness/tests/scripts/godot/tests/HelloFromScala.gdj b/harness/tests/scripts/godot/tests/HelloFromScala.gdj index 397a32618c..4c3e2c205e 100644 --- a/harness/tests/scripts/godot/tests/HelloFromScala.gdj +++ b/harness/tests/scripts/godot/tests/HelloFromScala.gdj @@ -12,7 +12,7 @@ supertypes = [ godot.common.interop.NativePointer ] signals = [ - my_signal + ] properties = [ my_int diff --git a/harness/tests/scripts/godot/tests/JavaTestClass.gdj b/harness/tests/scripts/godot/tests/JavaTestClass.gdj index 2c802fcdef..f557a005ab 100644 --- a/harness/tests/scripts/godot/tests/JavaTestClass.gdj +++ b/harness/tests/scripts/godot/tests/JavaTestClass.gdj @@ -12,8 +12,7 @@ supertypes = [ godot.common.interop.NativePointer ] signals = [ - test_signal, - test_signal2 + ] properties = [ java_enum, diff --git a/harness/tests/scripts/godot/tests/ScalaTestClass.gdj b/harness/tests/scripts/godot/tests/ScalaTestClass.gdj index 4dc37e33a7..dc5c6cc67a 100644 --- a/harness/tests/scripts/godot/tests/ScalaTestClass.gdj +++ b/harness/tests/scripts/godot/tests/ScalaTestClass.gdj @@ -12,8 +12,7 @@ supertypes = [ godot.common.interop.NativePointer ] signals = [ - test_signal, - test_signal2 + ] properties = [ exported_int, @@ -31,6 +30,5 @@ properties = [ functions = [ greeting, _ready, - connect_and_trigger_signal, signal_callback ] \ No newline at end of file diff --git a/harness/tests/scripts/godot/tests/constructor/ConstructorRegistrationTest.gdj b/harness/tests/scripts/godot/tests/constructor/ConstructorRegistrationTest.gdj index 25410aea44..6f4e47c1c2 100644 --- a/harness/tests/scripts/godot/tests/constructor/ConstructorRegistrationTest.gdj +++ b/harness/tests/scripts/godot/tests/constructor/ConstructorRegistrationTest.gdj @@ -15,7 +15,7 @@ signals = [ ] properties = [ - + default_constructor_has_been_called ] functions = [ diff --git a/harness/tests/test/unit/test_godot_kotlin_jvm_dependencies.gd b/harness/tests/test/unit/test_godot_kotlin_jvm_dependencies.gd index 1858418788..d79fc8e88b 100644 --- a/harness/tests/test/unit/test_godot_kotlin_jvm_dependencies.gd +++ b/harness/tests/test/unit/test_godot_kotlin_jvm_dependencies.gd @@ -1,7 +1,7 @@ extends "res://addons/gut/test.gd" -func test_call_function_in_godot_kotlin_jvm_dependency(): +func test_call_function_in_godot_jvm_dependency(): var library_test_scene = load("res://library_test.tscn").instantiate() assert_eq(library_test_scene.provide_greeting_for_hierarchical_library(), "Hello from hierarchical-library-test!", "Greeting from hierarchical library does not match") assert_eq(library_test_scene.provide_greeting_for_flattened_library(), "Hello from flattened-library-test!", "Greeting from flattened library does not match") diff --git a/kt/build-logic/convention/build.gradle.kts b/kt/build-logic/convention/build.gradle.kts index cc86ff0e54..7f9e89a0ba 100644 --- a/kt/build-logic/convention/build.gradle.kts +++ b/kt/build-logic/convention/build.gradle.kts @@ -25,7 +25,7 @@ gradlePlugin { plugins { create("godotPublishPlugin") { id = "com.utopia-rise.godot-publish" - displayName = "Gradle plugin for publishing godot kotlin jvm to maven central" + displayName = "Gradle plugin for publishing Godot-JVM to maven central" implementationClass = "publish.PublishToMavenCentralPlugin" } } diff --git a/kt/build-logic/convention/src/main/kotlin/publish/PublishToMavenCentralPlugin.kt b/kt/build-logic/convention/src/main/kotlin/publish/PublishToMavenCentralPlugin.kt index 0be219446c..6f73197537 100644 --- a/kt/build-logic/convention/src/main/kotlin/publish/PublishToMavenCentralPlugin.kt +++ b/kt/build-logic/convention/src/main/kotlin/publish/PublishToMavenCentralPlugin.kt @@ -59,26 +59,26 @@ class PublishToMavenCentralPlugin : Plugin { publication.version = evaluatedProject.version as String publication.pom { mavenPom -> - mavenPom.url.set("https://github.com/utopia-rise/godot-kotlin-jvm.git") + mavenPom.url.set("https://github.com/utopia-rise/godot-jvm.git") if (mavenPom.name.getOrElse("").isNullOrEmpty()) { mavenPom.name.set(evaluatedProject.name) } if (mavenPom.description.getOrElse("").isNullOrEmpty()) { - mavenPom.description.set(evaluatedProject.description ?: "Godot kotlin jvm module") + mavenPom.description.set(evaluatedProject.description ?: "Godot-JVM module") } mavenPom.scm { mavenPomScm -> - mavenPomScm.connection.set("scm:git:https://github.com/utopia-rise/godot-kotlin-jvm") - mavenPomScm.developerConnection.set("scm:git:github.com:utopia-rise/godot-kotlin-jvm.git") + mavenPomScm.connection.set("scm:git:https://github.com/utopia-rise/godot-jvm") + mavenPomScm.developerConnection.set("scm:git:github.com:utopia-rise/godot-jvm.git") mavenPomScm.tag.set("master") //FIXME - mavenPomScm.url.set("https://github.com/utopia-rise/godot-kotlin-jvm") + mavenPomScm.url.set("https://github.com/utopia-rise/godot-jvm") } mavenPom.licenses { mavenPomLicenseSpec -> mavenPomLicenseSpec.license { mavenPomLicense -> mavenPomLicense.name.set("MIT License") - mavenPomLicense.url.set("https://github.com/utopia-rise/godot-kotlin-jvm/blob/master/LICENSE") + mavenPomLicense.url.set("https://github.com/utopia-rise/godot-jvm/blob/master/LICENSE") mavenPomLicense.distribution.set("repo") } } diff --git a/kt/build.gradle.kts b/kt/build.gradle.kts index 127f05b253..c5eb150e82 100644 --- a/kt/build.gradle.kts +++ b/kt/build.gradle.kts @@ -21,17 +21,17 @@ subprojects { tasks { @Suppress("UNUSED_VARIABLE") val generateChangelog by registering { - group = "godot-kotlin-jvm" + group = "godot-jvm" doLast { val tags = grgit.tag.list().reversed().filter { it.name != "stable" } val fromTag = tags.getOrNull(1) val toTag = tags.getOrNull(0) val changeLogPrefix = """ - The files prefixed with `godot-kotlin-jvm_editor_` are the editors. + The files prefixed with `godot-jvm_editor_` are the editors. `release` editors are the editors you use normally. `debug` editors provide debug symbols and are intended to provide better stacktraces in case of crashes of the editor. Please use those when submitting bugreports. - `godot-kotlin-jvm_export_templates_$fullGodotKotlinJvmVersion.tpz` is the archive for all export templates . See [exporting](https://godot-kotl.in/en/latest/user-guide/exporting/) documentation on how to use it. + `godot-jvm_export_templates_$fullGodotKotlinJvmVersion.tpz` is the archive for all export templates . See [exporting](https://godot-kotl.in/en/latest/user-guide/exporting/) documentation on how to use it. **Changelog:** @@ -41,7 +41,7 @@ tasks { range(fromTag?.name, toTag?.name) } .joinToString(separator = "\n", prefix = changeLogPrefix) { commit -> - val link = "https://github.com/utopia-rise/godot-kotlin-jvm/commit/${commit.id}" + val link = "https://github.com/utopia-rise/godot-jvm/commit/${commit.id}" "- [${commit.abbreviatedId}]($link) ${commit.shortMessage}" } @@ -53,7 +53,7 @@ tasks { } } val buildEngineDebug by registering(Exec::class) { - group = "godot-kotlin-jvm" + group = "godot-jvm" workingDir = File(rootProject.projectDir, "../../..") environment("JAVA_HOME", System.getProperty("java.home")) @@ -73,7 +73,7 @@ tasks { } } val buildEngineReleaseDebug by registering(Exec::class) { - group = "godot-kotlin-jvm" + group = "godot-jvm" workingDir = File(rootProject.projectDir, "../../..") environment("JAVA_HOME", System.getProperty("java.home")) @@ -93,7 +93,7 @@ tasks { } } val runEngineDebug by registering(Exec::class) { - group = "godot-kotlin-jvm" + group = "godot-jvm" workingDir = File(rootProject.projectDir, "../../../bin") environment("JAVA_HOME", System.getProperty("java.home")) @@ -113,7 +113,7 @@ tasks { } } val runEngineReleaseDebug by registering(Exec::class) { - group = "godot-kotlin-jvm" + group = "godot-jvm" workingDir = File(rootProject.projectDir, "../../../bin") environment("JAVA_HOME", System.getProperty("java.home")) @@ -134,13 +134,13 @@ tasks { } @Suppress("UNUSED_VARIABLE") val buildAndRunEngineDebug by registering { - group = "godot-kotlin-jvm" + group = "godot-jvm" dependsOn(buildEngineDebug) finalizedBy(runEngineDebug) } @Suppress("UNUSED_VARIABLE") val buildAndRunEngineReleaseDebug by registering { - group = "godot-kotlin-jvm" + group = "godot-jvm" dependsOn(buildEngineReleaseDebug) finalizedBy(runEngineReleaseDebug) } diff --git a/kt/entry-generation/godot-entry-generator/build.gradle.kts b/kt/entry-generation/godot-entry-generator/build.gradle.kts index 0fb9c3c3b6..3a9bc4b1f2 100644 --- a/kt/entry-generation/godot-entry-generator/build.gradle.kts +++ b/kt/entry-generation/godot-entry-generator/build.gradle.kts @@ -22,10 +22,10 @@ publishing { val godotEntryGenerator by creating(MavenPublication::class) { pom { name.set(project.name) - description.set("Godot Kotlin entry code generator.") + description.set("Godot-JVM entry code generator.") } artifactId = project.name - description = "Godot Kotlin entry code generator." + description = "Godot-JVM entry code generator." from(components.getByName("java")) } } diff --git a/kt/godot-library/godot-internal-library/build.gradle.kts b/kt/godot-library/godot-internal-library/build.gradle.kts index c5245cc1fe..c0c878e8e4 100644 --- a/kt/godot-library/godot-internal-library/build.gradle.kts +++ b/kt/godot-library/godot-internal-library/build.gradle.kts @@ -32,10 +32,10 @@ publishing { val godotInternalLibraryPublication by creating(MavenPublication::class) { pom { name.set("${project.name}-$targetSuffix") - description.set("Contains internal utilities for the Godot kotlin libraries") + description.set("Contains internal utilities for the Godot-JVM libraries") } artifactId = "godot-internal-library-$targetSuffix" - description = "Contains internal utilities for the Godot kotlin libraries" + description = "Contains internal utilities for the Godot-JVM libraries" from(components["java"]) } diff --git a/kt/plugins/godot-gradle-plugin/build.gradle.kts b/kt/plugins/godot-gradle-plugin/build.gradle.kts index acaed236bf..2436158e23 100644 --- a/kt/plugins/godot-gradle-plugin/build.gradle.kts +++ b/kt/plugins/godot-gradle-plugin/build.gradle.kts @@ -13,15 +13,15 @@ kotlin { } gradlePlugin { - website.set("https://github.com/utopia-rise/godot-kotlin-jvm") - vcsUrl.set("https://github.com/utopia-rise/godot-kotlin-jvm.git") + website.set("https://github.com/utopia-rise/godot-jvm") + vcsUrl.set("https://github.com/utopia-rise/godot-jvm.git") plugins { create("godotPlugin") { - id = "com.utopia-rise.godot-kotlin-jvm" - displayName = "Gradle plugin for godot-kotlin-jvm" + id = "com.utopia-rise.godot-jvm" + displayName = "Gradle plugin for godot-jvm" implementationClass = "godot.gradle.GodotPlugin" - description = "Automatically setup of godot kotlin jvm specific project configurations" + description = "Automatically setup of Godot-JVM specific project configurations" tags.set(listOf("kotlin", "godot", "gamedev")) } diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/GodotPlugin.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/GodotPlugin.kt index 74c3bec554..82c695dbe9 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/GodotPlugin.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/GodotPlugin.kt @@ -56,7 +56,7 @@ abstract class GodotPlugin : Plugin { /** - * The PropertiesModelBuilder class is responsible for building the tooling model for the Godot Kotlin-JVM properties file. + * The PropertiesModelBuilder class is responsible for building the tooling model for the Godot-JVM properties file. * * This file is only virtually present and is then loaded by `FetchProjectModelsBuildAction` in the IDE plugin to load the users gradle configuration of our gradle plugin. * diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/setupTasks.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/setupTasks.kt index 61ca198339..10ad035338 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/setupTasks.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/setupTasks.kt @@ -31,7 +31,7 @@ import org.gradle.api.Project fun Project.setupTasks() { tasks.register("generateEmbeddedJre", GenerateEmbeddedJreTask::class.java) { task -> - task.group = "godot-kotlin-jvm" + task.group = "godot-jvm" task.description = "Generates an embedded jre using jlink" } diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/GenerateEmbeddedJreTask.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/GenerateEmbeddedJreTask.kt index cd2985d01b..66ff0208d8 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/GenerateEmbeddedJreTask.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/GenerateEmbeddedJreTask.kt @@ -20,7 +20,7 @@ open class GenerateEmbeddedJreTask @Inject constructor( ) @Input - var outputDir: String = "${Paths.GODOT_KOTLIN_JVM_DIR}/jre-${getArch()}-${getOs()}" + var outputDir: String = "${Paths.GODOT_JVM_DIR}/jre-${getArch()}-${getOs()}" @Input var arguments: Array = arrayOf( diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/checkAndroidJarAccessibleTask.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/checkAndroidJarAccessibleTask.kt index 30d3a54ad2..4d3586f8ba 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/checkAndroidJarAccessibleTask.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/checkAndroidJarAccessibleTask.kt @@ -8,7 +8,7 @@ import org.gradle.api.tasks.TaskProvider fun Project.checkAndroidJarAccessibleTask(): TaskProvider { return tasks.register("checkAndroidJarAccessible") { with(it) { - group = "godot-kotlin-jvm" + group = "godot-jvm" description = "Checks if the android.jar is present in the provided androidCompileSdkDir. Needed for android builds only" diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/checkD8ToolAccessibleTask.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/checkD8ToolAccessibleTask.kt index 592415be19..2e22b59229 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/checkD8ToolAccessibleTask.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/checkD8ToolAccessibleTask.kt @@ -10,7 +10,7 @@ import org.gradle.api.tasks.TaskProvider fun Project.checkD8ToolAccessibleTask(): TaskProvider { return tasks.register("checkD8ToolAccessible") { with(it) { - group = "godot-kotlin-jvm" + group = "godot-jvm" description = "Checks if the d8 tool is accessible and executable. Needed for android builds only" doLast { diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/createBootstrapDexJarTask.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/createBootstrapDexJarTask.kt index 5e3a7c2bdf..e65081e30f 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/createBootstrapDexJarTask.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/createBootstrapDexJarTask.kt @@ -16,7 +16,7 @@ fun Project.createBootstrapDexJarTask( ): TaskProvider { return tasks.register("createBootstrapDexJar", Exec::class.java) { with(it) { - group = "godot-kotlin-jvm" + group = "godot-jvm" description = "Converts the godot-bootstrap.jar to an android compatible version. Needed for android builds only" dependsOn(checkD8ToolAccessibleTask, checkAndroidJarAccessibleTask, packageBootstrapJarTask) diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/createMainDexFileTask.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/createMainDexFileTask.kt index 82191c3361..e6ec555e5f 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/createMainDexFileTask.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/createMainDexFileTask.kt @@ -17,7 +17,7 @@ fun Project.createMainDexFileTask( ): TaskProvider { return tasks.register("createMainDexFile", Exec::class.java) { with(it) { - group = "godot-kotlin-jvm" + group = "godot-jvm" description = "Converts the main.jar to an android dex file. Needed for android builds only" dependsOn( diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/packageBootstrapDexJarTask.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/packageBootstrapDexJarTask.kt index ac8a46f507..bc205c0e6e 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/packageBootstrapDexJarTask.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/packageBootstrapDexJarTask.kt @@ -12,7 +12,7 @@ fun Project.packageBootstrapDexJarTask( ): TaskProvider { return tasks.register("packageBootstrapDexJar", Exec::class.java) { with(it) { - group = "godot-kotlin-jvm" + group = "godot-jvm" description = "Packages needed resources into godot-bootstrap-dex.jar. Needed for android builds only" dependsOn(createBootstrapDexJarTask) diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/packageMainDexJarTask.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/packageMainDexJarTask.kt index c57324ce04..0b4259d00e 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/packageMainDexJarTask.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/android/packageMainDexJarTask.kt @@ -10,7 +10,7 @@ fun Project.packageMainDexJarTask( ): TaskProvider { return tasks.register("packageMainDexJar", ShadowJar::class.java) { with(it) { - group = "godot-kotlin-jvm" + group = "godot-jvm" description = "Packs the android dex file of main, together with the needed entry service file into a jar. Needed for android builds only" diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/copyJarsTask.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/copyJarsTask.kt index 94da55a6f3..8332ddd68f 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/copyJarsTask.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/copyJarsTask.kt @@ -12,7 +12,7 @@ fun Project.createCopyJarsTask( ): TaskProvider { return tasks.register("copyJars", Copy::class.java) { with(it) { - group = "godot-kotlin-jvm-internal" + group = "godot-jvm-internal" description = "Internal task! Copies the built jars into the final output dir for the cpp reloading to pick up." @@ -22,7 +22,7 @@ fun Project.createCopyJarsTask( ) this.from(layout.buildDirectory.asFile.get().resolve("libs")) - this.destinationDir = projectDir.resolve(Paths.GODOT_KOTLIN_JVM_DIR) + this.destinationDir = projectDir.resolve(Paths.GODOT_JVM_DIR) } } } diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/generateGdIgnoreFilesTask.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/generateGdIgnoreFilesTask.kt index bd7393828b..547f7f3e1e 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/generateGdIgnoreFilesTask.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/generateGdIgnoreFilesTask.kt @@ -7,13 +7,13 @@ import org.gradle.api.tasks.TaskProvider fun Project.generateGdIgnoreFilesTask(): TaskProvider { return tasks.register("generateGdIgnoreFiles") { with(it) { - group = "godot-kotlin-jvm" + group = "godot-jvm" description = "Generates .gdignore files to hide gradle files, kotlin build files and jre files from the godot editor." doFirst { // safety check: make sure that the target project has our plugin - if (!this.project.pluginManager.hasPlugin("com.utopia-rise.godot-kotlin-jvm")) { + if (!this.project.pluginManager.hasPlugin("com.utopia-rise.godot-jvm")) { // the target project doesn't seem to have our plugin; skip. return@doFirst } diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/copyDefaultGraalJniConfigTask.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/copyDefaultGraalJniConfigTask.kt index d119d0f202..e71db983fd 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/copyDefaultGraalJniConfigTask.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/copyDefaultGraalJniConfigTask.kt @@ -7,7 +7,7 @@ import org.gradle.api.tasks.TaskProvider fun Project.copyDefaultGraalJniConfigTask(): TaskProvider { return tasks.register("createDefaultGraalJniConfig") { with(it) { - group = "godot-kotlin-jvm" + group = "godot-jvm" description = "Checks if the default jni config for graalVM native image is present and creates it if it's not" diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/createGraalNativeImage.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/createGraalNativeImage.kt index 1a48de272f..e54c862562 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/createGraalNativeImage.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/createGraalNativeImage.kt @@ -16,7 +16,7 @@ fun Project.createGraalNativeImageTask( ): TaskProvider { return tasks.register("createGraalNativeImage", Exec::class.java) { with(it) { - group = "godot-kotlin-jvm" + group = "godot-jvm" description = "Converts main.jar and bootstrap.jar into a GraalVM native image." dependsOn( diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/copyDefaultGraalIOSConfigsTask.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/copyDefaultGraalIOSConfigsTask.kt index 4e8a7603ba..6376301993 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/copyDefaultGraalIOSConfigsTask.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/copyDefaultGraalIOSConfigsTask.kt @@ -10,7 +10,7 @@ fun Project.copyDefaultGraalIOSConfigsTask( checkPresenceOfDefaultGraalJniConfigTask: TaskProvider, ): TaskProvider = tasks.register("copyDefaultGraalIOSJniConfig") { with(it) { - group = "godot-kotlin-jvm" + group = "godot-jvm" description = "Checks if the default configs for ios graalVM native image are present and creates them if they're not" diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/createIOSGraalNativeImage.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/createIOSGraalNativeImage.kt index 9da119c347..92e72c9d6e 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/createIOSGraalNativeImage.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/createIOSGraalNativeImage.kt @@ -17,7 +17,7 @@ fun Project.createIOSGraalNativeImageTask( packageBootstrapJarTask: TaskProvider ): TaskProvider = tasks.register("createIOSGraalNativeImage", Exec::class.java) { with(it) { - group = "godot-kotlin-jvm-internal" + group = "godot-jvm-internal" description = "INTERNAL TASK ! Converts main.jar and bootstrap.jar into a GraalVM ios native image." dependsOn( diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/createIOSStaticLibrary.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/createIOSStaticLibrary.kt index 8f556f08ab..7904bf2de7 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/createIOSStaticLibrary.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/createIOSStaticLibrary.kt @@ -10,7 +10,7 @@ fun Project.createIOSStaticLibraryTask( createIOSGraalNativeImageTask: TaskProvider ): TaskProvider = tasks.register("createIOSStaticLibrary", Exec::class.java) { with(it) { - group = "godot-kotlin-jvm" + group = "godot-jvm" description = "Pack usercode.o in a static library." dependsOn( diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/downloadIOSCapCacheFiles.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/downloadIOSCapCacheFiles.kt index 4f27579223..0ba6cfb657 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/downloadIOSCapCacheFiles.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/downloadIOSCapCacheFiles.kt @@ -9,7 +9,7 @@ import java.net.URL fun Project.downloadIOSCapCacheFiles(): TaskProvider = tasks .register("downloadIOSCapCacheFiles") { task -> with(task) { - group = "godot-kotlin-jvm-internal" + group = "godot-jvm-internal" description = "INTERNAL TASK ! Downloads CAP cache needed for iOS compilation using GraalVM native-image." doLast { _ -> diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/downloadIOSJdkStaticLibraries.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/downloadIOSJdkStaticLibraries.kt index fc238a135d..5e8058e8bf 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/downloadIOSJdkStaticLibraries.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/ios/downloadIOSJdkStaticLibraries.kt @@ -10,7 +10,7 @@ import java.net.URL fun Project.downloadIOSJdkStaticLibraries(): TaskProvider = tasks .register("downloadIOSJdkStaticLibraries") { with(it) { - group = "godot-kotlin-jvm-internal" + group = "godot-jvm-internal" description = "INTERNAL TASK ! Downloads ios static JDK libraries." doLast { diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/nativeImageToolAccessible.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/nativeImageToolAccessible.kt index 68462f92c3..ee8d7c042b 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/nativeImageToolAccessible.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/graal/nativeImageToolAccessible.kt @@ -11,7 +11,7 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform fun Project.checkNativeImageToolAccessibleTask(): TaskProvider { return tasks.register("checkNativeImageToolAccessible") { with(it) { - group = "godot-kotlin-jvm" + group = "godot-jvm" description = "Checks if the GraalVM native image tool is accessible and executable. Needed for GraalVM native-image builds only" diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/packageBootstrapJarTask.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/packageBootstrapJarTask.kt index c543bb1b64..32f8b57cdf 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/packageBootstrapJarTask.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/packageBootstrapJarTask.kt @@ -8,7 +8,7 @@ import org.gradle.api.tasks.TaskProvider fun Project.packageBootstrapJarTask(): TaskProvider { return tasks.register("packageBootstrapJar", ShadowJar::class.java) { with(it) { - group = "godot-kotlin-jvm" + group = "godot-jvm" description = "Creates a fat jar containing everything needed to load and run the main.jar" archiveBaseName.set("godot-bootstrap") diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/packageMainJar.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/packageMainJar.kt index 1270041a73..b60e18d932 100644 --- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/packageMainJar.kt +++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/packageMainJar.kt @@ -13,7 +13,7 @@ fun Project.packageMainJarTask( ): TaskProvider { return tasks.named("shadowJar", ShadowJar::class.java) { with(it) { - group = "godot-kotlin-jvm" + group = "godot-jvm" description = "Creates a fat jar containing game code and all dependencies of it" archiveBaseName.set("main") diff --git a/kt/plugins/godot-intellij-plugin/CHANGELOG.md b/kt/plugins/godot-intellij-plugin/CHANGELOG.md index 5023968c1d..6d57ccda10 100644 --- a/kt/plugins/godot-intellij-plugin/CHANGELOG.md +++ b/kt/plugins/godot-intellij-plugin/CHANGELOG.md @@ -27,7 +27,7 @@ - Adds code insight checks for basic `rpc` and `call` usage - Adds gutter icons and dialogs for in editor connected signals throughout the whole project (not only the currently opened scene) - Adds refactor support for scene files (when classes are moved/renamed) -- Adds project wizard to create new godot kotlin jvm projects +- Adds project wizard to create new Godot-JVM projects ### Created Plugin - Initial scaffold created from [IntelliJ Platform Plugin Template](https://github.com/JetBrains/intellij-platform-plugin-template) diff --git a/kt/plugins/godot-intellij-plugin/README.md b/kt/plugins/godot-intellij-plugin/README.md index 6b99c6a92b..26533ab6cc 100644 --- a/kt/plugins/godot-intellij-plugin/README.md +++ b/kt/plugins/godot-intellij-plugin/README.md @@ -24,7 +24,7 @@ Features: - Adds code insight checks for basic `rpc` and `call` usage - Adds gutter icons and dialogs for in editor connected signals throughout the whole project (not only the currently opened scene) - Adds refactor support for scene files (when classes are moved/renamed) - - Adds project wizard to create new godot kotlin jvm projects + - Adds project wizard to create new Godot-JVM projects ## Installation diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/module/GodotModuleBuilder.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/module/GodotModuleBuilder.kt index 99fd06c428..f2c9f85428 100644 --- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/module/GodotModuleBuilder.kt +++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/module/GodotModuleBuilder.kt @@ -222,7 +222,7 @@ class GodotModuleBuilder : ModuleBuilder(), ModuleBuilderListener { outFile .readText() .replace( - "GODOT_KOTLIN_JVM_VERSION", + "GODOT_JVM_VERSION", GodotBuildProperties.assembledGodotKotlinJvmVersion ) .replace( @@ -314,12 +314,12 @@ class GodotModuleBuilder : ModuleBuilder(), ModuleBuilderListener { if (module.parentProjectAlreadyContainsDependency(wizardContext, "godot-core-library")) { content.replace( "GODOT_KOTLIN_DEPENDENCY", - "id(\"com.utopia-rise.godot-kotlin-jvm\")" + "id(\"com.utopia-rise.godot-jvm\")" ) } else { content.replace( "GODOT_KOTLIN_DEPENDENCY", - "id(\"com.utopia-rise.godot-kotlin-jvm\") version \"${GodotBuildProperties.assembledGodotKotlinJvmVersion}\"" + "id(\"com.utopia-rise.godot-jvm\") version \"${GodotBuildProperties.assembledGodotKotlinJvmVersion}\"" ) } } diff --git a/kt/plugins/godot-intellij-plugin/src/main/resources/META-INF/plugin.xml b/kt/plugins/godot-intellij-plugin/src/main/resources/META-INF/plugin.xml index 043548af43..c1c2278859 100644 --- a/kt/plugins/godot-intellij-plugin/src/main/resources/META-INF/plugin.xml +++ b/kt/plugins/godot-intellij-plugin/src/main/resources/META-INF/plugin.xml @@ -1,6 +1,6 @@ com.utopia-rise.godotjvmideaplugin - Godot Kotlin/Jvm + Godot-JVM