Merge pull request #1339 from godot-rust/feature/godot-4.5

Godot 4.5 API level

Author: Bromeon

.github/workflows/full-ci.yml

@@ -255,11 +255,11 @@ jobs:
             godot-binary: godot.macos.editor.dev.double.x86_64
             rust-extra-args: --features godot/api-custom,godot/double-precision
 
-          - name: macos-x86-4.3
+          - name: macos-x86-4.4
             os: macos-13
-            artifact-name: macos-x86-4.3
+            artifact-name: macos-x86-4.4
             godot-binary: godot.macos.editor.dev.x86_64
-            godot-prebuilt-patch: '4.3'
+            godot-prebuilt-patch: '4.4'
 
           - name: macos-arm
             os: macos-latest
@@ -274,11 +274,11 @@ jobs:
 #            godot-binary: godot.macos.editor.dev.double.arm64
 #            rust-extra-args: --features godot/api-custom,godot/double-precision
 
-          - name: macos-arm-4.3
+          - name: macos-arm-4.4
             os: macos-latest
-            artifact-name: macos-arm-4.3
+            artifact-name: macos-arm-4.4
             godot-binary: godot.macos.editor.dev.arm64
-            godot-prebuilt-patch: '4.3'
+            godot-prebuilt-patch: '4.4'
 
           # Windows
 
@@ -294,11 +294,11 @@ jobs:
             godot-binary: godot.windows.editor.dev.double.x86_64.exe
             rust-extra-args: --features godot/api-custom,godot/double-precision
 
-          - name: windows-4.3
+          - name: windows-4.4
             os: windows-latest
-            artifact-name: windows-4.3
+            artifact-name: windows-4.4
             godot-binary: godot.windows.editor.dev.x86_64.exe
-            godot-prebuilt-patch: '4.3'
+            godot-prebuilt-patch: '4.4'
 
           # Linux
 
@@ -349,25 +349,34 @@ jobs:
           # Linux compat:
           # No hot-reload before 4.4, as the Godot project is 4.4+.
 
+          - name: linux-4.5
+            os: ubuntu-22.04
+            artifact-name: linux-4.5
+            godot-binary: godot.linuxbsd.editor.dev.x86_64
+            #godot-prebuilt-patch: '4.5'
+            hot-reload: stable
+
           - name: linux-4.4
             os: ubuntu-22.04
             artifact-name: linux-4.4
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             godot-prebuilt-patch: '4.4'
-            hot-reload: stable
+            hot-reload: api-4-4
 
           - name: linux-4.3
             os: ubuntu-22.04
             artifact-name: linux-4.3
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             godot-prebuilt-patch: '4.3'
+            hot-reload: api-4-3
 
           # Can be disabled in the future (already covered by memcheck). For now kept on to differentiate quicker.
           - name: linux-4.2
             os: ubuntu-22.04
             artifact-name: linux-4.2
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             godot-prebuilt-patch: '4.2.2'
+            hot-reload: api-4-2
 
           # Memory checks: special Godot binaries compiled with AddressSanitizer/LeakSanitizer to detect UB/leaks.
           # See also https://rustc-dev-guide.rust-lang.org/sanitizers.html.

.github/workflows/minimal-ci.yml

@@ -187,6 +187,11 @@ jobs:
 
           # Linux compat
 
+          - name: linux-4.5
+            os: ubuntu-22.04
+            artifact-name: linux-4.5
+            godot-binary: godot.linuxbsd.editor.dev.x86_64
+
           - name: linux-4.4
             os: ubuntu-22.04
             artifact-name: linux-4.4

Cargo.toml

@@ -19,7 +19,7 @@ members = [
 # regular dependencies. Sort alphabetically within each section; comments about a dependency come on the section header.
 [workspace.dependencies]
 # Related to godot-rust.
-gdextension-api = { version = "0.2.2", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "releases" }
+gdextension-api = { version = "0.3.0", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "release-v0.3" }
 
 # Main library features.
 glam = { version = "0.30", features = ["debug-glam-assert"] }

godot-bindings/Cargo.toml

@@ -24,6 +24,7 @@ api-4-2-1 = []
 api-4-2-2 = []
 api-4-3 = []
 api-4-4 = []
+api-4-5 = []
 # ]]
 
 default = []

godot-bindings/build.rs

@@ -22,6 +22,7 @@ fn main() {
     if cfg!(feature = "api-4-2-2") { count += 1; }
     if cfg!(feature = "api-4-3") { count += 1; }
     if cfg!(feature = "api-4-4") { count += 1; }
+    if cfg!(feature = "api-4-5") { count += 1; }
     // ]]
 
     assert!(count <= 1, "ERROR: at most one `api-*` feature can be enabled");

godot-bindings/src/godot_json.rs

@@ -29,7 +29,7 @@ use crate::{GodotVersion, StopWatch};
 // [version-sync] [[
 //  [include] current.minor
 //  [line] use gdextension_api::version_$snakeVersion::load_gdextension_header_h as load_latest_gdextension_headers;
-use gdextension_api::version_4_4::load_gdextension_header_h as load_latest_gdextension_headers;
+use gdextension_api::version_4_5::load_gdextension_header_h as load_latest_gdextension_headers;
 // ]]
 
 /// A minimal version of deserialized JsonExtensionApi that includes only the header.

godot-bindings/src/import.rs

@@ -21,6 +21,7 @@ pub const ALL_VERSIONS: &[(u8, u8, u8)] = &[
     (4, 3, 0),
     (4, 4, 0),
     (4, 5, 0),
+    (4, 6, 0),
     // ]]
 ];
 
@@ -36,6 +37,8 @@ pub use gdextension_api::version_4_2_2 as prebuilt;
 pub use gdextension_api::version_4_3 as prebuilt;
 #[cfg(feature = "api-4-4")]
 pub use gdextension_api::version_4_4 as prebuilt;
+#[cfg(feature = "api-4-5")]
+pub use gdextension_api::version_4_5 as prebuilt;
 // ]]
 
 // If none of the api-* features are provided, use default prebuilt version (typically latest Godot stable release).
@@ -50,12 +53,13 @@ pub use gdextension_api::version_4_4 as prebuilt;
     feature = "api-4-2-2",
     feature = "api-4-3",
     feature = "api-4-4",
+    feature = "api-4-5",
     feature = "api-custom",
     feature = "api-custom-json",
 )))]
 // ]]
 // [version-sync] [[
 //  [include] current.minor
 //  [line] pub use gdextension_api::version_$snakeVersion as prebuilt;
-pub use gdextension_api::version_4_4 as prebuilt;
+pub use gdextension_api::version_4_5 as prebuilt;
 // ]]

godot-core/Cargo.toml

@@ -35,6 +35,7 @@ api-4-2-1 = ["godot-ffi/api-4-2-1"]
 api-4-2-2 = ["godot-ffi/api-4-2-2"]
 api-4-3 = ["godot-ffi/api-4-3"]
 api-4-4 = ["godot-ffi/api-4-4"]
+api-4-5 = ["godot-ffi/api-4-5"]
 # ]]
 
 [dependencies]

godot-core/src/builtin/string/string_name.rs

@@ -156,10 +156,9 @@ impl StringName {
         /// [`Node::set_name()`][crate::classes::Node::set_name] takes `GString`, let's pass a `StringName`:
         /// ```no_run
         /// # use godot::prelude::*;
-        /// let name = StringName::from("my cool node");
-        ///
-        /// let mut node = Node::new_alloc();
-        /// node.set_name(name.arg());
+        /// let needle = StringName::from("str");
+        /// let haystack = GString::from("a long string");
+        /// let found = haystack.find(needle.arg());
         /// ```
     }
 

godot-ffi/Cargo.toml

@@ -27,6 +27,7 @@ api-4-2-1 = ["godot-bindings/api-4-2-1"]
 api-4-2-2 = ["godot-bindings/api-4-2-2"]
 api-4-3 = ["godot-bindings/api-4-3"]
 api-4-4 = ["godot-bindings/api-4-4"]
+api-4-5 = ["godot-bindings/api-4-5"]
 # ]]
 
 [dependencies]