From 539452394e868b8cecc5d52814846e7533c6ffb2 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:24:17 +0100
Subject: [PATCH] Add iOS 18 to the Introspect supported versions. (#3248)

---
 ElementX.xcodeproj/project.pbxproj                |  2 +-
 .../xcshareddata/swiftpm/Package.resolved         | 14 +++++++-------
 .../Extensions/PlatformViewVersionPredicate.swift | 15 ++++-----------
 project.yml                                       |  2 +-
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 52a671bbc..5b693868a 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -7799,7 +7799,7 @@
 			repositoryURL = "https://github.com/element-hq/compound-ios";
 			requirement = {
 				kind = revision;
-				revision = ab79d0cc5e5bb2ef3624b76c99471e414c12e8da;
+				revision = 22f9d801dd001e8aaed0f62546cdb42c7594cf92;
 			};
 		};
 		F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = {
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 8dc586412..829db3068 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,8 +6,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/element-hq/compound-design-tokens",
       "state" : {
-        "revision" : "b9723186abc3623c9648b1500c6e3d56e4571179",
-        "version" : "1.7.0"
+        "revision" : "2af7bb571eb30cbfbd67cdda6617500507ef46aa",
+        "version" : "1.8.0"
       }
     },
     {
@@ -15,7 +15,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/element-hq/compound-ios",
       "state" : {
-        "revision" : "ab79d0cc5e5bb2ef3624b76c99471e414c12e8da"
+        "revision" : "22f9d801dd001e8aaed0f62546cdb42c7594cf92"
       }
     },
     {
@@ -185,8 +185,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/BarredEwe/Prefire",
       "state" : {
-        "revision" : "237f4005c81f74d5359eddb534d2d10925ef2787",
-        "version" : "2.8.0"
+        "revision" : "0b7b6e6fe98af7e12b1440ca8fe81b3033ecf873",
+        "version" : "2.9.0"
       }
     },
     {
@@ -248,8 +248,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
       "state" : {
-        "revision" : "c097f955b4e724690f0fc8ffb7a6d4b881c9c4e3",
-        "version" : "1.17.2"
+        "revision" : "6d932a79e7173b275b96c600c86c603cf84f153c",
+        "version" : "1.17.4"
       }
     },
     {
diff --git a/ElementX/Sources/Other/Extensions/PlatformViewVersionPredicate.swift b/ElementX/Sources/Other/Extensions/PlatformViewVersionPredicate.swift
index 3bd04b2b1..879af5a8e 100644
--- a/ElementX/Sources/Other/Extensions/PlatformViewVersionPredicate.swift
+++ b/ElementX/Sources/Other/Extensions/PlatformViewVersionPredicate.swift
@@ -5,30 +5,23 @@
 // Please see LICENSE in the repository root for full details.
 //
 
-import UIKit
-
+import SwiftUI
 import SwiftUIIntrospect
 
-extension PlatformViewVersionPredicate<WindowType, UIWindow> {
-    static var supportedVersions: Self {
-        .iOS(.v16, .v17)
-    }
-}
-
 extension PlatformViewVersionPredicate<TextFieldType, UITextField> {
     static var supportedVersions: Self {
-        .iOS(.v16, .v17)
+        .iOS(.v16, .v17, .v18)
     }
 }
 
 extension PlatformViewVersionPredicate<ScrollViewType, UIScrollView> {
     static var supportedVersions: Self {
-        .iOS(.v16, .v17)
+        .iOS(.v16, .v17, .v18)
     }
 }
 
 extension PlatformViewVersionPredicate<ViewControllerType, UIViewController> {
     static var supportedVersions: Self {
-        .iOS(.v16, .v17)
+        .iOS(.v16, .v17, .v18)
     }
 }
diff --git a/project.yml b/project.yml
index 7b858fe84..ed927c43c 100644
--- a/project.yml
+++ b/project.yml
@@ -64,7 +64,7 @@ packages:
     # path: ../matrix-rust-sdk
   Compound:
     url: https://github.com/element-hq/compound-ios
-    revision: ab79d0cc5e5bb2ef3624b76c99471e414c12e8da
+    revision: 22f9d801dd001e8aaed0f62546cdb42c7594cf92
     # path: ../compound-ios
   AnalyticsEvents:
     url: https://github.com/matrix-org/matrix-analytics-events