From e032e42257d8e77c8f94fce060482a4c2f9175a4 Mon Sep 17 00:00:00 2001
From: Mathieu Poumeyrol <mathieu.poumeyrol@sonos.com>
Date: Wed, 16 Oct 2024 10:23:20 +0200
Subject: [PATCH] profiles location has changed

---
 dinghy-lib/src/apple/device.rs |  2 +-
 dinghy-lib/src/apple/xcode.rs  | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dinghy-lib/src/apple/device.rs b/dinghy-lib/src/apple/device.rs
index b422834..ab8870d 100644
--- a/dinghy-lib/src/apple/device.rs
+++ b/dinghy-lib/src/apple/device.rs
@@ -150,7 +150,7 @@ impl IosDevice {
             .output()?;
         let app_list = json::parse(std::str::from_utf8(&app_list.stdout)?).with_context(|| {
             format!(
-                "Ran `pymobiledevice3 app list --no-color --udid {}`, could not parse expected JSON output.", self.id,
+                "Ran `pymobiledevice3 apps list --no-color --udid {}`, could not parse expected JSON output.", self.id,
             )
         })?;
         let app_path = build_bundle.bundle_dir.to_string_lossy();
diff --git a/dinghy-lib/src/apple/xcode.rs b/dinghy-lib/src/apple/xcode.rs
index 96dd37a..4ba1ea1 100644
--- a/dinghy-lib/src/apple/xcode.rs
+++ b/dinghy-lib/src/apple/xcode.rs
@@ -118,11 +118,15 @@ pub fn look_for_signature_settings(device_id: &str) -> Result<Vec<SignatureSetti
     }
     debug!("Possible signing identities: {:?}", identities);
     let mut settings = vec![];
-    let profile_dir = dirs::home_dir()
-        .expect("can't get HOME dir")
-        .join("Library/MobileDevice/Provisioning Profiles");
-    trace!("Scanning profiles in {:?}", profile_dir);
-    for file in fs::read_dir(profile_dir)? {
+    let home = dirs::home_dir().expect("can't get HOME dir");
+    let profiles_dir = [
+        "Library/MobileDevice/Provisioning Profiles", 
+        "Library/Developer/Xcode/UserData/Provisioning Profiles", // xcode 16 and above
+    ];
+    for file in profiles_dir
+        .iter()
+        .flat_map(|path| fs::read_dir(home.join(path)).unwrap())
+    {
         let file = file?;
         if file.path().starts_with(".")
             || file