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.

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

Fixed compilation on Mac Catalyst #306

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Fixed compilation on Mac Catalyst #306

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a230b4a
Fixed compilation on Mac Catalyst
pokryfka Sep 11, 2020
cd3396a
Updates after review
pokryfka Sep 14, 2020
c01e323
Fix SSLProtocol depreciation warning
pokryfka Sep 14, 2020
f04d4bf
Formatted code using swiftformat-44.6
pokryfka Sep 14, 2020
05c69fb
Merge branch 'master' into fix/mac_catalyst
pokryfka May 12, 2021
0106719
Limit macCatalyst check to Swift 5.3 or later
pokryfka May 12, 2021
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
13 changes: 11 additions & 2 deletions Sources/AsyncHTTPClient/NIOTransportServices/TLSConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
}
}

@available(iOS, introduced: 5.0, deprecated: 13.0)
extension TLSVersion {
/// return as SSL protocol
var sslProtocol: SSLProtocol {
Expand Down Expand Up @@ -67,15 +68,23 @@
if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
sec_protocol_options_set_min_tls_protocol_version(options.securityProtocolOptions, self.minimumTLSVersion.nwTLSProtocolVersion)
} else {
sec_protocol_options_set_tls_min_version(options.securityProtocolOptions, self.minimumTLSVersion.sslProtocol)
#if !targetEnvironment(macCatalyst)
pokryfka marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

@weissi weissi Jan 18, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

@pokryfka you'll need to do

#if compiler(>=5.3)
    #if !targetEnvironment(macCatalyst)
        sec_protocol_options_set_tls_min_version(options.securityProtocolOptions, self.minimumTLSVersion.sslProtocol)
    #else
        preconditionFailure("macCatalyst 13 is the first version of macCatalyst")
    #endif
#else
    sec_protocol_options_set_tls_min_version(options.securityProtocolOptions, self.minimumTLSVersion.sslProtocol)
#endif

Copy link
Contributor

Choose a reason for hiding this comment

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

friendly ping @pokryfka

Copy link
Author

Choose a reason for hiding this comment

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

thank you for the reminder and previous comment

my (personal) project using Catalyst and AHC, and in fact swift-server in general, is waiting for my professional contract to finish, which is in a few weeks 🎉

anyway, its a small change, and would be great to be able to use official AHC in my project

will test it and update the PR tomorrow

sec_protocol_options_set_tls_min_version(options.securityProtocolOptions, self.minimumTLSVersion.sslProtocol)
#else
preconditionFailure("macCatalyst 13 is the first version of macCatalyst")
#endif
}

// maximum TLS protocol
if let maximumTLSVersion = self.maximumTLSVersion {
if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
sec_protocol_options_set_max_tls_protocol_version(options.securityProtocolOptions, maximumTLSVersion.nwTLSProtocolVersion)
} else {
sec_protocol_options_set_tls_max_version(options.securityProtocolOptions, maximumTLSVersion.sslProtocol)
#if !targetEnvironment(macCatalyst)
sec_protocol_options_set_tls_max_version(options.securityProtocolOptions, maximumTLSVersion.sslProtocol)
#else
preconditionFailure("macCatalyst 13 is the first version of macCatalyst")
#endif
}
}

Expand Down