From e58bb102beabd18f45421d47b066113da33cb0f9 Mon Sep 17 00:00:00 2001
From: Mads Marquart <mads@marquart.dk>
Date: Thu, 14 Nov 2024 14:09:34 +0100
Subject: [PATCH] Fix Photos framework not being available on watchOS

---
 framework-crates/objc2-photos-ui/Cargo.toml              | 4 +++-
 framework-crates/objc2-photos-ui/translation-config.toml | 2 +-
 framework-crates/objc2-photos/Cargo.toml                 | 5 +----
 framework-crates/objc2-photos/translation-config.toml    | 1 -
 generated                                                | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/framework-crates/objc2-photos-ui/Cargo.toml b/framework-crates/objc2-photos-ui/Cargo.toml
index 021fc87bc..45fb1c20b 100644
--- a/framework-crates/objc2-photos-ui/Cargo.toml
+++ b/framework-crates/objc2-photos-ui/Cargo.toml
@@ -22,11 +22,13 @@ objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = fal
 objc2-core-location = { path = "../objc2-core-location", version = "0.2.2", default-features = false, optional = true }
 objc2-foundation = { path = "../objc2-foundation", version = "0.2.2", default-features = false }
 objc2-map-kit = { path = "../objc2-map-kit", version = "0.2.2", default-features = false, optional = true }
-objc2-photos = { path = "../objc2-photos", version = "0.2.2", default-features = false, optional = true }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc2-app-kit = { path = "../objc2-app-kit", version = "0.2.2", default-features = false, optional = true }
 
+[target.'cfg(not(target_os = "watchos"))'.dependencies]
+objc2-photos = { path = "../objc2-photos", version = "0.2.2", default-features = false, optional = true }
+
 [package.metadata.docs.rs]
 default-target = "aarch64-apple-darwin"
 features = ["all"]
diff --git a/framework-crates/objc2-photos-ui/translation-config.toml b/framework-crates/objc2-photos-ui/translation-config.toml
index 90205c024..9644a43c3 100644
--- a/framework-crates/objc2-photos-ui/translation-config.toml
+++ b/framework-crates/objc2-photos-ui/translation-config.toml
@@ -5,5 +5,5 @@ macos = "10.11"
 maccatalyst = "13.0"
 ios = "8.0"
 tvos = "10.0"
-watchos = "9.0" # ?
+watchos = "9.0"
 visionos = "1.0"
diff --git a/framework-crates/objc2-photos/Cargo.toml b/framework-crates/objc2-photos/Cargo.toml
index 109d40a53..14779eae8 100644
--- a/framework-crates/objc2-photos/Cargo.toml
+++ b/framework-crates/objc2-photos/Cargo.toml
@@ -19,6 +19,7 @@ workspace = true
 bitflags = { version = "2.5.0", default-features = false, optional = true }
 block2 = { path = "../../crates/block2", version = "0.5.1", default-features = false, optional = true }
 objc2 = { path = "../../crates/objc2", version = "0.5.2", default-features = false }
+objc2-core-image = { path = "../objc2-core-image", version = "0.2.2", default-features = false, optional = true }
 objc2-core-location = { path = "../objc2-core-location", version = "0.2.2", default-features = false, optional = true }
 objc2-foundation = { path = "../objc2-foundation", version = "0.2.2", default-features = false }
 objc2-uniform-type-identifiers = { path = "../objc2-uniform-type-identifiers", version = "0.2.2", default-features = false, optional = true }
@@ -26,9 +27,6 @@ objc2-uniform-type-identifiers = { path = "../objc2-uniform-type-identifiers", v
 [target.'cfg(target_os = "macos")'.dependencies]
 objc2-app-kit = { path = "../objc2-app-kit", version = "0.2.2", default-features = false, optional = true }
 
-[target.'cfg(not(target_os = "watchos"))'.dependencies]
-objc2-core-image = { path = "../objc2-core-image", version = "0.2.2", default-features = false, optional = true }
-
 [package.metadata.docs.rs]
 default-target = "aarch64-apple-darwin"
 features = ["all"]
@@ -37,7 +35,6 @@ targets = [
     "x86_64-apple-darwin",
     "aarch64-apple-ios",
     "aarch64-apple-tvos",
-    "aarch64-apple-watchos",
     "aarch64-apple-ios-macabi",
 ]
 
diff --git a/framework-crates/objc2-photos/translation-config.toml b/framework-crates/objc2-photos/translation-config.toml
index f8bc62d59..ab5b58886 100644
--- a/framework-crates/objc2-photos/translation-config.toml
+++ b/framework-crates/objc2-photos/translation-config.toml
@@ -6,7 +6,6 @@ macos = "10.11"
 maccatalyst = "13.0"
 ios = "8.0"
 tvos = "10.0"
-watchos = "9.0"
 visionos = "1.0"
 
 # Needs `CGImagePropertyOrientation` from `ImageIO`
diff --git a/generated b/generated
index 74b717998..ad1b23246 160000
--- a/generated
+++ b/generated
@@ -1 +1 @@
-Subproject commit 74b7179981a888a8cec36ac12c2fdaa1cf7c83ec
+Subproject commit ad1b232464c199b05f82ae80c25b0ac13e2c0f93