Merge branch 'master' of https://github.com/pusher/pusher-websocket-swift into pusher-master

Author: Roberto Casula

.gitignore

@@ -61,3 +61,7 @@ fastlane/screenshots
 .swift-version
 test_push.rb
 SwiftLibExampleCertificate.pem
+
+# macOS
+
+.DS_Store

.swiftlint.yml

@@ -0,0 +1,16 @@
+excluded:
+  - Carthage
+  - Package.swift
+  - Consumption-Tests/*/Carthage
+  - Consumption-Tests/*/Pods
+
+identifier_name:
+  excluded:
+  - id
+  - ex
+  - to
+  - ws
+
+# This generates a compiler error if more than this many SwiftLint warnings are present
+# (This threshold can become more restrictive as remaining warnings are resolved via refactoring)
+warning_threshold: 22

.travis.yml

@@ -1,3 +1,2 @@
 github "ashleymills/Reachability.swift" ~> 5.0.0
-github "daltoniam/Starscream" ~> 3.1.0
 github "jedisct1/swift-sodium" == 0.8.0

Cartfile

@@ -1,3 +1,2 @@
 github "ashleymills/Reachability.swift" "v5.0.0"
-github "daltoniam/Starscream" "3.1.1"
 github "jedisct1/swift-sodium" "0.8.0"

Cartfile.resolved

@@ -0,0 +1,2 @@
+disabled_rules:
+  - line_length

Consumption-Tests/.swiftlint.yml

@@ -21,7 +21,7 @@ struct DebugConsoleMessage: Codable {
 }
 
 extension ViewController {
-    
+
     func makeAndLaunchPusher() -> Pusher {
 
         // Only use your secret here for testing or if you're sure that there's  security risk
@@ -38,7 +38,7 @@ extension ViewController {
         pusher.connect()
 
         // bind to all events globally
-        let _ = pusher.bind(eventCallback: { (event: PusherEvent) in
+        _ = pusher.bind(eventCallback: { (event: PusherEvent) in
             var message = "Received event: '\(event.eventName)'"
 
             if let channel = event.channelName {
@@ -58,7 +58,7 @@ extension ViewController {
         let myChannel = pusher.subscribe("my-channel")
 
         // bind a callback to event "my-event" on that channel
-        let _ = myChannel.bind(eventName: "my-event", eventCallback: { (event: PusherEvent) in
+        _ = myChannel.bind(eventName: "my-event", eventCallback: { (event: PusherEvent) in
 
             // convert the data string to type data for decoding
             guard let json: String = event.data,
@@ -88,13 +88,13 @@ extension ViewController {
 
         // triggers a client event on that channel
         chan.trigger(eventName: "client-test", data: ["test": "some value"])
-        
+
         return pusher
     }
 }
 
 extension ViewController: PusherDelegate {
-    
+
     // PusherDelegate methods
 
     func changedConnectionState(from old: ConnectionState, to new: ConnectionState) {

Consumption-Tests/Shared/Swift/ViewController+Extensions.swift

@@ -6,19 +6,19 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
     #if swift(>=4.2)
-    
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
 
         return true
     }
-    
+
     #else
-    
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
+
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]? = nil) -> Bool {
 
         return true
     }
-    
+
     #endif
-    
+
 }

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

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

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

@@ -3,8 +3,6 @@ import Cocoa
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
 
-
-
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         // Insert code here to initialize your application
     }
@@ -13,6 +11,4 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         // Insert code here to tear down your application
     }
 
-
 }
-