Backport: Switch to canImport instead of os conditions (#184) #192
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Rework canImport to just defines with platform conditions * Soundness and make --------- Co-authored-by: Cory Benfield <lukasa@apple.com> (cherry picked from commit 9c1b699)
Lukasa
added
the
patch-version-bump-only
glbrntt
approved these changes
Aug 3, 2023
simonjbeaumont
approved these changes
Aug 3, 2023
There was a problem hiding this comment.
Looks like there are files in this branch that aren't covered by the cherry-pick, which might need some of the same treatment in a followup PR?
❯ git ls-files "**/*.swift" -z | xargs -0 grep "#if" | grep os
Sources/Crypto/Key Agreement/DH.swift: #if os(iOS) && (arch(arm) || arch(i386))
Sources/Crypto/Message Authentication Codes/HMAC/HMAC.swift: #if os(iOS) && (arch(arm) || arch(i386))
Sources/Crypto/Signatures/ECDSA.swift: #if os(iOS) && (arch(arm) || arch(i386))
Sources/Crypto/Signatures/ECDSA.swift: #if os(iOS) && (arch(arm) || arch(i386))
Sources/Crypto/Signatures/ECDSA.swift: #if os(iOS) && (arch(arm) || arch(i386))
Sources/Crypto/Signatures/ECDSA.swift: #if os(iOS) && (arch(arm) || arch(i386))
Sources/Crypto/Signatures/ECDSA.swift: #if os(iOS) && (arch(arm) || arch(i386))
Sources/Crypto/Signatures/ECDSA.swift: #if os(iOS) && (arch(arm) || arch(i386))
Tests/CryptoTests/Encodings/DERTests.swift: #if canImport(Darwin) || os(Linux) || os(Android) || os(Windows)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a backport of #184 to the 2.x release series.