Skip to content

Commit 67e7a71

Browse files
authored
Upgrade to Godot 4.4 (#217)
1 parent fcf17d1 commit 67e7a71

File tree

388 files changed

+1000
-600
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

388 files changed

+1000
-600
lines changed

.github/workflows/pandora-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
fail-fast: false
4040
max-parallel: 10
4141
matrix:
42-
godot-version: ["4.3"]
42+
godot-version: ["4.3", "4.4"]
4343

4444
name: "🤖 CI on Godot ${{ matrix.godot-version }}"
4545
steps:

TestScene.gd.uid

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://e1djuwk7lsrl

TestScene.tscn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[gd_scene load_steps=6 format=3 uid="uid://wqbu0ir2a0qy"]
22

3-
[ext_resource type="Script" path="res://TestScene.gd" id="1_88w03"]
3+
[ext_resource type="Script" uid="uid://e1djuwk7lsrl" path="res://TestScene.gd" id="1_88w03"]
44
[ext_resource type="Texture2D" uid="uid://bd13bip4a1yuy" path="res://splash.png" id="1_r3xd3"]
5-
[ext_resource type="Script" path="res://examples/inventory/item.gd" id="2_racr8"]
5+
[ext_resource type="Script" uid="uid://dmjnjmwtbjliu" path="res://examples/inventory/item.gd" id="2_racr8"]
66

77
[sub_resource type="Resource" id="Resource_dfvqv"]
88
script = ExtResource("2_racr8")
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://cp1kg86odyuq7

addons/gdUnit4/bin/GdUnitCmdTool.gd

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -312,12 +312,12 @@ class CLIRunner:
312312
commands.append_array(result.value() as Array)
313313
result = (
314314
CmdCommandHandler.new(_cmd_options)
315-
.register_cb("-help", Callable(self, "show_help"))
316-
.register_cb("--help-advanced", Callable(self, "show_advanced_help"))
317-
.register_cb("-a", Callable(_runner_config, "add_test_suite"))
318-
.register_cbv("-a", Callable(_runner_config, "add_test_suites"))
319-
.register_cb("-i", Callable(_runner_config, "skip_test_suite"))
320-
.register_cbv("-i", Callable(_runner_config, "skip_test_suites"))
315+
.register_cb("-help", show_help)
316+
.register_cb("--help-advanced", show_advanced_help)
317+
.register_cb("-a", _runner_config.add_test_suite)
318+
.register_cbv("-a", _runner_config.add_test_suites)
319+
.register_cb("-i", _runner_config.skip_test_suite)
320+
.register_cbv("-i", _runner_config.skip_test_suites)
321321
.register_cb("-rd", set_report_dir)
322322
.register_cb("-rc", set_report_count)
323323
.register_cb("--selftest", run_self_test)
@@ -376,9 +376,9 @@ class CLIRunner:
376376
var ts_scanner := GdUnitTestSuiteScanner.new()
377377
for as_resource_path in to_execute.keys() as Array[String]:
378378
var selected_tests: PackedStringArray = to_execute.get(as_resource_path)
379-
var scaned_suites := ts_scanner.scan(as_resource_path)
380-
skip_test_case(scaned_suites, selected_tests)
381-
test_suites_to_process.append_array(scaned_suites)
379+
var scanned_suites := ts_scanner.scan(as_resource_path)
380+
skip_test_case(scanned_suites, selected_tests)
381+
test_suites_to_process.append_array(scanned_suites)
382382
skip_suites(test_suites_to_process, config)
383383
return test_suites_to_process
384384

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://b0y8wubpcyw0n
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://d3ndsphe82h30

addons/gdUnit4/plugin.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
name="gdUnit4"
44
description="Unit Testing Framework for Godot Scripts"
55
author="Mike Schulze"
6-
version="4.4.3"
6+
version="4.5.0"
77
script="plugin.gd"

addons/gdUnit4/plugin.gd

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
@tool
22
extends EditorPlugin
33

4-
const GdUnitTools := preload ("res://addons/gdUnit4/src/core/GdUnitTools.gd")
5-
const GdUnitTestDiscoverGuard := preload ("res://addons/gdUnit4/src/core/discovery/GdUnitTestDiscoverGuard.gd")
4+
const GdUnitTools := preload("res://addons/gdUnit4/src/core/GdUnitTools.gd")
5+
const GdUnitTestDiscoverGuard := preload("res://addons/gdUnit4/src/core/discovery/GdUnitTestDiscoverGuard.gd")
6+
const GdUnitConsole := preload("res://addons/gdUnit4/src/ui/GdUnitConsole.gd")
67

78

89
var _gd_inspector: Control
9-
var _gd_console: Control
10+
var _gd_console: GdUnitConsole
1011
var _guard: GdUnitTestDiscoverGuard
1112

1213

@@ -19,23 +20,20 @@ func _enter_tree() -> void:
1920
prints("GdUnit4 plugin requires a minimum of Godot 4.2.x Version!")
2021
return
2122
GdUnitSettings.setup()
22-
# install the GdUnit inspector
23-
_gd_inspector = load("res://addons/gdUnit4/src/ui/GdUnitInspector.tscn").instantiate()
23+
# Install the GdUnit Inspector
24+
_gd_inspector = (load("res://addons/gdUnit4/src/ui/GdUnitInspector.tscn") as PackedScene).instantiate()
2425
add_control_to_dock(EditorPlugin.DOCK_SLOT_LEFT_UR, _gd_inspector)
25-
# install the GdUnit Console
26-
_gd_console = load("res://addons/gdUnit4/src/ui/GdUnitConsole.tscn").instantiate()
27-
@warning_ignore("return_value_discarded")
28-
add_control_to_bottom_panel(_gd_console, "gdUnitConsole")
29-
prints("Loading GdUnit4 Plugin success")
30-
if GdUnitSettings.is_update_notification_enabled():
31-
var update_tool: Node = load("res://addons/gdUnit4/src/update/GdUnitUpdateNotify.tscn").instantiate()
32-
Engine.get_main_loop().root.add_child.call_deferred(update_tool)
26+
# Install the GdUnit Console
27+
_gd_console = (load("res://addons/gdUnit4/src/ui/GdUnitConsole.tscn") as PackedScene).instantiate()
28+
var control := add_control_to_bottom_panel(_gd_console, "gdUnitConsole")
29+
await _gd_console.setup_update_notification(control)
3330
if GdUnit4CSharpApiLoader.is_mono_supported():
3431
prints("GdUnit4Net version '%s' loaded." % GdUnit4CSharpApiLoader.version())
35-
# connect to be notified for script changes to be able to discover new tests
32+
# Connect to be notified for script changes to be able to discover new tests
3633
_guard = GdUnitTestDiscoverGuard.new()
3734
@warning_ignore("return_value_discarded")
3835
resource_saved.connect(_on_resource_saved)
36+
prints("Loading GdUnit4 Plugin success")
3937

4038

4139
func _exit_tree() -> void:

addons/gdUnit4/plugin.gd.uid

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://iidypsgmll2t

0 commit comments

Comments
 (0)