diff --git a/ios/HackerNews.xcodeproj/project.pbxproj b/ios/HackerNews.xcodeproj/project.pbxproj index bb96f7e0..742c85a8 100644 --- a/ios/HackerNews.xcodeproj/project.pbxproj +++ b/ios/HackerNews.xcodeproj/project.pbxproj @@ -34,8 +34,9 @@ F48E9DA82D4D2A3C00FD8B30 /* Common in Embed Frameworks */ = {isa = PBXBuildFile; productRef = F48E9DA62D4D2A3C00FD8B30 /* Common */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; F48E9ECB2D4D691600FD8B30 /* ETDistribution in Frameworks */ = {isa = PBXBuildFile; productRef = F48E9ECA2D4D691600FD8B30 /* ETDistribution */; }; F48E9FDB2D51690400FD8B30 /* ETDistribution in Embed Frameworks */ = {isa = PBXBuildFile; productRef = F48E9ECA2D4D691600FD8B30 /* ETDistribution */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + FA3637612EC7AC7D00541313 /* AccessibilitySnapshotCore in Frameworks */ = {isa = PBXBuildFile; productRef = FA3637602EC7AC7D00541313 /* AccessibilitySnapshotCore */; }; + FA3637642EC7ACAD00541313 /* AccessibilitySnapshotCore in Frameworks */ = {isa = PBXBuildFile; productRef = FA3637632EC7ACAD00541313 /* AccessibilitySnapshotCore */; }; FA80C2702EC78D7500A700AB /* AccessibilitySnapshotCore in Frameworks */ = {isa = PBXBuildFile; productRef = FA80C26F2EC78D7500A700AB /* AccessibilitySnapshotCore */; }; - FA80C2732EC78F2D00A700AB /* AccessibilitySnapshotCore in Frameworks */ = {isa = PBXBuildFile; productRef = FA80C2722EC78F2D00A700AB /* AccessibilitySnapshotCore */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -205,11 +206,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FA80C2732EC78F2D00A700AB /* AccessibilitySnapshotCore in Frameworks */, + FA3637612EC7AC7D00541313 /* AccessibilitySnapshotCore in Frameworks */, A495A6662CED57BB009A2A6B /* SnapshotTesting in Frameworks */, C3AC6AD92CB6E8F7006BD22D /* SnapshottingTests in Frameworks */, A4BED5C32AD5E083001642B3 /* (null) in Frameworks */, F48E9DA32D4D2A3500FD8B30 /* Common in Frameworks */, + FA3637642EC7ACAD00541313 /* AccessibilitySnapshotCore in Frameworks */, FA80C2702EC78D7500A700AB /* AccessibilitySnapshotCore in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -502,7 +504,7 @@ F45F6F4C2D4D2554003FA9A3 /* XCLocalSwiftPackageReference "Packages/Fonts" */, F48E9EC92D4D691600FD8B30 /* XCRemoteSwiftPackageReference "ETDistribution" */, A42271692DE78DEF002F03D5 /* XCRemoteSwiftPackageReference "faultordering" */, - FA80C2712EC78F2D00A700AB /* XCRemoteSwiftPackageReference "AccessibilitySnapshot" */, + FA3637622EC7ACAD00541313 /* XCRemoteSwiftPackageReference "AccessibilitySnapshotios26" */, ); productRefGroup = A427057A2A4293B10057E439 /* Products */; projectDirPath = ""; @@ -1281,20 +1283,20 @@ minimumVersion = 0.2.1; }; }; - FA80C26E2EC78D7500A700AB /* XCRemoteSwiftPackageReference "AccessibilitySnapshot" */ = { + FA3637622EC7ACAD00541313 /* XCRemoteSwiftPackageReference "AccessibilitySnapshotios26" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/cashapp/AccessibilitySnapshot.git"; + repositoryURL = "https://github.com/EmergeTools/AccessibilitySnapshotios26"; requirement = { - kind = exactVersion; - version = 1.0.2; + branch = main; + kind = branch; }; }; - FA80C2712EC78F2D00A700AB /* XCRemoteSwiftPackageReference "AccessibilitySnapshot" */ = { + FA80C26E2EC78D7500A700AB /* XCRemoteSwiftPackageReference "AccessibilitySnapshot" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/cashapp/AccessibilitySnapshot"; + repositoryURL = "https://github.com/cashapp/AccessibilitySnapshot.git"; requirement = { - kind = upToNextMajorVersion; - minimumVersion = 0.10.0; + kind = exactVersion; + version = 1.0.2; }; }; /* End XCRemoteSwiftPackageReference section */ @@ -1385,14 +1387,18 @@ package = F48E9EC92D4D691600FD8B30 /* XCRemoteSwiftPackageReference "ETDistribution" */; productName = ETDistribution; }; - FA80C26F2EC78D7500A700AB /* AccessibilitySnapshotCore */ = { + FA3637602EC7AC7D00541313 /* AccessibilitySnapshotCore */ = { isa = XCSwiftPackageProductDependency; - package = FA80C26E2EC78D7500A700AB /* XCRemoteSwiftPackageReference "AccessibilitySnapshot" */; productName = AccessibilitySnapshotCore; }; - FA80C2722EC78F2D00A700AB /* AccessibilitySnapshotCore */ = { + FA3637632EC7ACAD00541313 /* AccessibilitySnapshotCore */ = { isa = XCSwiftPackageProductDependency; - package = FA80C2712EC78F2D00A700AB /* XCRemoteSwiftPackageReference "AccessibilitySnapshot" */; + package = FA3637622EC7ACAD00541313 /* XCRemoteSwiftPackageReference "AccessibilitySnapshotios26" */; + productName = AccessibilitySnapshotCore; + }; + FA80C26F2EC78D7500A700AB /* AccessibilitySnapshotCore */ = { + isa = XCSwiftPackageProductDependency; + package = FA80C26E2EC78D7500A700AB /* XCRemoteSwiftPackageReference "AccessibilitySnapshot" */; productName = AccessibilitySnapshotCore; }; /* End XCSwiftPackageProductDependency section */ diff --git a/ios/HackerNews.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/HackerNews.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index d7c584dc..f74453c2 100644 --- a/ios/HackerNews.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ios/HackerNews.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "41633491f6f1fcb0afdded3559f6bb4f810d305eb9b709a778b41dfa7a3dfa17", + "originHash" : "cd279061071a9be804a18a197dd9701ac5708de79c458383a585d24b3f0df7d0", "pins" : [ { - "identity" : "accessibilitysnapshot", + "identity" : "accessibilitysnapshotios26", "kind" : "remoteSourceControl", - "location" : "https://github.com/cashapp/AccessibilitySnapshot", + "location" : "https://github.com/EmergeTools/AccessibilitySnapshotios26", "state" : { - "revision" : "8d4bc42c1ba23755147b931e1e94c775df91a997", - "version" : "0.10.0" + "branch" : "main", + "revision" : "2e2ece6a050a240f03c14da4d126a97f04c7b7d4" } }, { diff --git a/ios/HackerNewsTests/HackerNewsSnapshotTest.swift b/ios/HackerNewsTests/HackerNewsSnapshotTest.swift index 8ba12653..519c6aef 100644 --- a/ios/HackerNewsTests/HackerNewsSnapshotTest.swift +++ b/ios/HackerNewsTests/HackerNewsSnapshotTest.swift @@ -36,14 +36,15 @@ override open class func setupA11y() -> ((UIViewController, UIWindow, PreviewLay } let a11yView = AccessibilitySnapshotView( containedView: containedView, - viewRenderingMode: controller.view.bounds.size.requiresCoreAnimationSnapshot ? .renderLayerInContext : .drawHierarchyInRect, - activationPointDisplayMode: .never, - showUserInputLabels: true) + snapshotConfiguration: .init( + viewRenderingMode: controller.view.bounds.size.requiresCoreAnimationSnapshot ? .renderLayerInContext : .drawHierarchyInRect, + activationPointDisplay: .never, + includesInputLabels: .never)) a11yView.center = window.center window.addSubview(a11yView) - _ = try? a11yView.parseAccessibility(useMonochromeSnapshot: false) + _ = try? a11yView.parseAccessibility() a11yView.sizeToFit() return a11yView }