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

Merge GdKotlin rework into master. #620

Merged
merged 11 commits into from
May 9, 2024
Merged

Merge GdKotlin rework into master. #620

merged 11 commits into from
May 9, 2024

Conversation

CedNaru
Copy link
Member

@CedNaru CedNaru commented Apr 26, 2024

The changes are starting to pile up and PRs not related to the rework also have been merged into it so it's time to send everything to master before moving forward with cpp reloading.

This PR won't be squashed.

@CedNaru CedNaru changed the title Merge GdKotlin rework to master. Merge GdKotlin rework into master. Apr 26, 2024
@CedNaru CedNaru marked this pull request as ready for review April 30, 2024 21:52
@CedNaru CedNaru requested review from piiertho and chippmann April 30, 2024 21:52
@CedNaru CedNaru force-pushed the gd_kotlin_rework branch 2 times, most recently from 8817a3f to 628389e Compare May 7, 2024 03:31
chippmann
chippmann previously approved these changes May 7, 2024
piiertho
piiertho previously approved these changes May 7, 2024
CedNaru and others added 10 commits May 8, 2024 10:49
* Move files to new jvm_wrapper directory
* Refactor JVM wrappers
* Transform many classes into JvmSingletonWrapper
* Merge MemoryManager and MemoryBridge
---------

Co-authored-by: Pierre-Thomas Meisels <[email protected]>
* Rework JVM configuration parsing and checks
* Add jvm_arguments options

---------

Co-authored-by: LukasVykuka <[email protected]>
* Fix android export templates

* Test cherry pick

* Delete unneded workflows

* Use different commit

* Add identity

* Fix paths

* Fix version in export templates

* Add todo

* Add deleted workflows again

* Add temporary workaround to other pipelines

* Disable existing pipelines and start on pr_pipeline with linux

* Use environment prefix

* Fix scons flags

* Pass godot version as an input instead and add jvm build workflow

* Hardcode input values as test

* Fix input reference

* Fix input usage

* Remove matrix build and fix concurrency

* Remove usless steps

* Add windows build

* Define version at job definition level as github does not support those to be shared

* Change windows emoji

* Add macos builds

* Change jvm emoji

* Upgrade checkout v2 to checkout v4

* Use `gradle-executable` instead of deprecated `wrapper-directory`

* Replace deprecated eskator gradle build with gradle setup and plain gradle execution

* Remove jvm emoji on job name

* Use workflow prefixes instead of suffixes

* Define jvm distribution

* Add android and ios builds

* Add linux tests

* Add windows script to run unit tests

* Add assemble macos pipeline

* Fix referenced workflow

* Change job name

* Change job names

* Add assemble linux editor and improve naming on assemlbe macos editor

* Fix path

* Fix paths and add other assemble tasks

* Fix emojis

* Always use cache

* Downgrade upload and download actions to use the same version as godot

* Also build debug versions

* Fix debug build

* Prefix artifact names

* Fix emojis

* Remove explicit matrix name definition

* Rename matrix names

* Add windows and macos tests

* Cleanup runs-on definitions

* Add assemble ios and export templates tpz

* Fix needs

* Fix names

* Fix names

* Fix names

* Fix needs declaration for tpz

* Remove unneded needs

* Fixes

* Add fake step

* Test

* Add label and comment

* Change type

* Fix dependencies and test trigger on windows

* Set test timeout eagerly

* Fix output reference

* Fixes

* Add deploy stages

* Fix bat

* Fix emoji

* Try wrapping in ""

* Change name

* Use the correct target

* Fix name path swapped

* Add needed inputs

* Add missing inputs

* Set java version

* Fix version reference

* Fix naming

* Remove predefined outputs

* Update shell script

* Update zip commands

* Don't error out on error logs in test execution

* Fix command to execute

* Run commands synchronously

* Enable echo to fix failing test because of it

* Improve script

* Set echo off

* Fix assemble of linux editor

* test

* Replace test execution scripts with gradle task

* Find editor executable in gradle task

* Remove lines giving execution rights to non existent script

* Print files

* Use delegate access

* Revert

* Fix print to debug issue

* Remove additional filters

* Check the name explicitly

* Try passing params as one

* Increase test timeouut to 30 minutes

* Test

* Ignore exit code

* Properly ignore exit value

* Properly ignore exit value

* Fix string occurrence checks

* Rewrite output parsing

* Rewrite output parsing

* Use file output stream as standardOutput

* Print output if assetions failes

* Fix println call

* tmp

* Disable long string test for now

* Fix paths

* Fix some names and align tag variant

* Delete old workflows and add comment on secrets inherit

* REVERT_ME: temporarily comment out jvm artifact deployment for deployment testing

* Add docs deployment

* Fix workflow name

* Add macos editor to deployments

* Add description on editor flavours

* Delete obsolete actions

* Add more comments

* Change download action

* Readd action which is used

* Build tests project once and use that for the tests

* Rename workflows

* Fix upload url

* Add missing depends

* Revert "Build tests project once and use that for the tests"

This reverts commit 8fd3658.

* Fix export templates

* Revert "REVERT_ME: temporarily comment out jvm artifact deployment for deployment testing"

This reverts commit f33e0f7.

* Only remove debug symbols on release builds

* Add documentations on the debug and release builds of the editor

* Fix indents

* Make the info block a warning instead

* Align documentation with message in github release

* Fix creation of embedded jvm

* Release actual debug builds and use dev builds for tests

* Fix bootstrap download in tests

* Update gradle version

* Bump intellij plugin version to cope with new gradle version
* Move Godot kotlin specific files out of jni/
* Simplify and rework JVM loading
* Create JvmUserConfiguration
* Move all strings to new file
---------

Co-authored-by: Pierre-Thomas Meisels <[email protected]>
…ed arrays (#610)

* Add JVM Array <> Godot PackedArray batch conversion
* Improve arguments for json and commandline
* Create version management for Json arguments.
* Set debug from command line if any debug argument used.
* Improve export
* Initialize GDKotlin outside language.
* Add proper initialization step for the module and remove many explicit crashes
* Create JvmScriptManager
* Remove NO_USE_STDLIB preprocessor, it has been removed from the engine since Godot 4
@CedNaru CedNaru dismissed stale reviews from piiertho and chippmann via 4c014f6 May 8, 2024 08:51
@CedNaru CedNaru force-pushed the gd_kotlin_rework branch 3 times, most recently from 7d93379 to 7a8a805 Compare May 8, 2024 08:58
@CedNaru CedNaru force-pushed the gd_kotlin_rework branch from 7a8a805 to e2c6543 Compare May 9, 2024 13:10
@CedNaru CedNaru merged commit 3bef557 into master May 9, 2024
45 checks passed
@CedNaru CedNaru deleted the gd_kotlin_rework branch May 9, 2024 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants