diff --git a/.github/actions/prepare-testing/action.yml b/.github/actions/prepare-testing/action.yml index b227bb44..396ff277 100644 --- a/.github/actions/prepare-testing/action.yml +++ b/.github/actions/prepare-testing/action.yml @@ -100,8 +100,6 @@ runs: scons project/addons/gdUnit4 echo "Applying gdUnit4 patch" cd modules/gdUnit4 - # NOTE: Patching gdUnit4 as it errors out in Godot 4.5. - git apply ../gdunit4.patch - name: Prepare project shell: bash diff --git a/CHANGELOG.md b/CHANGELOG.md index a1e9f982..33bdbec4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,9 @@ - Bump Native SDK from v0.10.1 to v0.11.2 ([#374](https://github.com/getsentry/sentry-godot/pull/374), [#385](https://github.com/getsentry/sentry-godot/pull/385), [#405](https://github.com/getsentry/sentry-godot/pull/405)) - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0112) - [diff](https://github.com/getsentry/sentry-native/compare/0.10.1...0.11.2) +- Bump gdUnit 4 from v5.1.0 to v6.0.0 ([#377](https://github.com/getsentry/sentry-godot/pull/377)) + - [changelog](https://github.com/MikeSchulze/gdUnit4/blob/master/CHANGELOG.md#v600) + - [diff](https://github.com/MikeSchulze/gdUnit4/compare/v5.1.0...v6.0.0) ## 1.0.0-beta.3 diff --git a/modules/gdUnit4 b/modules/gdUnit4 index 9cc47ddf..da9ab001 160000 --- a/modules/gdUnit4 +++ b/modules/gdUnit4 @@ -1 +1 @@ -Subproject commit 9cc47ddfe1d5d0f774ae5b15d183392cb54a24a2 +Subproject commit da9ab00119492b5673d13cbd959c909bde00d4b7 diff --git a/modules/gdunit4.patch b/modules/gdunit4.patch deleted file mode 100644 index 1f3b88b3..00000000 --- a/modules/gdunit4.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/addons/gdUnit4/src/doubler/CallableDoubler.gd b/addons/gdUnit4/src/doubler/CallableDoubler.gd -index 14a5947..88e598e 100644 ---- a/addons/gdUnit4/src/doubler/CallableDoubler.gd -+++ b/addons/gdUnit4/src/doubler/CallableDoubler.gd -@@ -81,16 +81,7 @@ func bindv(caller_args: Array) -> Callable: - - - @warning_ignore("untyped_declaration", "native_method_override", "unused_parameter") --func call(arg0=null, -- arg1=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg2=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg3=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg4=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg5=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg6=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg7=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg8=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg9=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE) -> Variant: -+func call(arg0=null, ...args) -> Variant: - - # This is a placeholder function signanture without any functionallity! - # It is used by the function doubler to double function signature of Callable:call()