Skip to content
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.

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

Xcode 13 Support #3486

Merged
merged 2 commits into from Sep 13, 2021
Merged

Xcode 13 Support #3486

merged 2 commits into from Sep 13, 2021

Conversation

jshier
Copy link
Contributor

@jshier jshier commented Aug 11, 2021

Issue Link πŸ”—

#3481

Goals ⚽

This PR tracks changes necessary for Xcode 13. It also adds a workaround for Combine-related build issues by limiting Combine features to 64-bit platforms as well as the ability to import Combine.

Implementation Details 🚧

No functional changes, just deployment targets.

Testing Details πŸ”

No new tests.

Copy link

@jlcvp jlcvp left a comment

Choose a reason for hiding this comment

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

As the lib also supports running on Linux and Windows, we need to be broader in the #if directive to embrace those systems in the verification

@@ -22,7 +22,7 @@
// THE SOFTWARE.
//

#if canImport(Combine)
#if !(os(iOS) && (arch(i386) || arch(arm)))
Copy link

Choose a reason for hiding this comment

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

this check must be broader to check for windows and linux that doesn't support Combine framework

@@ -22,7 +22,7 @@
// THE SOFTWARE.
//

#if canImport(Combine)
#if !(os(iOS) && (arch(i386) || arch(arm)))
Copy link

Choose a reason for hiding this comment

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

Same here

Copy link

@jlcvp jlcvp left a comment

Choose a reason for hiding this comment

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

Seems great now, thanks

@jshier jshier merged commit 2397bb9 into master Sep 13, 2021
@jshier jshier deleted the xcode13 branch September 13, 2021 18:18
@jshier jshier added this to the 5.4.4 milestone Sep 20, 2021
jshier added a commit that referenced this pull request Jan 15, 2022
* Update for Xcode 13, workaround Combine issues.

* Disable Combine on Windows and Linux.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants