Skip to content

Add macCatalyst to available platforms #242

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
Apr 8, 2025
Merged

Add macCatalyst to available platforms #242

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
786ba29
Add macCatalyst and visionOS to available platforms
gjcairo Apr 7, 2025
6caf3e9
Remove visionOS from availability guards
gjcairo Apr 8, 2025
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
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ let package = Package(
// we can depend on local versions of our dependencies instead of fetching them remotely.
if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
package.dependencies += [
.package(url: "https://github.com/apple/swift-crypto.git", from: "3.11.2"),
.package(url: "https://github.com/apple/swift-crypto.git", from: "3.12.3"),
.package(url: "https://github.com/apple/swift-asn1.git", from: "1.1.0"),
]
} else {
Expand Down
10 changes: 5 additions & 5 deletions Sources/X509/CSR/CSRAttribute.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import SwiftASN1

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest {
/// A general-purpose representation of a ``CertificateSigningRequest`` attribute.
///
Expand Down Expand Up @@ -48,7 +48,7 @@ extension CertificateSigningRequest {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest.Attribute: Hashable {
@inlinable
public static func == (lhs: CertificateSigningRequest.Attribute, rhs: CertificateSigningRequest.Attribute) -> Bool {
Expand Down Expand Up @@ -80,10 +80,10 @@ extension CertificateSigningRequest.Attribute: Hashable {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest.Attribute: Sendable {}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest.Attribute: CustomStringConvertible {
public var description: String {
return "Attribute(oid: \(self.oid), values: \(self.values))"
Expand All @@ -94,7 +94,7 @@ extension CertificateSigningRequest.Attribute: CustomStringConvertible {
// type ATTRIBUTE.&id({IOSet}),
// values SET SIZE(1..MAX) OF ATTRIBUTE.&Type({IOSet}{@type})
// }
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest.Attribute: DERImplicitlyTaggable {
@inlinable
public static var defaultIdentifier: ASN1Identifier {
Expand Down
12 changes: 6 additions & 6 deletions Sources/X509/CSR/CSRAttributes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import SwiftASN1

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest {
/// A representation of the additional attributes on a certificate signing request.
///
Expand Down Expand Up @@ -58,7 +58,7 @@ extension CertificateSigningRequest {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest.Attributes: Hashable {
@inlinable
public static func == (lhs: CertificateSigningRequest.Attributes, rhs: CertificateSigningRequest.Attributes) -> Bool
Expand Down Expand Up @@ -87,10 +87,10 @@ extension CertificateSigningRequest.Attributes: Hashable {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest.Attributes: Sendable {}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest.Attributes: RandomAccessCollection {
@inlinable
public init() {
Expand Down Expand Up @@ -140,7 +140,7 @@ extension CertificateSigningRequest.Attributes: RandomAccessCollection {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest.Attributes: CustomStringConvertible {
@inlinable
public var description: String {
Expand All @@ -149,7 +149,7 @@ extension CertificateSigningRequest.Attributes: CustomStringConvertible {
}

// MARK: Helpers for specific extensions
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest.Attributes {
/// Look up a specific attribute by its OID.
///
Expand Down
10 changes: 5 additions & 5 deletions Sources/X509/CSR/CSRVersion.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest {
/// The version of the CSR format.
///
Expand All @@ -31,21 +31,21 @@ extension CertificateSigningRequest {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest.Version: Hashable {}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest.Version: Sendable {}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest.Version: Comparable {
@inlinable
public static func < (lhs: CertificateSigningRequest.Version, rhs: CertificateSigningRequest.Version) -> Bool {
lhs.rawValue < rhs.rawValue
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest.Version: CustomStringConvertible {
public var description: String {
switch self {
Expand Down
12 changes: 6 additions & 6 deletions Sources/X509/CSR/CertificateSigningRequest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import SwiftASN1
/// Certificate Signing Requests are used to encapsulate information that an end-entity would like
/// encapsulated in a certificate. They are typically processed by Certificate Authorities and turned
/// into certificates signed by that CA.
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
public struct CertificateSigningRequest {
/// The version of this CSR.
///
Expand Down Expand Up @@ -200,13 +200,13 @@ public struct CertificateSigningRequest {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest: Hashable {}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest: Sendable {}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest: CustomStringConvertible {
@inlinable
public var description: String {
Expand All @@ -215,7 +215,7 @@ extension CertificateSigningRequest: CustomStringConvertible {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest: DERImplicitlyTaggable {
@inlinable
public static var defaultIdentifier: ASN1Identifier {
Expand Down Expand Up @@ -255,7 +255,7 @@ extension CertificateSigningRequest: DERImplicitlyTaggable {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest: PEMRepresentable {
@inlinable
public static var defaultPEMDiscriminator: String {
Expand Down
8 changes: 4 additions & 4 deletions Sources/X509/CSR/CertificationRequestInfo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import SwiftASN1

@usableFromInline
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
struct CertificationRequestInfo {
@usableFromInline
var version: CertificateSigningRequest.Version
Expand Down Expand Up @@ -42,10 +42,10 @@ struct CertificationRequestInfo {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificationRequestInfo: Hashable {}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificationRequestInfo: Sendable {}

// CertificationRequestInfo ::= SEQUENCE {
Expand All @@ -54,7 +54,7 @@ extension CertificationRequestInfo: Sendable {}
// subjectPKInfo SubjectPublicKeyInfo{{ PKInfoAlgorithms }},
// attributes [0] Attributes{{ CRIAttributes }}
// }
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificationRequestInfo: DERImplicitlyTaggable {
@inlinable
static var defaultIdentifier: ASN1Identifier {
Expand Down
6 changes: 3 additions & 3 deletions Sources/X509/CSR/ExtensionRequest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import SwiftASN1
///
/// X.509 certificates contain a number of extensions. This attribute includes the extensions that the
/// subscriber wishes the CA to embed into the certificate.
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
public struct ExtensionRequest: Hashable, Sendable {
/// The underlying extensions.
public var extensions: Certificate.Extensions
Expand Down Expand Up @@ -56,7 +56,7 @@ public struct ExtensionRequest: Hashable, Sendable {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension CertificateSigningRequest.Attribute {
/// Wrap an ``ExtensionRequest`` into a ``CertificateSigningRequest/Attribute``.
///
Expand All @@ -72,7 +72,7 @@ extension CertificateSigningRequest.Attribute {
}

@usableFromInline
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
struct ExtensionRequestAttribute: Hashable, Sendable, DERImplicitlyTaggable {
@inlinable
static var defaultIdentifier: ASN1Identifier {
Expand Down
16 changes: 8 additions & 8 deletions Sources/X509/Certificate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ import SwiftASN1
/// An instance of ``Certificate`` can be created from ``Security/SecCertificate`` (from the ``Security`` framework) with ``Certificate/init(_:)``.
/// The opposite, that is, creating an instance of ``Security/SecCertificate`` from ``Certificate``, can be achieved with ``Security/SecCertificate/makeWithCertificate(_:)``.
#endif
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
public struct Certificate {
/// The X.509 version of this certificate.
///
Expand Down Expand Up @@ -280,13 +280,13 @@ public struct Certificate {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension Certificate: Hashable {}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension Certificate: Sendable {}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension Certificate: CustomStringConvertible {
public var description: String {
"""
Expand All @@ -305,7 +305,7 @@ extension Certificate: CustomStringConvertible {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension Certificate: DERImplicitlyTaggable {
@inlinable
public static var defaultIdentifier: ASN1Identifier {
Expand Down Expand Up @@ -355,7 +355,7 @@ extension DER.Serializer {

}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension Certificate: PEMRepresentable {
@inlinable
public static var defaultPEMDiscriminator: String { "CERTIFICATE" }
Expand All @@ -364,7 +364,7 @@ extension Certificate: PEMRepresentable {
#if canImport(Security)
import Security

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension Certificate {
/// Creates an instance of ``Certificate`` from ``Security/SecCertificate``.
/// To create an instance of ``Security/SecCertificate``, use ``Security/SecCertificate/makeWithCertificate(_:)`` instead.
Expand All @@ -374,7 +374,7 @@ extension Certificate {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension SecCertificate {
/// Creates an instance of ``Security/SecCertificate`` from ``Certificate``.
/// To create an instance of ``Certificate``, use ``Certificate/init(_:)`` instead.
Expand Down
12 changes: 6 additions & 6 deletions Sources/X509/CertificatePrivateKey.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import Foundation
@preconcurrency import Crypto
import _CryptoExtras

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension Certificate {
/// A private key that can be used with a certificate.
///
Expand Down Expand Up @@ -176,13 +176,13 @@ extension Certificate {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension Certificate.PrivateKey: Hashable {}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension Certificate.PrivateKey: Sendable {}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension Certificate.PrivateKey: CustomStringConvertible {
public var description: String {
switch self.backing {
Expand All @@ -206,7 +206,7 @@ extension Certificate.PrivateKey: CustomStringConvertible {
}
}

@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, macCatalyst 13, *)
extension Certificate.PrivateKey {
@usableFromInline
enum BackingPrivateKey: Hashable, Sendable {
Expand Down Expand Up @@ -276,7 +276,7 @@ extension Certificate.PrivateKey {
}
}

@available(macOS 11.0, iOS 14, tvOS 14, watchOS 7, *)
@available(macOS 11.0, iOS 14, tvOS 14, watchOS 7, macCatalyst 14, *)
extension Certificate.PrivateKey {
@inlinable
static var pemDiscriminatorForRSA: String { "RSA PRIVATE KEY" }
Expand Down
Loading