Skip to content

OpenURL fix for macCatalyst #1429

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
merged 2 commits into from
Oct 1, 2022
Merged

OpenURL fix for macCatalyst #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75db0f3
OpenURL fix for macCatalyst
stephencelis Oct 1, 2022
caec9ef
Update Makefile
stephencelis Oct 1, 2022
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
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PLATFORM_IOS = iOS Simulator,name=iPhone 11 Pro Max
PLATFORM_MACOS = macOS
PLATFORM_MAC_CATALYST = macOS,variant=Mac Catalyst
PLATFORM_TVOS = tvOS Simulator,name=Apple TV
PLATFORM_WATCHOS = watchOS Simulator,name=Apple Watch Series 7 (45mm)

Expand All @@ -9,7 +10,7 @@ test-all: test-library-debug test-library-release test-examples

test-library-debug:
for scheme in Dependencies ComposableArchitecture; do \
for platform in "$(PLATFORM_WATCHOS)" "$(PLATFORM_IOS)" "$(PLATFORM_MACOS)" "$(PLATFORM_TVOS)"; do \
for platform in "$(PLATFORM_IOS)" "$(PLATFORM_MACOS)" "$(PLATFORM_MAC_CATALYST)" "$(PLATFORM_TVOS)" "$(PLATFORM_WATCHOS)"; do \
xcodebuild test \
-workspace ComposableArchitecture.xcworkspace \
-scheme $$scheme \
Expand All @@ -19,7 +20,7 @@ test-library-debug:

test-library-release:
for scheme in Dependencies ComposableArchitecture; do \
for platform in "$(PLATFORM_WATCHOS)" "$(PLATFORM_IOS)" "$(PLATFORM_MACOS)" "$(PLATFORM_TVOS)"; do \
for platform in "$(PLATFORM_IOS)" "$(PLATFORM_MACOS)" "$(PLATFORM_MAC_CATALYST)" "$(PLATFORM_TVOS)" "$(PLATFORM_WATCHOS)"; do \
xcodebuild test \
-configuration release \
-workspace ComposableArchitecture.xcworkspace \
Expand Down
2 changes: 1 addition & 1 deletion Sources/Dependencies/Dependencies/OpenURL.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ private enum OpenURLKey: DependencyKey {
static let liveValue = OpenURLEffect { url in
let stream = AsyncStream<Bool> { continuation in
let task = Task { @MainActor in
#if canImport(AppKit)
#if canImport(AppKit) && !targetEnvironment(macCatalyst)
Copy link
Contributor

@tgrapperon tgrapperon Oct 1, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively, we can be more explicit about the intent when selecting platforms and simplify the logic by removing negations using os:

#if targetEnvironment(macCatalyst)

#elseif os(iOS)

#elseif os(tvOS)

#elseif os(watchOS)

#elseif os(macOS)

#else 

#endif

Copy link
Member Author

@stephencelis stephencelis Oct 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might revisit this in the future, as it is admittedly a bit confusing, but for now just focused on fixing the build 😅

NSWorkspace.shared.open(url, configuration: .init()) { app, error in
continuation.yield(app != nil && error == nil)
continuation.finish()
Expand Down