Merge pull request #1065 from godot-rust/feature/godot-4.4

Godot 4.4 support

Author: Bromeon

.github/workflows/full-ci.yml

@@ -256,11 +256,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.2
+          - name: macos-x86-4.3
             os: macos-13
-            artifact-name: macos-x86-4.2
+            artifact-name: macos-x86-4.3
             godot-binary: godot.macos.editor.dev.x86_64
-            godot-prebuilt-patch: '4.2.2'
+            godot-prebuilt-patch: '4.3'
 
           - name: macos-arm
             os: macos-latest
@@ -275,11 +275,11 @@ jobs:
 #            godot-binary: godot.macos.editor.dev.double.arm64
 #            rust-extra-args: --features godot/api-custom,godot/double-precision
 
-          - name: macos-arm-4.2
+          - name: macos-arm-4.3
             os: macos-latest
-            artifact-name: macos-arm-4.2
+            artifact-name: macos-arm-4.3
             godot-binary: godot.macos.editor.dev.arm64
-            godot-prebuilt-patch: '4.2.2'
+            godot-prebuilt-patch: '4.3'
 
           # Windows
 
@@ -295,11 +295,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.2
+          - name: windows-4.3
             os: windows-latest
-            artifact-name: windows-4.2
+            artifact-name: windows-4.3
             godot-binary: godot.windows.editor.dev.x86_64.exe
-            godot-prebuilt-patch: '4.2.2'
+            godot-prebuilt-patch: '4.3'
 
 #          - name: windows-4.1
 #            os: windows-latest
@@ -343,6 +343,12 @@ jobs:
 
           # Linux compat (4.1 disabled, already covered by memcheck)
 
+          - 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'
+
           - name: linux-4.3
             os: ubuntu-22.04
             artifact-name: linux-4.3
@@ -423,7 +429,7 @@ jobs:
       - name: "Install Godot"
         uses: ./.github/composite/godot-install
         with:
-          artifact-name: godot-linux-4.3
+          artifact-name: godot-linux-4.4
           godot-binary: godot.linuxbsd.editor.dev.x86_64
 
       - name: "Run examples for short time"

.github/workflows/minimal-ci.yml

@@ -171,23 +171,29 @@ jobs:
 
           # Linux compat
 
-          - name: linux-4.1
+          - name: linux-4.4
             os: ubuntu-22.04
-            artifact-name: linux-4.1
+            artifact-name: linux-4.4
             godot-binary: godot.linuxbsd.editor.dev.x86_64
-            godot-prebuilt-patch: '4.1.4'
+            godot-prebuilt-patch: '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'
 
           - 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'
 
-          - name: linux-4.3
+          - name: linux-4.1
             os: ubuntu-22.04
-            artifact-name: linux-4.3
+            artifact-name: linux-4.1
             godot-binary: godot.linuxbsd.editor.dev.x86_64
-            godot-prebuilt-patch: '4.3'
+            godot-prebuilt-patch: '4.1.4'
 
           # Memory checkers
 
@@ -239,7 +245,7 @@ jobs:
       - name: "Install Godot"
         uses: ./.github/composite/godot-install
         with:
-          artifact-name: godot-linux-4.3
+          artifact-name: godot-linux-4.4
           godot-binary: godot.linuxbsd.editor.dev.x86_64
 
       - name: "Run examples for short time"

godot-bindings/Cargo.toml

@@ -28,6 +28,7 @@ api-4-2 = []
 api-4-2-1 = []
 api-4-2-2 = []
 api-4-3 = []
+api-4-4 = []
 # ]]
 
 default = []
@@ -36,7 +37,7 @@ api-custom = ["dep:bindgen", "dep:regex", "dep:which"]
 api-custom-extheader = []
 
 [dependencies]
-gdextension-api = { version = "0.2.1", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "releases" }
+gdextension-api = { version = "0.2.2", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "releases" }
 
 # Do not use bindgen 0.69, it contains regression that forces recompilation of code.
 bindgen = { optional = true, version = "0.68", default-features = false, features = ["runtime"] }

godot-bindings/build.rs

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

godot-bindings/src/import.rs

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

godot-core/Cargo.toml

@@ -38,6 +38,7 @@ api-4-2 = ["godot-ffi/api-4-2"]
 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"]
 # ]]
 
 [dependencies]

godot-core/src/obj/traits.rs

@@ -630,10 +630,15 @@ pub mod cap {
 
     /// Auto-implemented for `#[godot_api] impl XyVirtual for MyClass` blocks
     pub trait ImplementsGodotVirtual: GodotClass {
+        // Cannot use #[cfg(since_api = "4.4")] on the `hash` parameter, because the doc-postprocessing generates #[doc(cfg)],
+        // which isn't valid in parameter position.
+
+        #[cfg(before_api = "4.4")]
+        #[doc(hidden)]
+        fn __virtual_call(name: &str) -> sys::GDExtensionClassCallVirtual;
+
+        #[cfg(since_api = "4.4")]
         #[doc(hidden)]
-        fn __virtual_call(
-            name: &str,
-            #[cfg(since_api = "4.4")] hash: u32,
-        ) -> sys::GDExtensionClassCallVirtual;
+        fn __virtual_call(name: &str, hash: u32) -> sys::GDExtensionClassCallVirtual;
     }
 }

godot-ffi/Cargo.toml

@@ -30,6 +30,7 @@ api-4-2 = ["godot-bindings/api-4-2"]
 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"]
 # ]]
 
 # TODO: get rid of paste and gensym, they are trivially implementable with proc-macros. Update cargo-deny.

godot/Cargo.toml

@@ -38,6 +38,7 @@ api-4-2 = ["godot-core/api-4-2"]
 api-4-2-1 = ["godot-core/api-4-2-1"]
 api-4-2-2 = ["godot-core/api-4-2-2"]
 api-4-3 = ["godot-core/api-4-3"]
+api-4-4 = ["godot-core/api-4-4"]
 # ]]
 
 default = ["__codegen-full"]

itest/repo-tweak/src/main.rs

@@ -21,7 +21,8 @@ pub const GODOT_LATEST_PATCH_VERSIONS: &[&str] = &[
     "4.1.4",
     "4.2.2",
     "4.3.0",
-    "4.4.0", // Upcoming.
+    "4.4.0",
+    "4.5.0", // Upcoming.
 ];
 
 // ----------------------------------------------------------------------------------------------------------------------------------------------