Merge pull request #336 from pusher/tech/swiftlint-improvements

SwiftLint improvements

Author: danielrbrowne

.swiftlint.yml

@@ -4,6 +4,19 @@ excluded:
   - Consumption-Tests/*/Carthage
   - Consumption-Tests/*/Pods
 
+opt_in_rules:
+  - anyobject_protocol
+  - closure_end_indentation
+  - closure_spacing
+  - explicit_init
+  - modifier_order
+  - prefer_self_type_over_type_of_self
+  - sorted_imports
+  - test_case_accessibility
+  - unneeded_parentheses_in_closure_argument
+  - vertical_whitespace_between_cases
+  - vertical_whitespace_closing_braces
+
 identifier_name:
   excluded:
   - id

Consumption-Tests/Shared/Swift/iOS/AppDelegate.swift

@@ -20,5 +20,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     #endif
-
 }

Consumption-Tests/Shared/Swift/iOS/ViewController.swift

@@ -17,5 +17,4 @@ class ViewController: UIViewController {
         super.viewDidLoad()
         self.pusher = makeAndLaunchPusher()
     }
-
 }

Consumption-Tests/Shared/Swift/macOS/AppDelegate.swift

@@ -10,5 +10,4 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     func applicationWillTerminate(_ aNotification: Notification) {
         // Insert code here to tear down your application
     }
-
 }

Consumption-Tests/Shared/Swift/macOS/ViewController.swift

@@ -9,5 +9,4 @@ class ViewController: NSViewController {
         super.viewDidLoad()
         self.pusher = makeAndLaunchPusher()
     }
-
 }

Consumption-Tests/Shared/Swift/tvOS/AppDelegate.swift

@@ -26,5 +26,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func applicationDidBecomeActive(_ application: UIApplication) {
         // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
     }
-
 }

Consumption-Tests/Shared/Swift/tvOS/ViewController.swift

@@ -17,5 +17,4 @@ class ViewController: UIViewController {
         super.viewDidLoad()
         self.pusher = makeAndLaunchPusher()
     }
-
 }

Sources/Extensions/PusherWebsocketDelegate.swift

@@ -101,6 +101,7 @@ extension PusherConnection: WebSocketConnectionDelegate {
         switch result {
         case .success:
             updateConnectionState(to: .reconnecting)
+
         case .failure(let error):
             PusherLogger.shared.debug(for: .errorReceived,
                                       context: """
@@ -201,8 +202,10 @@ extension PusherConnection: WebSocketConnectionDelegate {
         switch closeCode {
         case .protocolCode(let definedCode):
             rawCode = definedCode.rawValue
+
         case .applicationCode(let applicationCode):
             rawCode = applicationCode
+
         case .privateCode(let protocolCode):
             rawCode = protocolCode
         @unknown default:

Sources/Helpers/PusherCrypto.swift

@@ -1,5 +1,5 @@
-import Foundation
 import CommonCrypto
+import Foundation
 
 struct PusherCrypto {
 

Sources/Helpers/PusherEventFactory.swift

@@ -3,7 +3,6 @@ import Foundation
 protocol PusherEventFactory {
 
     func makeEvent(fromJSON json: PusherEventPayload, withDecryptionKey decryptionKey: String?) throws -> PusherEvent
-
 }
 
 // MARK: - Concrete implementation
@@ -54,5 +53,4 @@ enum PusherEventError: Error {
     case invalidFormat
     case invalidDecryptionKey
     case invalidEncryptedData
-
 }