Skip to content

build: bump Workflow and align Modals platform minimums #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnnewman-square merged 4 commits into from
Oct 9, 2026
Merged

build: bump Workflow and align Modals platform minimums #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92fe522
CLF-526: Align Modals platform minimums with Workflow
johnnewman-square Oct 8, 2026
b1dd028
Restore accessibility custom content comment
johnnewman-square Oct 8, 2026
89879aa
CLF-526: Update Workflow to restore Observation export
johnnewman-square Oct 8, 2026
1b2882e
CLF-526: Use Workflow 7.0.0 release
johnnewman-square Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Modals/Sources/AccessibilityProxyView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") }
Expand All @@ -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") }
Expand Down
9 changes: 3 additions & 6 deletions Modals/Tests/AccessibilityProxyTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]! = [
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ let package = Package(
name: "Modals",
defaultLocalization: "en",
platforms: [
.macCatalyst(.v16),
.iOS(.v16),
.iOS("17.1"),
.macCatalyst(.v17),
],
products: [
.library(
Expand All @@ -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(
Expand Down
13 changes: 2 additions & 11 deletions Samples/Tuist/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Samples/Tuist/ProjectDescriptionHelpers/Project+Modals.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading