💥 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.
Indexing-Your-Heart · Sep 16, 2023 · aca1713 · aca1713
1 parent 8f4080b
commit aca1713
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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"),