Bump minimum deployment target in icrate

Author: madsmtm

.github/workflows/ci.yml

@@ -365,7 +365,7 @@ jobs:
         - name: Test macOS old SDK
           # Oldest macOS version we support
           sdk: "10.12"
-          frameworks: macos-10-7
+          frameworks: macos-10-12
         - name: Test macOS nightly
           nightly: true
           frameworks: macos-11
@@ -475,7 +475,7 @@ jobs:
     # TODO: Re-enable this on all of Foundation once we do some form of
     # availability checking.
     - name: Test static class and selectors
-      if: ${{ !contains(matrix.frameworks, 'ios') && !contains(matrix.frameworks, 'macos-10-7') }}
+      if: ${{ !contains(matrix.frameworks, 'ios') && !contains(matrix.frameworks, 'macos-10-12') }}
       run: >-
         cargo test $ARGS $PUBLIC_CRATES -ptests
         --features=unstable-static-sel,unstable-static-class,unstable-static-nsstring

crates/header-translator/src/main.rs

@@ -86,20 +86,20 @@ fn main() -> Result<(), BoxError> {
         // These are found using the `get_llvm_targets.fish` helper script
         let llvm_targets: &[_] = match &sdk.platform {
             Platform::MacOsX => &[
-                "x86_64-apple-macosx10.7.0",
+                "x86_64-apple-macosx10.12.0",
                 // "arm64-apple-macosx11.0.0",
-                // "i686-apple-macosx10.7.0",
+                // "i686-apple-macosx10.12.0",
             ],
             Platform::IPhoneOs => &[
-                // "arm64-apple-ios7.0.0",
-                // "armv7s-apple-ios",
+                // "arm64-apple-ios10.0.0",
+                // "armv7s-apple-ios10.0.0",
                 // "arm64-apple-ios14.0-macabi",
                 // "x86_64-apple-ios13.0-macabi",
             ],
             // Platform::IPhoneSimulator => &[
-            //     "arm64-apple-ios7.0.0-simulator",
-            //     "x86_64-apple-ios7.0.0-simulator",
-            //     "i386-apple-ios7.0.0-simulator",
+            //     "arm64-apple-ios10.0.0-simulator",
+            //     "x86_64-apple-ios10.0.0-simulator",
+            //     "i386-apple-ios10.0.0-simulator",
             // ],
             // Platform::AppleTvOs => &["arm64-apple-tvos", "x86_64-apple-tvos"],
             // Platform::WatchOs => &["arm64_32-apple-watchos", "armv7k-apple-watchos"],

crates/header-translator/src/output.rs

@@ -49,11 +49,12 @@ impl Output {
     pub fn cargo_features(&self, config: &Config) -> BTreeMap<String, Vec<String>> {
         let mut features = BTreeMap::new();
 
-        let mut macos_10_7_features: BTreeSet<String> = vec!["unstable-example-basic_usage".into()]
-            .into_iter()
-            .collect();
+        let mut macos_10_12_features: BTreeSet<String> =
+            vec!["unstable-example-basic_usage".into()]
+                .into_iter()
+                .collect();
         let mut macos_10_13_features: BTreeSet<String> = vec![
-            "unstable-frameworks-macos-10-7".into(),
+            "unstable-frameworks-macos-10-12".into(),
             "unstable-example-delegate".into(),
             "unstable-example-metal".into(),
             "unstable-example-nspasteboard".into(),
@@ -88,8 +89,8 @@ impl Output {
             let _ = features.insert(library_name.to_string(), library_features.collect());
 
             if let Some(version) = &library.macos {
-                if version.matches(&semver::Version::from_str("10.7.0").unwrap()) {
-                    macos_10_7_features.insert(format!("{library_name}_all"));
+                if version.matches(&semver::Version::from_str("10.12.0").unwrap()) {
+                    macos_10_12_features.insert(format!("{library_name}_all"));
                 } else if version.matches(&semver::Version::from_str("10.13.0").unwrap()) {
                     macos_10_13_features.insert(format!("{library_name}_all"));
                 } else if version.matches(&semver::Version::from_str("11.0.0").unwrap()) {
@@ -107,8 +108,8 @@ impl Output {
         }
 
         let _ = features.insert(
-            "unstable-frameworks-macos-10-7".into(),
-            macos_10_7_features.into_iter().collect(),
+            "unstable-frameworks-macos-10-12".into(),
+            macos_10_12_features.into_iter().collect(),
         );
         let _ = features.insert(
             "unstable-frameworks-macos-10-13".into(),

crates/header-translator/translation-config.toml

@@ -1321,16 +1321,6 @@ skipped = true
 [enum.NSTextAlignment]
 skipped = true
 
-# Different definitions depending on deployment target
-[class.NSLayoutAnchor]
-definition-skipped = true
-[class.NSPopover]
-definition-skipped = true
-[class.NSPopover.methods]
-appearance = { skipped = true }
-setAppearance = { skipped = true }
-effectiveAppearance = { skipped = true }
-
 # I'm unsure of the ABI of the array this takes
 [fn.NSDrawBitmap]
 skipped = true

crates/icrate/CHANGELOG.md

@@ -74,6 +74,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * **BREAKING**: Removed a workaround that made the `NSCopying` and
   `NSMutableCopying` protocols not act as regular protocols (many methods used
   `AnyObject` instead of the correct `ProtocolObject<dyn NSCopying>`).
+* Update the minimum deployment target, which adds a few missing protocol
+  implementations and methods for `NSPopover` and `NSLayoutAnchor`.
 
 
 ## icrate 0.0.4 - 2023-07-31

crates/icrate/Cargo.toml

@@ -5329,39 +5329,39 @@ unstable-frameworks-gnustep = [
     "AppKit_all",
     "Foundation_all",
 ]
-unstable-frameworks-macos-10-13 = [
+unstable-frameworks-macos-10-12 = [
+    "AppKit_all",
+    "Automator_all",
     "CloudKit_all",
     "Contacts_all",
+    "CoreAnimation_all",
+    "CoreData_all",
     "CoreLocation_all",
+    "CoreWLAN_all",
     "EventKit_all",
-    "ExternalAccessory_all",
+    "ExceptionHandling_all",
+    "Foundation_all",
     "GameController_all",
     "GameKit_all",
+    "InputMethodKit_all",
     "LocalAuthentication_all",
     "MapKit_all",
-    "MediaPlayer_all",
     "MetalKit_all",
     "Metal_all",
+    "OSAKit_all",
     "PhotoKit_all",
+    "StoreKit_all",
+    "WebKit_all",
+    "unstable-example-basic_usage",
+]
+unstable-frameworks-macos-10-13 = [
+    "ExternalAccessory_all",
+    "MediaPlayer_all",
     "unstable-example-delegate",
     "unstable-example-metal",
     "unstable-example-nspasteboard",
     "unstable-example-speech_synthesis",
-    "unstable-frameworks-macos-10-7",
-]
-unstable-frameworks-macos-10-7 = [
-    "AppKit_all",
-    "Automator_all",
-    "CoreAnimation_all",
-    "CoreData_all",
-    "CoreWLAN_all",
-    "ExceptionHandling_all",
-    "Foundation_all",
-    "InputMethodKit_all",
-    "OSAKit_all",
-    "StoreKit_all",
-    "WebKit_all",
-    "unstable-example-basic_usage",
+    "unstable-frameworks-macos-10-12",
 ]
 unstable-frameworks-macos-11 = [
     "Accessibility_all",

crates/icrate/src/fixes/AppKit/mod.rs

@@ -27,42 +27,5 @@ ns_enum!(
     }
 );
 
-extern_class!(
-    #[cfg(feature = "AppKit_NSPopover")]
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub struct NSPopover;
-
-    #[cfg(feature = "AppKit_NSPopover")]
-    unsafe impl ClassType for NSPopover {
-        #[inherits(NSObject)]
-        type Super = crate::AppKit::NSResponder;
-        type Mutability = MainThreadOnly;
-    }
-);
-
-__inner_extern_class!(
-    #[cfg(feature = "AppKit_NSLayoutAnchor")]
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub struct NSLayoutAnchor<AnchorType: ?Sized = AnyObject> {
-        __superclass: NSObject,
-        _inner0: PhantomData<*mut AnchorType>,
-        notunwindsafe: PhantomData<&'static mut ()>,
-    }
-
-    #[cfg(feature = "AppKit_NSLayoutAnchor")]
-    unsafe impl<AnchorType: ?Sized + Message> ClassType for NSLayoutAnchor<AnchorType> {
-        type Super = NSObject;
-        type Mutability = InteriorMutable;
-
-        fn as_super(&self) -> &Self::Super {
-            &self.__superclass
-        }
-
-        fn as_super_mut(&mut self) -> &mut Self::Super {
-            &mut self.__superclass
-        }
-    }
-);
-
 #[cfg(feature = "AppKit_NSImage")]
 unsafe impl crate::Foundation::NSCoding for crate::AppKit::NSImage {}

crates/icrate/src/generated

@@ -154,7 +154,6 @@ fn send_sync_unwindsafe() {
     assert_auto_traits::<NSString>();
     assert_unwindsafe::<MainThreadMarker>(); // Intentional
     assert_auto_traits::<NSThread>();
-    #[cfg(not(macos_10_7))]
     assert_auto_traits::<NSUUID>();
     // assert_auto_traits::<NSValue>(); // Intentional
     assert_unwindsafe::<NSZone>(); // Intentional