From aca1713387ea7c7406e1ed18352ae97ed9f0e14e Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Sat, 16 Sep 2023 14:31:40 -0400 Subject: [PATCH] :boom: Update to Godot 4.1.x The SwiftGodot package inside also updates swift-syntax to the official Swift 5.9 syntax tag, utilizing the stable version of the API. Also, a new codesigning recipe has been added to facilitate codesigning the required dylibs for the game to run on macOS Sonoma. --- AnthroBase/Package.resolved | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 4 ++-- JensonGodotKit/Package.resolved | 4 ++-- Justfile | 4 ++++ Protractor/Package.resolved | 4 ++-- README.md | 11 ++++++++++- Shounin/bin/AnthroBase.gdextension | 1 + Shounin/bin/JensonGodotKit.gdextension | 1 + Shounin/bin/Protractor.gdextension | 1 + Shounin/project.godot | 2 +- SwiftGodot-Source | 2 +- SwiftGodot/Package.swift | 2 +- 12 files changed, 28 insertions(+), 12 deletions(-) diff --git a/AnthroBase/Package.resolved b/AnthroBase/Package.resolved index 1a9edc4..48c07b6 100644 --- a/AnthroBase/Package.resolved +++ b/AnthroBase/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-syntax.git", "state" : { - "revision" : "2e3c42cf38defd998c87ecfe8df138f925d22736", - "version" : "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-08-15-a" + "revision" : "74203046135342e4a4a627476dd6caf8b28fe11b", + "version" : "509.0.0" } } ], diff --git a/Indexing Your Heart.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Indexing Your Heart.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8bd0838..1f87022 100644 --- a/Indexing Your Heart.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Indexing Your Heart.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-syntax.git", "state" : { - "revision" : "2e3c42cf38defd998c87ecfe8df138f925d22736", - "version" : "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-08-15-a" + "revision" : "74203046135342e4a4a627476dd6caf8b28fe11b", + "version" : "509.0.0" } } ], diff --git a/JensonGodotKit/Package.resolved b/JensonGodotKit/Package.resolved index 8bd0838..1f87022 100644 --- a/JensonGodotKit/Package.resolved +++ b/JensonGodotKit/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-syntax.git", "state" : { - "revision" : "2e3c42cf38defd998c87ecfe8df138f925d22736", - "version" : "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-08-15-a" + "revision" : "74203046135342e4a4a627476dd6caf8b28fe11b", + "version" : "509.0.0" } } ], diff --git a/Justfile b/Justfile index c7fa813..f7506e2 100644 --- a/Justfile +++ b/Justfile @@ -81,6 +81,10 @@ clean-all-deps: clean-logs: rm -f *_build.log swiftlint_*.log +# Codesigns the dependency dylibs. +codesign-deps IDENTITY: + codesign -s "{{IDENTITY}}" Shounin/bin/mac/*.dylib + # Opens the dependent package in dep_editor for editing. edit-dep DEPENDENCY: {{dep_editor}} {{DEPENDENCY}} diff --git a/Protractor/Package.resolved b/Protractor/Package.resolved index 1a9edc4..48c07b6 100644 --- a/Protractor/Package.resolved +++ b/Protractor/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-syntax.git", "state" : { - "revision" : "2e3c42cf38defd998c87ecfe8df138f925d22736", - "version" : "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-08-15-a" + "revision" : "74203046135342e4a4a627476dd6caf8b28fe11b", + "version" : "509.0.0" } } ], diff --git a/README.md b/README.md index 39c4e64..eab46b7 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ understand the mysteries of the obelisk. - Xcode 15 or later - macOS 14 (Sonoma) or later - Just (`brew install just`) -- Godot 4.0.x +- Godot 4.1.x **Optional Tools** @@ -59,6 +59,14 @@ The correct build flags will be applied to ensure binaries for macOS and iOS are available. Likewise, you can call either `just build-dep` or run `.build-libs.sh` to build a given dependency. +> **Note** +> Before running the game, make sure that the dylib dependencies are signed by +> running `just codesign-deps` and provide your codesigning identity: +> +> ``` +> just codesign-deps "Developer ID Application: John Appleseed (...)" +> ``` + ### Exporting Requirements Generally, you can export the Godot project like any other typical Godot project, @@ -114,6 +122,7 @@ Available recipes: clean-all-deps # Cleans all dependencies clean-dep +DEPENDENCIES # Cleans a specified set of dependencies clean-logs # Cleans all logs built from a Just command. + codesign-deps IDENTITY # Codesigns the dependency dylibs. dry-run # Dry run the game locally edit-build-lib # Edits the script that builds libraries edit-dep DEPENDENCY # Opens the dependent package in dep_editor for editing. diff --git a/Shounin/bin/AnthroBase.gdextension b/Shounin/bin/AnthroBase.gdextension index 96ebdd4..753105c 100644 --- a/Shounin/bin/AnthroBase.gdextension +++ b/Shounin/bin/AnthroBase.gdextension @@ -1,5 +1,6 @@ [configuration] entry_symbol = "libanthrobase_entry_point" +compatibility_minimum = 4.1 [libraries] macos.debug = "res://bin/mac/libAnthroBase.dylib" diff --git a/Shounin/bin/JensonGodotKit.gdextension b/Shounin/bin/JensonGodotKit.gdextension index 3a39a3c..7940290 100644 --- a/Shounin/bin/JensonGodotKit.gdextension +++ b/Shounin/bin/JensonGodotKit.gdextension @@ -1,5 +1,6 @@ [configuration] entry_symbol = "libjensongodotkit_entry_point" +compatibility_minimum = 4.1 [libraries] macos.debug = "res://bin/mac/libJensonGodotKit.dylib" diff --git a/Shounin/bin/Protractor.gdextension b/Shounin/bin/Protractor.gdextension index 2e78f58..83c9920 100644 --- a/Shounin/bin/Protractor.gdextension +++ b/Shounin/bin/Protractor.gdextension @@ -1,5 +1,6 @@ [configuration] entry_symbol = "libprotractor_entry_point" +compatibility_minimum = 4.1 [libraries] macos.debug = "res://bin/mac/libProtractorGodotInterop.dylib" diff --git a/Shounin/project.godot b/Shounin/project.godot index 61cbd10..8bcd111 100644 --- a/Shounin/project.godot +++ b/Shounin/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="Indexing Your Heart" run/main_scene="res://demos/demo_menu.tscn" -config/features=PackedStringArray("4.0", "Mobile") +config/features=PackedStringArray("4.1", "Mobile") config/icon="res://icon.png" config/macos_native_icon="res://icon.icns" diff --git a/SwiftGodot-Source b/SwiftGodot-Source index cf27141..95ab045 160000 --- a/SwiftGodot-Source +++ b/SwiftGodot-Source @@ -1 +1 @@ -Subproject commit cf27141a53e645d434f19e19253393c895873ef1 +Subproject commit 95ab045a9ff9ab6f67657bdfe806b1a1ef2a9707 diff --git a/SwiftGodot/Package.swift b/SwiftGodot/Package.swift index 4482a1c..ed63338 100644 --- a/SwiftGodot/Package.swift +++ b/SwiftGodot/Package.swift @@ -22,7 +22,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/apple/swift-syntax.git", - from: "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-08-15-a"), + from: "509.0.0"), ], targets: [ .binaryTarget(name: "SwiftGodot", path: "./SwiftGodot.xcframework"),