diff --git a/Modals/Sources/AccessibilityProxyView.swift b/Modals/Sources/AccessibilityProxyView.swift index 8a2fcc70..59b7f3e7 100644 --- a/Modals/Sources/AccessibilityProxyView.swift +++ b/Modals/Sources/AccessibilityProxyView.swift @@ -148,31 +148,26 @@ extension AccessibilityProxyView { } - @available(iOS 17.0, *) override var accessibilityLabelBlock: AXStringReturnBlock? { get { proxiedElement?.accessibilityLabelBlock } set { fatalError("Proxy view accessibility is not settable") } } - @available(iOS 17.0, *) override var accessibilityValueBlock: AXStringReturnBlock? { get { proxiedElement?.accessibilityValueBlock } set { fatalError("Proxy view accessibility is not settable") } } - @available(iOS 17.0, *) override var accessibilityHintBlock: AXStringReturnBlock? { get { proxiedElement?.accessibilityHintBlock } set { fatalError("Proxy view accessibility is not settable") } } - @available(iOS 17.0, *) override var accessibilityTraitsBlock: AXTraitsReturnBlock? { get { proxiedElement?.accessibilityTraitsBlock } set { fatalError("Proxy view accessibility is not settable") } } - @available(iOS 17.0, *) override var accessibilityIdentifierBlock: AXStringReturnBlock? { get { proxiedElement?.accessibilityIdentifierBlock } set { fatalError("Proxy view accessibility is not settable") } @@ -187,7 +182,6 @@ extension AccessibilityProxyView.Proxy where T: AXCustomContentProvider { set { fatalError("Proxy view accessibility is not settable") } } - @available(iOS 17.0, *) var accessibilityCustomContentBlock: AXCustomContentReturnBlock? { get { proxiedElement?.accessibilityCustomContentBlock ?? { self.accessibilityCustomContent } } set { fatalError("Proxy view accessibility is not settable") } diff --git a/Modals/Tests/AccessibilityProxyTests.swift b/Modals/Tests/AccessibilityProxyTests.swift index a2ff9d20..8bdee138 100644 --- a/Modals/Tests/AccessibilityProxyTests.swift +++ b/Modals/Tests/AccessibilityProxyTests.swift @@ -85,14 +85,11 @@ class AccessibilityProxyTests: XCTestCase { XCTAssertEqual(content?.count, 1) XCTAssertEqual(content, item.accessibilityCustomContent) - if #available(iOS 17.0, *) { - // accessibilityCustomContentBlock is preferred by voiceover if implemented, so we should return the content even if the proxied item doesn't implement it. - let blockContent = proxy.accessibilityCustomContentBlock?() - XCTAssertEqual(blockContent, content) - } + // accessibilityCustomContentBlock is preferred by voiceover if implemented, so we should return the content even if the proxied item doesn't implement it. + let blockContent = proxy.accessibilityCustomContentBlock?() + XCTAssertEqual(blockContent, content) } - @available(iOS 17.0, *) func test_proxy_customContentBlock() { class BlockTestItem: NSObject, AXCustomContentProvider { var accessibilityCustomContent: [AXCustomContent]! = [ diff --git a/Package.swift b/Package.swift index e95104ed..5a41684c 100644 --- a/Package.swift +++ b/Package.swift @@ -6,8 +6,8 @@ let package = Package( name: "Modals", defaultLocalization: "en", platforms: [ - .macCatalyst(.v16), - .iOS(.v16), + .iOS("17.1"), + .macCatalyst(.v17), ], products: [ .library( @@ -22,7 +22,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-log", from: "1.4.4"), .package(url: "https://github.com/square/swift-keyboard-observer", from: "1.1.0"), - .package(url: "https://github.com/square/workflow-swift", from: "6.0.0"), + .package(url: "https://github.com/square/workflow-swift", from: "7.0.0"), ], targets: [ .target( diff --git a/Samples/Tuist/Package.resolved b/Samples/Tuist/Package.resolved index 40c23386..02b655cd 100644 --- a/Samples/Tuist/Package.resolved +++ b/Samples/Tuist/Package.resolved @@ -72,15 +72,6 @@ "version" : "1.6.2" } }, - { - "identity" : "swift-perception", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-perception", - "state" : { - "revision" : "d924c62a70fca5f43872f286dbd7cef0957f1c01", - "version" : "1.6.0" - } - }, { "identity" : "swift-syntax", "kind" : "remoteSourceControl", @@ -95,8 +86,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/square/workflow-swift", "state" : { - "revision" : "d31ae0d61ccd0e41be5b45c299696f087445da2d", - "version" : "6.0.0" + "revision" : "08eb59a20b56a20a713a4ba53c1434a9751bbbf5", + "version" : "7.0.0" } }, { diff --git a/Samples/Tuist/ProjectDescriptionHelpers/Project+Modals.swift b/Samples/Tuist/ProjectDescriptionHelpers/Project+Modals.swift index 0bedd8a0..623e3c1a 100644 --- a/Samples/Tuist/ProjectDescriptionHelpers/Project+Modals.swift +++ b/Samples/Tuist/ProjectDescriptionHelpers/Project+Modals.swift @@ -3,7 +3,7 @@ import ProjectDescription public let modalsBundleIdPrefix = "com.squareup.modals" public let modalsDestinations: ProjectDescription.Destinations = .iOS -public let modalsDeploymentTargets: DeploymentTargets = .iOS("16.0") +public let modalsDeploymentTargets: DeploymentTargets = .iOS("17.1") extension Target { public static func app(