Merge branch 'main' into ci/2026-tests

davdroman · davdroman · commit 9c4facc5d994 · 2025-09-10T18:55:16.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,6 +27,13 @@ jobs:
       - name: Select Xcode version
         run: sudo xcodes select 16.4
 
+      - name: Install Runtimes
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 15
+          max_attempts: 3
+          command: xcodebuild -downloadAllPlatforms
+
       - name: Lint Podspec
         run: |
           set -eo pipefail
@@ -43,82 +50,79 @@ jobs:
           - platform: [iOS, 15]
             runtime: iOS 15.5
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
             install: true
           - platform: [iOS, 16]
             runtime: iOS 16.4
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
             install: true
           - platform: [iOS, 17]
             runtime: iOS 17.5
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
             install: true
           - platform: [iOS, 18]
-            runtime: iOS 18.5
+            runtime: iOS 18.6
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
           - platform: [iOS, 26]
-            runtime: iOS 26.0-beta1
+            runtime: iOS 26.0
             os: macos-15
             xcode: 26.0
-            install: true
 
           - platform: [tvOS, 15]
             runtime: tvOS 15.4
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
             install: true
           - platform: [tvOS, 16]
             runtime: tvOS 16.4
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
             install: true
           - platform: [tvOS, 17]
             runtime: tvOS 17.5
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
             install: true
           - platform: [tvOS, 18]
             runtime: tvOS 18.5
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
           - platform: [tvOS, 26]
-            runtime: tvOS 26.0-beta1
+            runtime: tvOS 26.0
             os: macos-15
             xcode: 26.0
-            install: true
 
           - platform: [watchOS, 8]
             runtime: watchOS 8.5
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
             install: true
           - platform: [watchOS, 9]
             runtime: watchOS 9.4
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
             install: true
           - platform: [watchOS, 10]
             runtime: watchOS 10.5
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
             install: true
           - platform: [watchOS, 11]
             runtime: watchOS 11.5
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
           - platform: [watchOS, 26]
-            runtime: watchOS 26.0-beta1
+            runtime: watchOS 26.0
             os: macos-15
             xcode: 26.0
-            install: true
 
           - platform: [macOS, 15]
             runtime: macOS 15
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
           # - platform: [macOS, 26]
           #   runtime: macOS 26.0
           #   os: macos-26
@@ -127,24 +131,34 @@ jobs:
           - platform: [visionOS, 1]
             runtime: visionOS 1.2
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
             install: true
           - platform: [visionOS, 2]
             runtime: visionOS 2.5
             os: macos-15
-            xcode: 16.4
+            xcode: 26.0
           - platform: [visionOS, 26]
-            runtime: visionOS 26.0-beta1
+            runtime: visionOS 26.0
             os: macos-15
             xcode: 26.0
-            install: true
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
 
       - name: Set environment variables
         run: echo "SKIP_SLOW_FASTLANE_WARNING=1" >> $GITHUB_ENV
 
+      - name: Select Xcode ${{ matrix.xcode }}
+        run: sudo xcodes select ${{ matrix.xcode }}
+
+      - if: ${{ matrix.xcode == '26.0' && matrix.platform[0] != 'macOS' }}
+        name: Install 2026 Runtime
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 15
+          max_attempts: 3
+          command: xcodebuild -downloadPlatform ${{ matrix.platform[0] }}
+
       - if: ${{ matrix.install }}
         name: "[Debug] List Available Installable Runtimes"
         run: xcodes runtimes --include-betas
diff --git a/Sources/Introspect.swift b/Sources/Introspect.swift
@@ -107,7 +107,7 @@ struct IntrospectModifier<SwiftUIViewType: IntrospectableViewType, PlatformSpeci
 }
 
 @MainActor
-public protocol PlatformEntity: AnyObject, Sendable {
+public protocol PlatformEntity: AnyObject {
     associatedtype Base: PlatformEntity
 
     @_spi(Internals)
diff --git a/Sources/ViewTypes/SearchField.swift b/Sources/ViewTypes/SearchField.swift
@@ -1,7 +1,7 @@
 #if !os(watchOS)
 /// An abstract representation of the search field displayed via the `.searchable` modifier in SwiftUI.
 ///
-/// ### iOS
+/// ### iOS 15 - 18
 ///
 /// ```swift
 /// struct ContentView: View {
@@ -13,7 +13,40 @@
 ///                 .searchable(text: $searchTerm)
 ///         }
 ///         .navigationViewStyle(.stack)
-///         .introspect(.searchField, on: .iOS(.v15, .v16, .v17, .v18, .v26)) {
+///         .introspect(.searchField, on: .iOS(.v15, .v16, .v17, .v18)) {
+///             print(type(of: $0)) // UISearchBar
+///         }
+///     }
+/// }
+/// ```
+///
+/// ### iOS 26+
+///
+/// From iOS 26 onward, search bar is only backed by UIKit when `.searchable` is used within a
+/// `NavigationView` or `NavigationStack` contained inside a `TabView`.
+///
+/// If `.searchable` is used outside of these containers, it is backed by SwiftUI's own implementation,
+/// and there is no UIKit view to introspect.
+///
+/// The only exception to this is on iPad, where double column `NavigationView` and `NavigationSplitView`
+/// still use `UISearchBar` even outside of a `TabView` (for now...).
+///
+/// ```swift
+/// struct ContentView: View {
+///     @State var searchTerm = ""
+///
+///     var body: some View {
+///         TabView {
+///             NavigationView {
+///                 Text("Root")
+///                     .searchable(text: $searchTerm)
+///             }
+///             .navigationViewStyle(.stack)
+///             .tabItem {
+///                 Label("Home", systemImage: "house")
+///             }
+///         }
+///         .introspect(.searchField, on: .iOS(.v26)) {
 ///             print(type(of: $0)) // UISearchBar
 ///         }
 ///     }
diff --git a/Sources/ViewTypes/TabView.swift b/Sources/ViewTypes/TabView.swift
@@ -33,7 +33,7 @@
 /// }
 /// ```
 ///
-/// ### macOS
+/// ### macOS 10.15 - 14
 ///
 /// ```swift
 /// struct ContentView: View {
diff --git a/Tests/Tests/TestUtils.swift b/Tests/Tests/TestUtils.swift
@@ -46,12 +46,14 @@ enum TestUtils {
 @discardableResult
 func introspection<Entity: AnyObject & Sendable>(
     of type: Entity.Type,
+    timeout: TimeInterval = 3,
+    sourceLocation: SourceLocation = #_sourceLocation,
     @ViewBuilder view: (
         _ spy1: @escaping (Entity) -> Void
     ) -> some View
 ) async throws -> Entity {
     var entity1: Entity?
-    return try await confirmation(expectedCount: 1...) { confirmation1 in
+    return try await confirmation(expectedCount: 1..., sourceLocation: sourceLocation) { confirmation1 in
         let view = view(
             {
                 confirmation1()
@@ -61,27 +63,33 @@ func introspection<Entity: AnyObject & Sendable>(
 
         TestUtils.present(view: view)
 
-        while entity1 == nil {
+        let startInstant = Date()
+        while
+            Date().timeIntervalSince(startInstant) < timeout,
+            entity1 == nil
+        {
             await Task.yield()
         }
 
-        return try #require(entity1)
+        return try #require(entity1, sourceLocation: sourceLocation)
     }
 }
 
 @MainActor
 @discardableResult
 func introspection<Entity: AnyObject & Sendable>(
     of type: Entity.Type,
+    timeout: TimeInterval = 3,
+    sourceLocation: SourceLocation = #_sourceLocation,
     @ViewBuilder view: (
         _ spy1: @escaping (Entity) -> Void,
         _ spy2: @escaping (Entity) -> Void
     ) -> some View
 ) async throws -> (Entity, Entity) {
     var entity1: Entity?
     var entity2: Entity?
-    return try await confirmation(expectedCount: 1...) { confirmation1 in
-        try await confirmation(expectedCount: 1...) { confirmation2 in
+    return try await confirmation(expectedCount: 1..., sourceLocation: sourceLocation) { confirmation1 in
+        try await confirmation(expectedCount: 1..., sourceLocation: sourceLocation) { confirmation2 in
             let view = view(
                 {
                     confirmation1()
@@ -95,16 +103,18 @@ func introspection<Entity: AnyObject & Sendable>(
 
             TestUtils.present(view: view)
 
+            let startInstant = Date()
             while
+                Date().timeIntervalSince(startInstant) < timeout,
                 entity1 == nil ||
                 entity2 == nil
             {
                 await Task.yield()
             }
 
             return try (
-                #require(entity1),
-                #require(entity2),
+                #require(entity1, sourceLocation: sourceLocation),
+                #require(entity2, sourceLocation: sourceLocation),
             )
         }
     }
@@ -114,6 +124,8 @@ func introspection<Entity: AnyObject & Sendable>(
 @discardableResult
 func introspection<Entity: AnyObject & Sendable>(
     of type: Entity.Type,
+    timeout: TimeInterval = 3,
+    sourceLocation: SourceLocation = #_sourceLocation,
     @ViewBuilder view: (
         _ spy1: @escaping (Entity) -> Void,
         _ spy2: @escaping (Entity) -> Void,
@@ -123,9 +135,9 @@ func introspection<Entity: AnyObject & Sendable>(
     var entity1: Entity?
     var entity2: Entity?
     var entity3: Entity?
-    return try await confirmation(expectedCount: 1...) { confirmation1 in
-        try await confirmation(expectedCount: 1...) { confirmation2 in
-            try await confirmation(expectedCount: 1...) { confirmation3 in
+    return try await confirmation(expectedCount: 1..., sourceLocation: sourceLocation) { confirmation1 in
+        try await confirmation(expectedCount: 1..., sourceLocation: sourceLocation) { confirmation2 in
+            try await confirmation(expectedCount: 1..., sourceLocation: sourceLocation) { confirmation3 in
                 let view = view(
                     {
                         confirmation1()
@@ -143,7 +155,9 @@ func introspection<Entity: AnyObject & Sendable>(
 
                 TestUtils.present(view: view)
 
+                let startInstant = Date()
                 while
+                    Date().timeIntervalSince(startInstant) < timeout,
                     entity1 == nil ||
                     entity2 == nil ||
                     entity3 == nil
@@ -152,9 +166,9 @@ func introspection<Entity: AnyObject & Sendable>(
                 }
 
                 return try (
-                    #require(entity1),
-                    #require(entity2),
-                    #require(entity3),
+                    #require(entity1, sourceLocation: sourceLocation),
+                    #require(entity2, sourceLocation: sourceLocation),
+                    #require(entity3, sourceLocation: sourceLocation),
                 )
             }
         }
@@ -165,6 +179,8 @@ func introspection<Entity: AnyObject & Sendable>(
 @discardableResult
 func introspection<Entity: AnyObject & Sendable>(
     of type: Entity.Type,
+    timeout: TimeInterval = 3,
+    sourceLocation: SourceLocation = #_sourceLocation,
     @ViewBuilder view: (
         _ spy1: @escaping (Entity) -> Void,
         _ spy2: @escaping (Entity) -> Void,
@@ -176,10 +192,10 @@ func introspection<Entity: AnyObject & Sendable>(
     var entity2: Entity?
     var entity3: Entity?
     var entity4: Entity?
-    return try await confirmation(expectedCount: 1...) { confirmation1 in
-        try await confirmation(expectedCount: 1...) { confirmation2 in
-            try await confirmation(expectedCount: 1...) { confirmation3 in
-                try await confirmation(expectedCount: 1...) { confirmation4 in
+    return try await confirmation(expectedCount: 1..., sourceLocation: sourceLocation) { confirmation1 in
+        try await confirmation(expectedCount: 1..., sourceLocation: sourceLocation) { confirmation2 in
+            try await confirmation(expectedCount: 1..., sourceLocation: sourceLocation) { confirmation3 in
+                try await confirmation(expectedCount: 1..., sourceLocation: sourceLocation) { confirmation4 in
                     let view = view(
                         {
                             confirmation1()
@@ -201,7 +217,9 @@ func introspection<Entity: AnyObject & Sendable>(
 
                     TestUtils.present(view: view)
 
+                    let startInstant = Date()
                     while
+                        Date().timeIntervalSince(startInstant) < timeout,
                         entity1 == nil ||
                         entity2 == nil ||
                         entity3 == nil ||
@@ -211,10 +229,10 @@ func introspection<Entity: AnyObject & Sendable>(
                     }
 
                     return try (
-                        #require(entity1),
-                        #require(entity2),
-                        #require(entity3),
-                        #require(entity4),
+                        #require(entity1, sourceLocation: sourceLocation),
+                        #require(entity2, sourceLocation: sourceLocation),
+                        #require(entity3, sourceLocation: sourceLocation),
+                        #require(entity4, sourceLocation: sourceLocation),
                     )
                 }
             }
diff --git a/Tests/Tests/ViewTypes/SearchFieldTests.swift b/Tests/Tests/ViewTypes/SearchFieldTests.swift
diff --git a/fastlane/Fastfile b/fastlane/Fastfile

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ struct IntrospectModifier<SwiftUIViewType: IntrospectableViewType, PlatformSpeci`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`@MainActor`
`110`		`-public protocol PlatformEntity: AnyObject, Sendable {`
	`110`	`+public protocol PlatformEntity: AnyObject {`
`111`	`111`	`associatedtype Base: PlatformEntity`
`112`	`112`
`113`	`113`	`@_spi(Internals)`