Enable swiftlint (#782)

* Enable swiftlint Enable swiftlint, fix warnings. * Update PurchasesCoreSwift/Public/Purchases.swift Co-authored-by: Cesar de la Vega <cesarvegaro@gmail.com> Co-authored-by: Cesar de la Vega <cesarvegaro@gmail.com>
RevenueCat · Aug 25, 2021 · 014bc07 · 014bc07
1 parent a2bec97
commit 014bc07
Show file tree

Hide file tree

Showing 30 changed files with 162 additions and 100 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -9,17 +9,11 @@ excluded:
   - PublicSDKAPITester
   - vendor
   - scan_derived_data
-disabled_rules:
-  - trailing_comma
-  - todo
-  - cyclomatic_complexity
-  - function_body_length
-  - identifier_name
-  - line_length
+
 opt_in_rules:
   - sorted_imports
-  # TODO: enable this rule after the swift migration is finished.
-  # - missing_docs
+  - missing_docs
+
 identifier_name:
   max_length: 
     warning: 60 

diff --git a/Package.swift b/Package.swift
@@ -33,7 +33,7 @@ let package = Package(
     ],
     products: [
         .library(name: "Purchases",
-                 targets: ["Purchases"]),
+                 targets: ["Purchases"])
     ],
     dependencies: [],
     targets: resolveTargets()

diff --git a/PurchasesCoreSwift/Attribution/ASIdentifierManagerProxy.swift b/PurchasesCoreSwift/Attribution/ASIdentifierManagerProxy.swift
@@ -27,9 +27,7 @@ class FakeASIdentifierManager: NSObject {
 
 }
 
-// TODO: Test if Objc can be removed.
-@objc(RCASIdentifierManagerProxy)
-class ASIdentifierManagerProxy: NSObject {
+@objc class ASIdentifierManagerProxy: NSObject {
 
     static let mangledIdentifierClassName = "NFVqragvsvreZnantre"
     static let mangledIdentifierPropertyName = "nqiregvfvatVqragvsvre"

diff --git a/PurchasesCoreSwift/Attribution/AdClientProxy.swift b/PurchasesCoreSwift/Attribution/AdClientProxy.swift
@@ -35,9 +35,7 @@ class FakeAdClient: NSObject {
 
 }
 
-// TODO: Test if Objc can be removed.
-@objc(RCAdClientProxy)
-class AdClientProxy: NSObject {
+@objc class AdClientProxy: NSObject {
 
     private static let className = "ADClient"
 

diff --git a/PurchasesCoreSwift/Attribution/AttributionFetcher.swift b/PurchasesCoreSwift/Attribution/AttributionFetcher.swift
@@ -114,7 +114,8 @@ private extension AttributionFetcher {
         let minimumOSVersionRequiringAuthorization = OperatingSystemVersion(majorVersion: 14,
                                                                             minorVersion: 5,
                                                                             patchVersion: 0)
-        let needsTrackingAuthorization = systemInfo.isOperatingSystemAtLeastVersion(minimumOSVersionRequiringAuthorization)
+        let needsTrackingAuthorization = systemInfo
+            .isOperatingSystemAtLeastVersion(minimumOSVersionRequiringAuthorization)
 
         guard let trackingManagerProxy = attributionFactory.atTrackingProxy() else {
             if needsTrackingAuthorization {

diff --git a/PurchasesCoreSwift/Attribution/AttributionPoster.swift b/PurchasesCoreSwift/Attribution/AttributionPoster.swift
@@ -35,6 +35,7 @@ class AttributionPoster {
         self.subscriberAttributesManager = subscriberAttributesManager
     }
 
+    // swiftlint:disable function_body_length
     func post(attributionData data: [String: Any],
               fromNetwork network: AttributionNetwork,
               networkUserId: String?) {
@@ -100,6 +101,7 @@ class AttributionPoster {
             }
         }
     }
+    // swiftlint:enable function_body_length
 
     func postAppleSearchAdsAttributionIfNeeded() {
         guard attributionFetcher.isAuthorizedToPostSearchAds else {

diff --git a/PurchasesCoreSwift/Attribution/TrackingManagerProxy.swift b/PurchasesCoreSwift/Attribution/TrackingManagerProxy.swift
@@ -37,7 +37,6 @@ class FakeTrackingManager: NSObject {
 
 }
 
-// TODO: Test if Objc can be removed.
 @objc class TrackingManagerProxy: NSObject {
 
     static let mangledTrackingClassName = "NGGenpxvatZnantre"

diff --git a/PurchasesCoreSwift/FoundationExtensions/Data+Extensions.swift b/PurchasesCoreSwift/FoundationExtensions/Data+Extensions.swift
@@ -17,7 +17,7 @@ import Foundation
 
 extension NSData {
 
-    func rc_asString() -> String {
+    func asString() -> String {
         var deviceTokenString = ""
         self.enumerateBytes { bytes, byteRange, _ in
             for index in stride(from: 0, to: byteRange.length, by: 1) {
@@ -32,12 +32,12 @@ extension NSData {
 
 extension Data {
 
-    var rc_asString: String {
-        return (self as NSData).rc_asString()
+    var asString: String {
+        return (self as NSData).asString()
     }
 
     // Returns a string representing a fetch token.
-    var rc_asFetchToken: String {
+    var asFetchToken: String {
         return self.base64EncodedString()
     }
 

diff --git a/PurchasesCoreSwift/FoundationExtensions/String+Extensions.swift b/PurchasesCoreSwift/FoundationExtensions/String+Extensions.swift
@@ -32,9 +32,9 @@ private struct ROT13 {
 
     fileprivate static func string(_ string: String) -> String {
         if ROT13.key.isEmpty {
-            for i in 0 ..< 26 {
-                ROT13.key[ROT13.uppercase[i]] = ROT13.uppercase[(i + 13) % 26]
-                ROT13.key[ROT13.lowercase[i]] = ROT13.lowercase[(i + 13) % 26]
+            for number in 0 ..< 26 {
+                ROT13.key[ROT13.uppercase[number]] = ROT13.uppercase[(number + 13) % 26]
+                ROT13.key[ROT13.lowercase[number]] = ROT13.lowercase[(number + 13) % 26]
             }
         }
 

diff --git a/PurchasesCoreSwift/Networking/Backend.swift b/PurchasesCoreSwift/Networking/Backend.swift
@@ -83,12 +83,12 @@ class Backend {
               subscriberAttributes subscriberAttributesByKey: SubscriberAttributeDict?,
               completion: @escaping BackendPurchaserInfoResponseHandler) {
         // swiftlint:enable function_parameter_count
-        let fetchToken = receiptData.rc_asFetchToken
+        let fetchToken = receiptData.asFetchToken
         var body: [String: Any] = [
             "fetch_token": fetchToken,
             "app_user_id": appUserID,
             "is_restore": isRestore,
-            "observer_mode": observerMode,
+            "observer_mode": observerMode
         ]
 
         let cacheKey =
@@ -153,15 +153,15 @@ class Backend {
         }
     }
 
-    // swiftlint:disable function_parameter_count
+    // swiftlint:disable function_parameter_count function_body_length
     func post(offerIdForSigning offerIdentifier: String,
               productIdentifier: String,
               subscriptionGroup: String,
               receiptData: Data,
               appUserID: String,
               completion: @escaping OfferSigningResponseHandler) {
-    // swiftlint:enable function_parameter_count
-        let fetchToken = receiptData.rc_asFetchToken
+    // swiftlint:enable function_parameter_count function_body_length
+        let fetchToken = receiptData.asFetchToken
 
         let requestBody: [String: Any] = ["app_user_id": appUserID,
                                           "fetch_token": fetchToken,
@@ -365,7 +365,7 @@ class Backend {
             return
         }
 
-        let fetchToken = receiptData.rc_asFetchToken
+        let fetchToken = receiptData.asFetchToken
         let path = "/subscribers/\(appUserID)/intro_eligibility"
         let body: [String: Any] = ["product_identifiers": productIdentifiers,
                                    "fetch_token": fetchToken]
@@ -437,7 +437,8 @@ private extension Backend {
         if statusCode > HTTPStatusCodes.redirect.rawValue {
             let backendCode = maybeNumberFromError(code: response?["code"])
             let backendMessage = response?["message"] as? String
-            let responsError = ErrorUtils.backendError(withBackendCode: backendCode as NSNumber?, backendMessage: backendMessage)
+            let responsError = ErrorUtils.backendError(withBackendCode: backendCode as NSNumber?,
+                                                       backendMessage: backendMessage)
             completion(nil, false, ErrorUtils.networkError(withUnderlyingError: responsError))
             return
         }

diff --git a/PurchasesCoreSwift/Networking/HTTPClient.swift b/PurchasesCoreSwift/Networking/HTTPClient.swift
@@ -105,7 +105,7 @@ private extension HTTPClient {
                                             requestBody: maybeRequestBody,
                                             authHeaders: authHeaders,
                                             retried: retried,
-                                            completionHandler: maybeCompletionHandler)
+                                            completion: maybeCompletionHandler)
         }
 
         if serially {
@@ -120,9 +120,10 @@ private extension HTTPClient {
                         request: HTTPRequest,
                         data maybeData: Data?,
                         error maybeNetworkError: Error?,
-                        completionHandler maybeCompletionHandler: ((Int, [String: Any]?, Error?) -> Void)?,
+                        completion maybeCompletionHandler: ((Int, [String: Any]?, Error?) -> Void)?,
                         beginNextRequestWhenFinished: Bool,
                         retried: Bool) {
+    // swiftlint:enable function_parameter_count
         operationDispatcher.dispatchOnHTTPSerialQueue { [self] in
             self.threadUnsafeHandleResponse(urlResponse: maybeURLResponse,
                                             request: request,
@@ -134,13 +135,15 @@ private extension HTTPClient {
         }
     }
 
+    // swiftlint:disable function_body_length function_parameter_count
     func threadUnsafePerformRequest(_ httpMethod: String,
                                     serially: Bool,
                                     path: String,
                                     requestBody maybeRequestBody: [String: Any]?,
                                     authHeaders: [String: String],
                                     retried: Bool,
-                                    completionHandler maybeCompletionHandler: ((Int, [String: Any]?, Error?) -> Void)?) {
+                                    completion maybeCompletionHandler: ((Int, [String: Any]?, Error?) -> Void)?) {
+    // swiftlint:enable function_body_length function_parameter_count
         let requestHeaders = self.defaultHeaders.merging(authHeaders)
 
         let maybeURLRequest = self.createRequest(httpMethod: httpMethod,
@@ -194,21 +197,22 @@ private extension HTTPClient {
                                 request: request,
                                 data: data,
                                 error: error,
-                                completionHandler: maybeCompletionHandler,
+                                completion: maybeCompletionHandler,
                                 beginNextRequestWhenFinished: serially,
                                 retried: retried)
         }
         task.resume()
     }
 
-    // swiftlint:disable function_parameter_count
+    // swiftlint:disable function_body_length function_parameter_count
     func threadUnsafeHandleResponse(urlResponse maybeURLResponse: URLResponse?,
                                     request: HTTPRequest,
                                     data maybeData: Data?,
                                     error maybeNetworkError: Error?,
                                     completionHandler maybeCompletionHandler: ((Int, [String: Any]?, Error?) -> Void)?,
                                     beginNextRequestWhenFinished: Bool,
                                     retried: Bool) {
+    // swiftlint:enable function_body_length function_parameter_count
         var shouldBeginNextRequestWhenFinished = beginNextRequestWhenFinished
         var statusCode = HTTPStatusCodes.networkConnectTimeoutError.rawValue
         var jsonObject: [String: Any]?
@@ -310,7 +314,9 @@ private extension HTTPClient {
                 do {
                     urlRequest.httpBody = try JSONSerialization.data(withJSONObject: requestBody)
                 } catch let error {
-                    Logger.error(String(format: Strings.network.creating_json_error, requestBody, error.localizedDescription))
+                    Logger.error(String(format: Strings.network.creating_json_error,
+                                        requestBody,
+                                        error.localizedDescription))
                     return nil
                 }
             } else {

diff --git a/PurchasesCoreSwift/Public/EntitlementInfo.swift b/PurchasesCoreSwift/Public/EntitlementInfo.swift
@@ -199,7 +199,9 @@ import Foundation
             """
     }
 
+    // swiftlint:disable cyclomatic_complexity
     public override func isEqual(_ object: Any?) -> Bool {
+    // swiftlint:enable cyclomatic_complexity
         guard let info = object as? EntitlementInfo else {
             return false
         }

diff --git a/PurchasesCoreSwift/Public/Error Handling/BackendErrorCode.swift b/PurchasesCoreSwift/Public/Error Handling/BackendErrorCode.swift
@@ -46,8 +46,9 @@ import Foundation
 
 extension BackendErrorCode {
 
+    // swiftlint:disable cyclomatic_complexity
     func toPurchasesErrorCode() -> ErrorCode {
-
+    // swiftlint:enable cyclomatic_complexity
         switch self {
         case .invalidPlatform:
             return .configurationError
@@ -85,7 +86,6 @@ extension BackendErrorCode {
         @unknown default:
             return .unknownError
         }
-
     }
 
 }