Remove redundant @available and #available annotations (#3616)

Follow up to #3615. ![Screenshot 2024-01-30 at 13 19 21](https://github.com/RevenueCat/purchases-ios/assets/685609/731cc254-8c25-4b6b-bb46-b0bf62405ede)
RevenueCat · Feb 14, 2024 · 5aef999 · 5aef999
1 parent f04d60d
commit 5aef999
Show file tree

Hide file tree

Showing 231 changed files with 170 additions and 3,805 deletions.
diff --git a/RevenueCatUI/Data/IntroEligibility/TrialOrIntroEligibilityChecker.swift b/RevenueCatUI/Data/IntroEligibility/TrialOrIntroEligibilityChecker.swift
@@ -14,7 +14,6 @@
 import Foundation
 import RevenueCat
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 final class TrialOrIntroEligibilityChecker: ObservableObject {
 
     typealias Checker = @Sendable ([Package]) async -> [Package: IntroEligibilityStatus]
@@ -49,7 +48,6 @@ final class TrialOrIntroEligibilityChecker: ObservableObject {
 
 }
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 extension TrialOrIntroEligibilityChecker {
 
     func eligibility(for package: Package) async -> IntroEligibilityStatus {
@@ -63,7 +61,6 @@ extension TrialOrIntroEligibilityChecker {
 
 }
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 extension StoreProduct {
 
     var hasIntroDiscount: Bool {

diff --git a/RevenueCatUI/Data/Strings.swift b/RevenueCatUI/Data/Strings.swift
@@ -16,7 +16,6 @@ import RevenueCat
 
 // swiftlint:disable identifier_name
 
-@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
 enum Strings {
 
     case package_not_subscription(Package)
@@ -42,7 +41,6 @@ enum Strings {
 
 }
 
-@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
 extension Strings: CustomStringConvertible {
 
     var description: String {

diff --git a/RevenueCatUI/Data/UserInterfaceIdiom.swift b/RevenueCatUI/Data/UserInterfaceIdiom.swift
@@ -33,7 +33,6 @@ extension UserInterfaceIdiom {
 
 }
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 extension EnvironmentValues {
 
     var userInterfaceIdiom: UserInterfaceIdiom {
@@ -52,15 +51,13 @@ extension EnvironmentValues {
 
 // MARK: -
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 private struct UserInterfaceIdiomEnvironmentKey: EnvironmentKey {
 
     static var defaultValue: UserInterfaceIdiom = .default
 
 }
 
 #if DEBUG
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 private struct RunningSnapshotsEnvironmentKey: EnvironmentKey {
 
     static var defaultValue: Bool = false

diff --git a/RevenueCatUI/Helpers/ColorInformation+MultiScheme.swift b/RevenueCatUI/Helpers/ColorInformation+MultiScheme.swift
@@ -105,7 +105,6 @@ extension TemplateViewConfiguration {
 import SwiftUI
 
 // Helpful acessors
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 extension PaywallData.Configuration.Colors {
 
     var backgroundColor: Color { self.background.underlyingColor }

diff --git a/RevenueCatUI/Helpers/ImageLoader.swift b/RevenueCatUI/Helpers/ImageLoader.swift
@@ -24,7 +24,6 @@ protocol URLSessionType {
 }
 
 @MainActor
-@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
 final class ImageLoader: ObservableObject {
 
     enum Error: Swift.Error, Equatable {
@@ -99,7 +98,6 @@ extension URLSession: URLSessionType {}
 
 private extension Data {
 
-    @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
     func toImage() -> ImageLoader.Value {
         #if os(macOS)
         if let image = NSImage(data: self) {

diff --git a/RevenueCatUI/Modifiers/ViewExtensions.swift b/RevenueCatUI/Modifiers/ViewExtensions.swift
@@ -16,7 +16,6 @@
 import Foundation
 import SwiftUI
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 extension View {
 
     @ViewBuilder
@@ -229,7 +228,6 @@ private struct ScrollableIfNecessaryModifier: ViewModifier {
 
 // MARK: - Size changes
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 extension View {
 
     /// Invokes the given closure whethever the view size changes.
@@ -287,7 +285,6 @@ extension View {
 
 #if canImport(UIKit)
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 extension View {
 
     @ViewBuilder
@@ -322,7 +319,6 @@ extension View {
 
 }
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 private struct RoundedCorner: Shape {
 
     var radius: CGFloat
@@ -341,10 +337,8 @@ private struct RoundedCorner: Shape {
 
 // MARK: - Preference Keys
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 private protocol ViewDimensionPreferenceKey: PreferenceKey where Value == CGFloat {}
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 extension ViewDimensionPreferenceKey {
 
     static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
@@ -385,7 +379,6 @@ private struct ViewSizePreferenceKey: PreferenceKey {
 
 // MARK: -
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 private extension Axis {
 
     var scrollViewAxis: Axis.Set {

diff --git a/RevenueCatUI/Purchasing/PurchaseHandler+TestData.swift b/RevenueCatUI/Purchasing/PurchaseHandler+TestData.swift
@@ -76,7 +76,6 @@ extension PurchaseHandler {
 
 }
 
-@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 extension Task where Success == Never, Failure == Never {
 
     static func sleep(seconds: TimeInterval) async {

diff --git a/RevenueCatUI/Templates/Template5View.swift b/RevenueCatUI/Templates/Template5View.swift
@@ -367,7 +367,6 @@ private extension Template5View {
 
 }
 
-@available(iOS 13.0, tvOS 13.0, macOS 10.15, watchOS 6.2, *)
 private extension PaywallData.Configuration.Colors {
 
     var featureIcon: Color { self.accent1Color }

diff --git a/Sources/Attribution/AttributionPoster.swift b/Sources/Attribution/AttributionPoster.swift
@@ -138,7 +138,6 @@ final class AttributionPoster {
         }
     }
 
-    @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
     var adServicesTokenToPostIfNeeded: String? {
         get async {
             #if os(tvOS) || os(watchOS)

diff --git a/Sources/Diagnostics/FileHandler.swift b/Sources/Diagnostics/FileHandler.swift
@@ -14,7 +14,6 @@
 import Foundation
 
 /// A wrapper that allows basic operations on a file, synchronized as an `actor`.
-@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
 protocol FileHandlerType: Sendable {
 
     /// Returns an async sequence for every line in the file
@@ -32,7 +31,6 @@ protocol FileHandlerType: Sendable {
 
 }
 
-@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
 actor FileHandler: FileHandlerType {
 
     private var fileHandle: FileHandle
@@ -139,7 +137,6 @@ actor FileHandler: FileHandlerType {
 
 // MARK: - Errors
 
-@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
 extension FileHandler {
 
     enum Error: Swift.Error {
@@ -157,7 +154,6 @@ extension FileHandler {
 
 // MARK: - Private
 
-@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
 private extension FileHandler {
 
     func moveToBeginningOfFile() throws {
@@ -214,7 +210,6 @@ private extension FileHandler {
 
 }
 
-@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
 private extension FileHandle {
 
     convenience init(_ url: URL) throws {

diff --git a/Sources/Error Handling/ErrorUtils.swift b/Sources/Error Handling/ErrorUtils.swift
@@ -355,34 +355,15 @@ enum ErrorUtils {
             )
         }
 
-        if #available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *) {
-            switch error {
-            case let purchasesError as PurchasesError:
-                return purchasesError
-            // This line crashes on iOS 12.x only (see https://github.com/RevenueCat/purchases-ios/pull/1982).
-            case let convertible as PurchasesErrorConvertible:
-                return convertible.asPurchasesError
-            case let error as PublicError where error.domain == ErrorCode.errorDomain:
-                return handlePublicError(error)
-            default:
-                return createUnknownError()
-            }
-        } else {
-            switch error {
-            case let purchasesError as PurchasesError:
-                return purchasesError
-            // `as PurchasesErrorConvertible` crashes on iOS 12.x, so these explicit casts are a workaround.
-            // We can't guarantee that these are exhaustive, but at least this covers the most common cases,
-            // and the `default` below ensures that we don't crash for the rest.
-            case let backendError as BackendError:
-                return backendError.asPurchasesError
-            case let networkError as NetworkError:
-                return networkError.asPurchasesError
-            case let error as PublicError where error.domain == ErrorCode.errorDomain:
-                return handlePublicError(error)
-            default:
-                return createUnknownError()
-            }
+        switch error {
+        case let purchasesError as PurchasesError:
+            return purchasesError
+        case let convertible as PurchasesErrorConvertible:
+            return convertible.asPurchasesError
+        case let error as PublicError where error.domain == ErrorCode.errorDomain:
+            return handlePublicError(error)
+        default:
+            return createUnknownError()
         }
     }
 

diff --git a/Sources/FoundationExtensions/AsyncExtensions.swift b/Sources/FoundationExtensions/AsyncExtensions.swift
@@ -13,7 +13,6 @@
 
 import Foundation
 
-@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
 internal enum Async {
 
     /// Invokes an `async throws` method and calls `completion` with the result.
@@ -127,7 +126,6 @@ internal enum Async {
     ///     }
     /// }
     /// ```
-    @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
     static func retry<T>(
         maximumRetries: Int = 5,
         pollInterval: DispatchTimeInterval = .milliseconds(300),
@@ -152,7 +150,6 @@ internal enum Async {
 
 }
 
-@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
 internal extension AsyncSequence {
 
     /// Returns the elements of the asynchronous sequence.
@@ -164,7 +161,6 @@ internal extension AsyncSequence {
 
 }
 
-@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
 internal extension AsyncSequence {
 
     func toAsyncStream() -> AsyncStream<Element> {

diff --git a/Sources/FoundationExtensions/Data+Extensions.swift b/Sources/FoundationExtensions/Data+Extensions.swift
@@ -48,22 +48,14 @@ extension Data {
 
     /// - Returns: a hash representation of the underlying bytes, using SHA256.
     var hashString: String {
-        if #available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *) {
-            var sha256 = SHA256()
-            return self.hashString(with: &sha256)
-        } else {
-            return self.hashString(CC_SHA256, length: CC_SHA256_DIGEST_LENGTH)
-        }
+        var sha256 = SHA256()
+        return self.hashString(with: &sha256)
     }
 
     /// - Returns: the SHA1 hash of the underlying bytes.
     var sha1: Data {
-        if #available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *) {
-            var sha1 = Insecure.SHA1()
-            return self.hash(with: &sha1)
-        } else {
-            return Data(self.hash(CC_SHA1, length: CC_SHA1_DIGEST_LENGTH))
-        }
+        var sha1 = Insecure.SHA1()
+        return self.hash(with: &sha1)
     }
 
     fileprivate static func hexString(_ iterator: Array<UInt8>.Iterator) -> String {
@@ -77,7 +69,6 @@ extension Data {
 
 extension Data {
 
-    @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
     static func randomNonce() -> Data {
         return Data(ChaChaPoly.Nonce())
     }
@@ -88,7 +79,6 @@ extension Data {
 
 // MARK: - Hashing
 
-@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
 extension HashFunction {
 
     func toString() -> String {
@@ -99,38 +89,15 @@ extension HashFunction {
 
 private extension Data {
 
-    typealias HashingFunction = (
-        _ data: UnsafeRawPointer?,
-        _ len: CC_LONG,
-        _ md: UnsafeMutablePointer<UInt8>?
-    ) -> UnsafeMutablePointer<UInt8>?
-
-    @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
     func hashString<T: HashFunction>(with digest: inout T) -> String {
         digest.update(data: self)
         return digest.toString()
     }
 
-    @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
     func hash<T: HashFunction>(with digest: inout T) -> Data {
         digest.update(data: self)
 
         return Data(digest.finalize())
     }
 
-    func hash(_ hashingFunction: HashingFunction, length: Int32) -> [UInt8] {
-        return self.withUnsafeBytes { (bytes: UnsafeRawBufferPointer) -> [UInt8] in
-            var hash = [UInt8](repeating: 0, count: Int(length))
-            _ = hashingFunction(bytes.baseAddress, CC_LONG(self.count), &hash)
-            return hash
-        }
-    }
-
-    func hashString(_ hashingFunction: HashingFunction, length: Int32) -> String {
-        return Self.hexString(
-            self.hash(hashingFunction, length: length)
-                .makeIterator()
-        )
-    }
-
 }
diff --git a/Sources/FoundationExtensions/Operators+Extensions.swift b/Sources/FoundationExtensions/Operators+Extensions.swift
@@ -15,7 +15,6 @@ infix operator ???
 
 /// Equivalent to `??` but allows an `async` default value.
 /// See https://github.com/apple/swift-evolution/blob/main/proposals/0296-async-await.md#future-directions
-@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
 func ??? <T>(value: T?, defaultValue: @autoclosure () async throws -> T) async rethrows -> T {
     if let value = value {
         return value

diff --git a/Sources/FoundationExtensions/Result+Extensions.swift b/Sources/FoundationExtensions/Result+Extensions.swift
@@ -72,7 +72,6 @@ extension Result where Success: OptionalType {
 
 }
 
-@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
 extension Result where Failure == Swift.Error {
 
     /// Equivalent to `Result.init(catching:)` but with an `async` closure.

diff --git a/Sources/Identity/CustomerInfo.swift b/Sources/Identity/CustomerInfo.swift
@@ -141,13 +141,7 @@ import Foundation
 
         let allEntitlementsDescription = self.entitlements.all.mapValues { $0.description }
 
-        let verificationResult: String
-
-        if #available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *) {
-            verificationResult = self.entitlements.verification.debugDescription
-        } else {
-            verificationResult = "unknown"
-        }
+        let verificationResult = self.entitlements.verification.debugDescription
 
         return """
             <\(String(describing: CustomerInfo.self)):