features fix

cidre-macros/src/lib.rs

@@ -1072,7 +1072,7 @@ impl Versions {
         }
         if let Some(v) = self.visionos {
             vec.push(format!(
-                "all(target_os=\"visionos\", feature=\"vision_{}_{}\")",
+                "all(target_os=\"visionos\", feature=\"visionos_{}_{}\")",
                 v.0, v.1
             ));
         }
@@ -1121,7 +1121,7 @@ impl Versions {
         }
         if let Some(v) = self.visionos {
             vec.push(format!(
-                "all(target_os=\"visionos\", not(feature=\"vision_{}_{}\"))",
+                "all(target_os=\"visionos\", not(feature=\"visionos_{}_{}\"))",
                 v.0, v.1
             ));
         }
@@ -1157,7 +1157,7 @@ impl Versions {
             vec.push(format!("watchos_{}_{}", v.0, v.1));
         }
         if let Some(v) = self.visionos {
-            vec.push(format!("vision_{}_{}", v.0, v.1));
+            vec.push(format!("visionos_{}_{}", v.0, v.1));
         }
         if let Some(v) = self.maccatalyst {
             vec.push(format!("maccatalyst_{}_{}", v.0, v.1));
@@ -1188,7 +1188,7 @@ impl Versions {
             vec.push(format!("watchos_{}_{}", v.0, v.1));
         }
         if let Some(v) = self.visionos {
-            vec.push(format!("vision_{}_{}", v.0, v.1));
+            vec.push(format!("visionos_{}_{}", v.0, v.1));
         }
         if let Some(v) = self.maccatalyst {
             vec.push(format!("maccatalyst_{}_{}", v.0, v.1));

cidre/Cargo.toml

@@ -143,23 +143,28 @@ macos_10_13 = ["macos_10_12"]
 macos_10_14 = ["macos_10_13"]
 macos_10_15 = ["macos_10_14"]
 macos_11_0 = ["macos_10_15"]
-macos_12_0 = ["macos_11_0"]
+macos_11_3 = ["macos_11_0"]
+macos_12_0 = ["macos_11_3"]
 macos_12_3 = ["macos_12_0"]
 macos_12_7 = ["macos_12_3"]
 macos_13_0 = ["macos_12_7"]
 macos_13_1 = ["macos_13_0"]
 macos_14_0 = ["macos_13_1"]
 macos_14_2 = ["macos_14_0"]
-macos_15_0 = ["macos_14_2"]
+macos_14_4 = ["macos_14_2"]
+macos_15_0 = ["macos_14_4"]
 macos_15_2 = ["macos_15_0"]
 
 maccatalyst_13_0 = []
 maccatalyst_13_1 = ["maccatalyst_13_0"]
 maccatalyst_14_0 = ["maccatalyst_13_1"]
-maccatalyst_16_0 = ["maccatalyst_14_0"]
+maccatalyst_15_0 = ["maccatalyst_14_0"]
+maccatalyst_15_4 = ["maccatalyst_15_0"]
+maccatalyst_16_0 = ["maccatalyst_15_4"]
 maccatalyst_16_1 = ["maccatalyst_16_0"]
 maccatalyst_17_0 = ["maccatalyst_16_1"]
-maccatalyst_18_0 = ["maccatalyst_17_0"]
+maccatalyst_17_4 = ["maccatalyst_17_0"]
+maccatalyst_18_0 = ["maccatalyst_17_4"]
 maccatalyst_18_2 = ["maccatalyst_18_0"]
 
 ios_2_0 = []
@@ -176,16 +181,21 @@ ios_9_3 = ["ios_9_0"]
 ios_10_0 = ["ios_9_3"]
 ios_10_2 = ["ios_10_0"]
 ios_11_0 = ["ios_10_2"]
-ios_12_0 = ["ios_11_0"]
+ios_11_1 = ["ios_11_0"]
+ios_12_0 = ["ios_11_1"]
 ios_13_0 = ["ios_12_0"]
 ios_14_0 = ["ios_13_0"]
 ios_14_1 = ["ios_14_0"]
 ios_14_2 = ["ios_14_1"]
-ios_15_0 = ["ios_14_2"]
-ios_16_0 = ["ios_15_0"]
+ios_14_5 = ["ios_14_2"]
+ios_15_0 = ["ios_14_5"]
+ios_15_4 = ["ios_15_0"]
+ios_16_0 = ["ios_15_4"]
 ios_16_4 = ["ios_16_0"]
 ios_17_0 = ["ios_16_4"]
-ios_18_0 = ["ios_17_0"]
+ios_17_2 = ["ios_17_0"]
+ios_17_4 = ["ios_17_2"]
+ios_18_0 = ["ios_17_4"]
 ios_18_2 = ["ios_18_0"]
 
 tvos_7_0 = []
@@ -197,27 +207,34 @@ tvos_11_2 = ["tvos_11_0"]
 tvos_12_0 = ["tvos_11_2"]
 tvos_13_0 = ["tvos_12_0"]
 tvos_14_0 = ["tvos_13_0"]
-tvos_15_0 = ["tvos_14_0"]
+tvos_14_5 = ["tvos_14_0"]
+tvos_15_0 = ["tvos_14_5"]
 tvos_16_0 = ["tvos_15_0"]
 tvos_17_0 = ["tvos_16_0"]
-tvos_18_0 = ["tvos_17_0"]
+tvos_17_2 = ["tvos_17_0"]
+tvos_17_4 = ["tvos_17_2"]
+tvos_18_0 = ["tvos_17_4"]
 tvos_18_2 = ["tvos_18_0"]
 
-watchos_2_0 = []
+watchos_1_0 = []
+watchos_2_0 = ["watchos_1_0"]
 watchos_3_0 = ["watchos_2_0"]
 watchos_5_0 = ["watchos_3_0"]
 watchos_6_0 = ["watchos_5_0"]
 watchos_7_0 = ["watchos_6_0"]
 watchos_8_0 = ["watchos_7_0"]
+watchos_9_0 = ["watchos_8_0"]
 watchos_10_0 = ["watchos_8_0"]
-watchos_10_5 = ["watchos_10_0"]
+watchos_10_2 = ["watchos_10_0"]
+watchos_10_5 = ["watchos_10_2"]
 watchos_11_0 = ["watchos_10_5"]
 
 visionos_1_0 = []
 visionos_1_1 = ["visionos_1_0"]
 visionos_1_2 = ["visionos_1_1"]
 visionos_2_0 = ["visionos_1_2"]
-visionos_2_2 = ["visionos_2_0"]
+visionos_2_1 = ["visionos_2_0"]
+visionos_2_2 = ["visionos_2_1"]
 
 # end of deployment targets
 

cidre/src/av/kit/picture_in_picture_controller.rs

@@ -1,4 +1,4 @@
-use crate::{api, arc, av, define_cls, define_obj_type, ns, objc};
+use crate::{api, arc, av, define_obj_type, ns, objc};
 
 define_obj_type!(
     #[doc(alias = "AVPictureInPictureController")]
@@ -22,7 +22,7 @@ impl arc::A<PipController> {
 
 impl PipController {
     #[api::available(macos = 10.15, ios = 9.0, tvos = 15.0, visionos = 1.0)]
-    define_cls!(AV_PICTURE_IN_PICTURE_CONTROLLER);
+    crate::define_cls!(AV_PICTURE_IN_PICTURE_CONTROLLER);
 
     #[objc::msg_send(isPictureInPictureSupported)]
     pub fn is_pip_supported() -> bool;
@@ -107,7 +107,7 @@ impl arc::A<PipControllerContentSrc> {
 
 impl PipControllerContentSrc {
     #[api::available(macos = 10.15, ios = 9.0, tvos = 14.0, visionos = 1.0)]
-    define_cls!(AV_PICTURE_IN_PICTURE_CONTROLLER_CONTENT_SRC);
+    crate::define_cls!(AV_PICTURE_IN_PICTURE_CONTROLLER_CONTENT_SRC);
 
     #[api::available(macos = 10.15, ios = 9.0, tvos = 14.0, visionos = 1.0)]
     pub fn with_player_layer(player_layer: &av::PlayerLayer) -> arc::R<Self> {