Merge pull request #1292 from godot-rust/qol/drop-godot-4.1

Remove support for Godot 4.1

Author: Bromeon

.github/composite/godot-itest/action.yml

@@ -117,10 +117,10 @@ runs:
           echo "Update compatibility_minimum in .gdextension files to '$apiVersion'..."
           dirs=("itest")
         
-          # Note that this is still hardcoded to 4.1, the start of GDExtension's compatibility promise. This makes it easier for users
-          # to use gdext with older Godot versions. There is anyway a runtime check in gdext that checks compatibility again.
+          # Note that this is still hardcoded to 4.2, the lowest supported API level by godot-rust. This makes it easier for users
+          # to use godot-rust with older Godot versions. There is anyway a runtime check in gdext that checks compatibility again.
           for dir in "${dirs[@]}"; do
-              find "$dir" -type f -name "*.gdextension" -exec sed -i'.bak' "s/compatibility_minimum = 4\.1/compatibility_minimum = $apiVersion/" {} +
+              find "$dir" -type f -name "*.gdextension" -exec sed -i'.bak' "s/compatibility_minimum = 4\.2/compatibility_minimum = $apiVersion/" {} +
           done
         
           echo "Example output: itest/godot/itest.gdextension"

.github/workflows/full-ci.yml

@@ -237,7 +237,7 @@ jobs:
         # - Double + lazy:    Godot nightly, custom, double, lazy func tables
         # - Features + exp:   Godot nightly, custom, threads, serde, experimental API
         # - Memcheck nightly: Godot mem nightly, custom, sanitizer
-        # - Memcheck 4.x:     Godot mem 4.0/4.1, sanitizer
+        # - Memcheck 4.x:     Godot mem 4.2, sanitizer
 
         # Note: Windows uses '--target x86_64-pc-windows-msvc' by default as Cargo argument.
         include:
@@ -300,12 +300,6 @@ jobs:
             godot-binary: godot.windows.editor.dev.x86_64.exe
             godot-prebuilt-patch: '4.3'
 
-#          - name: windows-4.1
-#            os: windows-latest
-#            artifact-name: windows-4.1
-#            godot-binary: godot.windows.editor.dev.x86_64.exe
-#            godot-prebuilt-patch: '4.1.3'
-
           # Linux
 
           # Don't use latest Ubuntu (22.04) as it breaks lots of ecosystem compatibility.
@@ -352,7 +346,7 @@ jobs:
             rust-extra-args: --release --features itest/codegen-full-experimental
             rust-cache-key: release
 
-          # Linux compat (4.1 disabled, already covered by memcheck)
+          # Linux compat:
           # No hot-reload before 4.4, as the Godot project is 4.4+.
 
           - name: linux-4.4
@@ -368,6 +362,7 @@ jobs:
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             godot-prebuilt-patch: '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
@@ -391,11 +386,11 @@ jobs:
             # Sanitizers can't build proc-macros and build scripts; with --target, cargo ignores RUSTFLAGS for those two.
             rust-target: x86_64-unknown-linux-gnu
 
-          - name: linux-memcheck-4.1
+          - name: linux-memcheck-4.2
             os: ubuntu-22.04
-            artifact-name: linux-memcheck-4.1
+            artifact-name: linux-memcheck-4.2
             godot-binary: godot.linuxbsd.editor.dev.x86_64.llvm.san
-            godot-prebuilt-patch: '4.1' # check compat of API 4.1.0 with newer binaries.
+            godot-prebuilt-patch: '4.2' # check compat of API 4.2 with newer binaries.
             rust-toolchain: nightly
             rust-env-rustflags: -Zrandomize-layout -Zsanitizer=address
             # Sanitizers can't build proc-macros and build scripts; with --target, cargo ignores RUSTFLAGS for those two.

.github/workflows/minimal-ci.yml

@@ -205,12 +205,6 @@ jobs:
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             godot-prebuilt-patch: '4.2.2'
 
-          - name: linux-4.1
-            os: ubuntu-22.04
-            artifact-name: linux-4.1
-            godot-binary: godot.linuxbsd.editor.dev.x86_64
-            godot-prebuilt-patch: '4.1.4'
-
           # Memory checkers
 
           - name: linux-memcheck

godot-bindings/Cargo.toml

@@ -19,11 +19,6 @@ experimental-wasm-nothreads = []
 
 # [version-sync] [[
 #  [line] api-$kebabVersion = []
-api-4-1 = []
-api-4-1-1 = []
-api-4-1-2 = []
-api-4-1-3 = []
-api-4-1-4 = []
 api-4-2 = []
 api-4-2-1 = []
 api-4-2-2 = []

godot-bindings/build.rs

@@ -17,11 +17,6 @@ fn main() {
 
     // [version-sync] [[
     //  [line] \tif cfg!(feature = "api-$kebabVersion") { count += 1; }
-    if cfg!(feature = "api-4-1") { count += 1; }
-    if cfg!(feature = "api-4-1-1") { count += 1; }
-    if cfg!(feature = "api-4-1-2") { count += 1; }
-    if cfg!(feature = "api-4-1-3") { count += 1; }
-    if cfg!(feature = "api-4-1-4") { count += 1; }
     if cfg!(feature = "api-4-2") { count += 1; }
     if cfg!(feature = "api-4-2-1") { count += 1; }
     if cfg!(feature = "api-4-2-2") { count += 1; }

godot-bindings/src/godot_exe.rs

@@ -130,7 +130,7 @@ pub(crate) fn read_godot_version(godot_bin: &Path) -> GodotVersion {
 /// True if Godot is a debug build (editor or debug export template), false otherwise (release export template).
 fn is_godot_debug_build(godot_bin: &Path) -> bool {
     // The `--version` command does not contain information about debug/release, but we can see if the `--help` output lists the command
-    // `--dump-extension-api`. This seems to be reliable down to Godot 4.1.
+    // `--dump-extension-api`. This seems to be reliable down to Godot 4.1 (past our support lower bound).
 
     let mut cmd = Command::new(godot_bin);
     cmd.arg("--help");

godot-bindings/src/import.rs

@@ -15,11 +15,6 @@ pub const ALL_VERSIONS: &[(u8, u8, u8)] = &[
     // [version-sync] [[
     //  [include] past+current+future
     //  [line] \t$triple,
-    (4, 1, 0),
-    (4, 1, 1),
-    (4, 1, 2),
-    (4, 1, 3),
-    (4, 1, 4),
     (4, 2, 0),
     (4, 2, 1),
     (4, 2, 2),
@@ -31,16 +26,6 @@ pub const ALL_VERSIONS: &[(u8, u8, u8)] = &[
 
 // [version-sync] [[
 //  [line] #[cfg(feature = "api-$kebabVersion")]\npub use gdextension_api::version_$snakeVersion as prebuilt;
-#[cfg(feature = "api-4-1")]
-pub use gdextension_api::version_4_1 as prebuilt;
-#[cfg(feature = "api-4-1-1")]
-pub use gdextension_api::version_4_1_1 as prebuilt;
-#[cfg(feature = "api-4-1-2")]
-pub use gdextension_api::version_4_1_2 as prebuilt;
-#[cfg(feature = "api-4-1-3")]
-pub use gdextension_api::version_4_1_3 as prebuilt;
-#[cfg(feature = "api-4-1-4")]
-pub use gdextension_api::version_4_1_4 as prebuilt;
 #[cfg(feature = "api-4-2")]
 pub use gdextension_api::version_4_2 as prebuilt;
 #[cfg(feature = "api-4-2-1")]
@@ -60,11 +45,6 @@ pub use gdextension_api::version_4_4 as prebuilt;
 //  [pre] #[cfg(not(any(
 //  [post] \tfeature = "api-custom",\n\tfeature = "api-custom-json",\n)))]
 #[cfg(not(any(
-    feature = "api-4-1",
-    feature = "api-4-1-1",
-    feature = "api-4-1-2",
-    feature = "api-4-1-3",
-    feature = "api-4-1-4",
     feature = "api-4-2",
     feature = "api-4-2-1",
     feature = "api-4-2-2",

godot-codegen/src/conv/type_conversions.rs

@@ -310,6 +310,7 @@ fn to_rust_expr_inner(expr: &str, ty: &RustTy, is_inner: bool) -> TokenStream {
             }
         }
         // empty string appears only for Callable/Rid in 4.0; default ctor syntax in 4.1+
+        // TODO(v0.4): check if we can remove ""
         "" | "RID()" | "Callable()" if !is_inner => {
             return match ty {
                 RustTy::BuiltinIdent { ty: ident, .. } if ident == "Rid" => quote! { Rid::Invalid },

godot-codegen/src/generator/notifications.rs

@@ -78,8 +78,6 @@ pub fn make_notification_enum(
         }
     }
 
-    workaround_constant_collision(&mut all_constants);
-
     let enum_name = ctx.notification_enum_name(class_name).name;
     let doc_str = format!(
         "Notification type for class [`{c}`][crate::classes::{c}].",
@@ -148,18 +146,3 @@ pub fn make_notification_enum(
 pub fn try_to_notification(constant: &JsonClassConstant) -> Option<Ident> {
     constant.name.strip_prefix("NOTIFICATION_").map(util::ident) // used to be conv::shout_to_pascal(s)
 }
-
-// ----------------------------------------------------------------------------------------------------------------------------------------------
-// Implementation
-
-/// Workaround for Godot bug https://github.com/godotengine/godot/issues/75839, fixed in 4.2.
-///
-/// Godot has a collision for two notification constants (DRAW, NODE_CACHE_REQUESTED) in the same inheritance branch (as of 4.0.2).
-/// This cannot be represented in a Rust enum, so we merge the two constants into a single enumerator.
-fn workaround_constant_collision(all_constants: &mut Vec<(Ident, i32)>) {
-    // This constant has never been used by the engine.
-    #[cfg(before_api = "4.2")]
-    all_constants.retain(|(constant_name, _)| constant_name != "NODE_RECACHE_REQUESTED");
-
-    let _ = &all_constants; // unused warning
-}

godot-codegen/src/generator/signals.rs

@@ -67,10 +67,8 @@ pub fn make_class_signals(
         has_own_signals.then(|| make_upcast_deref_impl(class_name, &nearest_collection_name));
 
     let code = quote! {
-        #[cfg(since_api = "4.2")]
         pub use signals::*;
 
-        #[cfg(since_api = "4.2")]
         mod signals {
             use crate::obj::{Gd, GodotClass};
             use super::re_export::#class_name;