Merge pull request #178 from pusher/cleanup-crash-fix

Cleanup crash fix

Author: hamchapman

.travis.yml

@@ -1,9 +1,9 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode9.3beta
 sudo: false
 env:
-  - iOS= DST='platform=iOS Simulator,name=iPhone 6S' ACTION=test DEVICE='iPhone 6s (10.0)'
-  - tvOS= DST='platform=tvOS Simulator,name=Apple TV 1080p' ACTION=test DEVICE='Apple TV 1080p (10.0)'
+  - iOS= DST='platform=iOS Simulator,name=iPhone X' ACTION=test DEVICE='iPhone X (11.3)'
+  - tvOS= DST='platform=tvOS Simulator,name=Apple TV 4K' ACTION=test DEVICE='Apple TV 4K (11.3)'
   - macOS= DST='platform=OS X' ACTION=test
 before_install:
   - brew update
@@ -15,11 +15,12 @@ before_install:
       brew install carthage;
     fi
   - gem install xcpretty --no-document
+  - carthage update --no-use-binaries
   - SIMULATOR_ID=$(xcrun instruments -s | grep -o "$DEVICE \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
   - echo "$SIMULATOR_ID"
 before_deploy:
-  - carthage build --no-skip-current --project-directory PusherSwift
-  - carthage archive PusherSwift --project-directory PusherSwift
+  - carthage build --no-skip-current
+  - carthage archive PusherSwift
 deploy:
   provider: releases
   api_key:
@@ -37,7 +38,7 @@ script:
       echo "$SIMULARTOR_ID";
       open -a "simulator" --args -CurrentDeviceUDID $SIMULATOR_ID || true; sleep 20;
     fi
-  - xcodebuild -scheme PusherSwift -destination "$DST" -project PusherSwift/PusherSwift.xcodeproj clean build | xcpretty -tc;
-  - xcodebuild -scheme PusherSwift -destination "$DST" -project PusherSwift/PusherSwift.xcodeproj -enableCodeCoverage YES $ACTION | xcpretty -tc;
+  - xcodebuild -scheme PusherSwift -destination "$DST" -project PusherSwift.xcodeproj clean build | xcpretty -tc;
+  - xcodebuild -scheme PusherSwift -destination "$DST" -project PusherSwift.xcodeproj -enableCodeCoverage YES $ACTION | xcpretty -tc;
 after_success:
   - sleep 5

CHANGELOG.md

@@ -6,6 +6,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased](https://github.com/pusher/pusher-websocket-swift/compare/5.1.1...HEAD)
 
+### Added
+
+- Client will now send a ping to the server if there has been a period of inactivity on the socket. This should help detect some disconnections that previously weren't being noticed.
+
+### Changed
+
+- All dependencies are now defined to be brought in using the appropriate package manager (Carthage or CocoaPods)
+- Reconnection strategy has been changed to now attempt reconnecting indefinitely, with an exponential backoff but a maximum interval of 120 seconds between reconnection attempts.
+
+### Removed
+
+- Removed the deprecated `AuthRequestBuilderProtocol` function: `func requestFor(socketID: String, channel: PusherChannel) -> NSMutableURLRequest?`
+- `reconnectingWhenNetworkBecomesReachable` connection state
+
 ## [5.1.1](https://github.com/pusher/pusher-websocket-swift/compare/5.1.0...5.1.1) - 2018-01-22
 
 ### Changed

Cartfile

@@ -0,0 +1,6 @@
+github "krzyzanowskim/CryptoSwift"
+github "ashleymills/Reachability.swift"
+github "icanzilb/TaskQueue"
+
+# github "daltoniam/Starscream"
+github "hamchapman/Starscream"

Cartfile.resolved

@@ -0,0 +1,4 @@
+github "ashleymills/Reachability.swift" "v4.1.0"
+github "hamchapman/Starscream" "3.0.6"
+github "icanzilb/TaskQueue" "1.1.0"
+github "krzyzanowskim/CryptoSwift" "0.9.0"

Carthage.xcconfig

@@ -0,0 +1,3 @@
+FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(SRCROOT)/Carthage/Build/Mac/ $(inherited)
+FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(SRCROOT)/Carthage/Build/iOS/ $(inherited)
+FRAMEWORK_SEARCH_PATHS[sdk=appletv*] = $(SRCROOT)/Carthage/Build/tvOS/ $(inherited)

PusherSwift.podspec

@@ -11,6 +11,11 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.source_files = 'Sources/*.swift'
 
+  s.dependency 'CryptoSwift', '~> 0.9.0'
+  s.dependency 'ReachabilitySwift', '~> 4.1.0'
+  s.dependency 'TaskQueue', '~> 1.1.0'
+  s.dependency 'StarscreamFork', '~> 3.0.6'
+
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.10'
   s.tvos.deployment_target = '9.0'

PusherSwift/PusherSwift.xcodeproj/project.pbxproj renamed to PusherSwift.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -57,7 +56,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"