Upgrade deps and add @retroactive to tests

sampettersson · Jan 20, 2025 · 792ec68 · 792ec68
1 parent e6e9a38
commit 792ec68
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -18,11 +18,8 @@ jobs:
         with:
           xcode-version: latest-stable
       - name: Build
-        env:
-          platform: ${{ 'iOS Simulator' }}
         run: |
-          device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"`
-          xcodebuild docbuild -scheme Placement -derivedDataPath $GITHUB_WORKSPACE/build -destination "platform=$platform,name=$device"
+          xcodebuild docbuild -scheme Placement -derivedDataPath $GITHUB_WORKSPACE/build -destination "platform=iOS Simulator,OS=18.0,name=iPhone 16 Pro"
       - name: Clone swift-docc
         run: git clone -b release/5.10 https://github.com/apple/swift-docc.git
       - name: Build swift-docc

diff --git a/Placement.xcodeproj/project.pbxproj b/Placement.xcodeproj/project.pbxproj
@@ -653,7 +653,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM ="";
+				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -962,7 +962,7 @@
 			repositoryURL = "https://github.com/nalexn/ViewInspector.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 0.9.2;
+				minimumVersion = 0.10.1;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/Placement.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Placement.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,14 +1,15 @@
 {
+  "originHash" : "23e2351daabac1215fcb46bc76dddeaae2e139c702da3e55143877948853cec5",
   "pins" : [
     {
       "identity" : "viewinspector",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/nalexn/ViewInspector.git",
       "state" : {
-        "revision" : "ac7df67c4e0593470eda90a550f8493a81609745",
-        "version" : "0.9.2"
+        "revision" : "788e7879d38a839c4e348ab0762dcc0364e646a2",
+        "version" : "0.10.1"
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }
diff --git a/Sources/PlacementTests/Inspectable/LayoutSizeModifier.swift b/Sources/PlacementTests/Inspectable/LayoutSizeModifier.swift
@@ -9,4 +9,4 @@ import Foundation
 import ViewInspector
 @testable import Placement
 
-extension LayoutSizeModifier: Inspectable {}
+extension LayoutSizeModifier: @retroactive Inspectable {}
diff --git a/Sources/PlacementTests/Inspectable/Layouter.swift b/Sources/PlacementTests/Inspectable/Layouter.swift
@@ -9,4 +9,4 @@ import Foundation
 import ViewInspector
 @testable import Placement
 
-extension Layouter: Inspectable {}
+extension Layouter: @retroactive Inspectable {}
diff --git a/Sources/PlacementTests/Inspectable/PlacementModifier.swift b/Sources/PlacementTests/Inspectable/PlacementModifier.swift
@@ -9,4 +9,4 @@ import Foundation
 import ViewInspector
 @testable import Placement
 
-extension PlacementModifier: Inspectable {}
+extension PlacementModifier: @retroactive Inspectable {}
diff --git a/Sources/PlacementTests/PlacementLayoutNativeTests.swift b/Sources/PlacementTests/PlacementLayoutNativeTests.swift
@@ -131,7 +131,7 @@ final class PlacementLayoutNativeTests: XCTestCase {
             }
         }
 
-        struct UpdateContentView<Content: View>: View, Inspectable {
+        struct UpdateContentView<Content: View>: View {
             @State var flag: Bool = false
             var content: (_ flag: Bool) -> Content
             internal var didAppear: ((Self) -> Void)?
@@ -160,7 +160,7 @@ final class PlacementLayoutNativeTests: XCTestCase {
         }
 
         let didAppearExp = sut.on(\.didAppear) { view in
-            try view.vStack().first?.button().tap()
+            try view.implicitAnyView().vStack().first?.button().tap()
         }
 
         ViewHosting.host(view: sut)

diff --git a/Sources/PlacementTests/PlacementLayoutTests.swift b/Sources/PlacementTests/PlacementLayoutTests.swift
@@ -130,7 +130,7 @@ final class PlacementLayoutTests: XCTestCase {
             }
         }
 
-        struct UpdateContentView<Content: View>: View, Inspectable {
+        struct UpdateContentView<Content: View>: View {
             @State var flag: Bool = false
             var content: (_ flag: Bool) -> Content
             internal var didAppear: ((Self) -> Void)?
@@ -159,7 +159,7 @@ final class PlacementLayoutTests: XCTestCase {
         }
 
         let didAppearExp = sut.on(\.didAppear) { view in
-            try view.vStack().first?.button().tap()
+            try view.implicitAnyView().vStack().first?.button().tap()
         }
 
         ViewHosting.host(view: sut)

diff --git a/Sources/PlacementTests/PositioningTests.swift b/Sources/PlacementTests/PositioningTests.swift
@@ -19,7 +19,7 @@ enum PlacementLayouterType {
 final class PositioningTests: XCTestCase {
     func testThatPositioningIsCorrect() {
 
-        struct Content: View, Inspectable {
+        struct Content: View {
             var hasPlaced: ((Self) -> Void)?
             var onContainerProxy: (_ type: PlacementLayouterType, _ proxy: GeometryProxy) -> Void
             var onChildProxy: (_ type: PlacementLayouterType, _ proxy: GeometryProxy) -> Void
@@ -82,7 +82,7 @@ final class PositioningTests: XCTestCase {
 
         ViewHosting.host(view: sut)
 
-        wait(for: [didAppearExp], timeout: 0.1)
+        wait(for: [didAppearExp], timeout: 0.5)
     }
 }