Merge branch 'pusher-master'

Author: rcasula

.travis.yml

@@ -1,8 +1,11 @@
 language: objective-c
-osx_image: xcode10.2
+osx_image: xcode11
 sudo: false
+cache:
+  directories:
+  - Carthage
 env:
-  - iOS= DST='platform=iOS Simulator,name=iPhone X' ACTION=test DEVICE='iPhone X (11.3)'
+  - iOS= DST='platform=iOS Simulator,name=iPhone 11' ACTION=test DEVICE='iPhone 11 (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:
@@ -15,17 +18,20 @@ before_install:
       brew install carthage;
     fi
   - gem install xcpretty --no-document
-  - carthage bootstrap --no-use-binaries
+  - carthage bootstrap --no-use-binaries --cache-builds
   - SIMULATOR_ID=$(xcrun instruments -s | grep -o "$DEVICE \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
   - echo "$SIMULATOR_ID"
 before_deploy:
   - carthage build --no-skip-current
   - carthage archive PusherSwift
+  - carthage archive PusherSwiftWithEncryption
 deploy:
   provider: releases
   api_key:
     secure: cjodA0I5fTEU60M+W1NNCj18EpL7yt3uxLN1aeexN33HfRoo153oi4jV/FWlPtQ4QC5FhFF+Nbc69V2paOSrI4iht+UB2Hb0jYTuHWv8ecYa33GFksl7zD9BCf8D3RZqIagTzJC7Vf0FqKKlspZMwIMAL02Z5uwsp5h4Zjrq8lo=
-  file: PusherSwift.framework.zip
+  file:
+    - PusherSwift.framework.zip
+    - PusherSwiftWithEncryption.framework.zip
   skip_cleanup: true
   on:
     repo: pusher/pusher-websocket-swift
@@ -35,10 +41,15 @@ script:
   - xcodebuild -version
   - xcodebuild -workspace PusherSwift.xcworkspace -list
   - if [ "$DST" != "platform=OS X" ]; then
-      echo "$SIMULARTOR_ID";
+      echo "$SIMULATOR_ID";
       open -a "simulator" --args -CurrentDeviceUDID $SIMULATOR_ID || true; sleep 20;
     fi
   - 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;
+  - if [[ "$DST" != "platform=tvOS"* ]]; then
+      xcodebuild -scheme PusherSwiftWithEncryption -destination "$DST" -project PusherSwift.xcodeproj clean build | xcpretty -tc;
+      xcodebuild -scheme PusherSwiftWithEncryption -destination "$DST" -project PusherSwift.xcodeproj -enableCodeCoverage YES $ACTION | xcpretty -tc;
+    fi
 after_success:
   - sleep 5
+  - bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -4,7 +4,42 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/pusher/pusher-websocket-swift/compare/7.0.0...HEAD)
+## [Unreleased](https://github.com/pusher/pusher-websocket-swift/compare/8.0.0...HEAD)
+
+## [8.0.0](https://github.com/pusher/pusher-websocket-swift/compare/7.2.0...8.0.0) - 2020-04-27
+
+### Added
+
+- Added support for [end-to-end encryption](https://pusher.com/docs/channels/using_channels/encrypted-channels). There is a new target: `PusherSwiftWithEncryption` and a new dependency for that target `Sodium`. The original `PusherSwift` target does not require `Sodium` and has all the same features as `PusherSwiftWithEncryption` except the ability to decrypt events. You can find details about how to use `PusherSwiftWithEncryption` in the [README](https://github.com/pusher/pusher-websocket-swift#private-encrypted-channels-beta). As part of this feature, there is a new function in the `PusherDelegate`: `failedToDecryptEvent`, and channel names prefixed with `private-encrypted-` are now interpreted as encrypted channels in both targets.
+
+### Changed
+
+- The `encrypted` parameter for `PusherClientOptions` has been renamed to `useTLS`. Its behavior and default value (`true`) are unchanged.
+- Updated to Swift 5.0 and updated dependencies ([@JonathanDowning](https://github.com/JonathanDowning)).
+
+### Removed
+
+- CryptoSwift is no longer a dependency.
+
+## [7.2.0](https://github.com/pusher/pusher-websocket-swift/compare/7.1.0...7.2.0) - 2019-10-18
+
+### Added
+
+- Added support for Swift Package Manager ([@JonathanDowning](https://github.com/JonathanDowning)).
+
+### Fixed
+
+- Fixed a compilation warning caused by incorrect parameter names in documentation comments ([@funkyboy](https://github.com/funkyboy)).
+
+## [7.1.0](https://github.com/pusher/pusher-websocket-swift/compare/7.0.0...7.1.0) - 2019-10-03
+
+### Added
+
+- Added new `bind` functions which accept a callback that receives a `PusherEvent`. A `PusherEvent` represents an event received from the websocket and has properties containing the event name, channel name and data. In addition, `PusherEvent` has a new property, `userId`, which allows you to verify the ID of the user who triggered a client event on a presence channel. You can read more about this feature in [the docs](https://pusher.com/docs/channels/using_channels/events#user-id-in-client-events). All the old `bind` functions are still available for backwards compatibility. The `data` property of `PusherEvent` is not automatically parsed from JSON and you can decide to parse that as required. The parsing behaviour is unchanged for data passed to callbacks bound by the old `bind` functions.
+
+### Changed
+
+- Updated the deployment targets so they are consistent regardless of whether you import the library using CocoaPods or Carthage.
 
 ## [7.0.0](https://github.com/pusher/pusher-websocket-swift/compare/6.1.0...7.0.0) - 2019-04-16
 

Cartfile

@@ -1,3 +1,3 @@
-github "krzyzanowskim/CryptoSwift" ~> 0.15.0
-github "ashleymills/Reachability.swift" == 4.3.0
-github "daltoniam/Starscream" == 3.0.6
+github "ashleymills/Reachability.swift" ~> 5.0.0
+github "daltoniam/Starscream" ~> 3.1.0
+github "jedisct1/swift-sodium" == 0.8.0

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "ashleymills/Reachability.swift" "v4.3.0"
-github "daltoniam/Starscream" "3.0.6"
-github "krzyzanowskim/CryptoSwift" "0.15.0"
+github "ashleymills/Reachability.swift" "v5.0.0"
+github "daltoniam/Starscream" "3.1.1"
+github "jedisct1/swift-sodium" "0.8.0"

Consumption-Tests/.gitignore

@@ -0,0 +1,18 @@
+
+
+# Cartfile's are autogenerated with the `checkout.sh` script
+# We do not want to version anything Carthage related to emulate a fresh Carthage checkout
+Cartfile
+Cartfile.resolved
+Carthage
+
+
+# Podfile's are autogenerated with the `checkout.sh` script
+# We do not want to version anything Cocoapods related to emulate a fresh Cocoapods checkout
+Podfile
+Podfile.lock
+Pods
+
+# We do not want to version anything SPM related to emulate a fresh SPM checkout
+Package.resolved
+

Consumption-Tests/Carthage-Latest/Carthage-Latest.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>