Skip to content

Commit 5465941

Browse files
author
Roberto Casula
committed
Merge branch 'pusher-master'
2 parents 7f60762 + 9e8bff7 commit 5465941

File tree

102 files changed

+856
-9549
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+856
-9549
lines changed

CHANGELOG.md

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,32 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7-
## [Unreleased](https://github.com/pusher/pusher-websocket-swift/compare/9.0.0...HEAD)
7+
## [Unreleased](https://github.com/pusher/pusher-websocket-swift/compare/9.1.1...HEAD)
8+
9+
## [9.1.1](https://github.com/pusher/pusher-websocket-swift/compare/9.1.0...9.1.1) - 2020-12-15
10+
11+
### Fixed
12+
13+
- Resolved a race condition that could prevent automatic reconnection attempts in certain circumstances.
14+
15+
## [9.1.0](https://github.com/pusher/pusher-websocket-swift/compare/9.0.0...9.1.0) - 2020-12-07
16+
17+
### Added
18+
19+
- Encrypted channels are now support by default by the `PusherSwift` target.
20+
- Encrypted channels are now supported if integrating the SDK via Swift Package Manager.
21+
- tvOS as a target platform is now supported regardless of if encrypted channels are used.
22+
- [tweetnacl-swiftwrap](https://github.com/bitmark-inc/tweetnacl-swiftwrap) is now a dependency.
23+
24+
### Changed
25+
26+
- Migrated the WebSocket client code to use our [NWWebSocket](https://github.com/pusher/NWWebSocket) library.
27+
- Improvements to WebSocket reconnection functionality for unstable connections, or connections which migrate from Wi-Fi to Cellular (or vice versa).
28+
29+
### Removed
30+
31+
- The `PusherSwiftWithEncryption` target has been removed.
32+
- Reachability is no longer a dependency.
833

934
## [9.0.0](https://github.com/pusher/pusher-websocket-swift/compare/8.0.0...9.0.0) - 2020-10-09
1035

@@ -54,7 +79,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
5479

5580
### Added
5681

57-
- 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.
82+
- 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 behavior is unchanged for data passed to callbacks bound by the old `bind` functions.
5883

5984
### Changed
6085

Cartfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
github "ashleymills/Reachability.swift" ~> 5.0.0
2-
github "jedisct1/swift-sodium" == 0.8.0
3-
github "pusher/NWWebSocket" ~> 0.3.0
1+
github "bitmark-inc/tweetnacl-swiftwrap" ~> 1.0
2+
github "pusher/NWWebSocket" ~> 0.5.1

Cartfile.resolved

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
github "ashleymills/Reachability.swift" "v5.0.0"
2-
github "jedisct1/swift-sodium" "0.8.0"
3-
github "pusher/NWWebSocket" "0.3.0"
1+
github "bitmark-inc/tweetnacl-swiftwrap" "1.0.2"
2+
github "pusher/NWWebSocket" "0.5.1"

Consumption-Tests/Carthage-Latest/ObjectiveC.xcodeproj/project.pbxproj

Lines changed: 11 additions & 399 deletions
Large diffs are not rendered by default.

Consumption-Tests/Carthage-Latest/ObjectiveC.xcodeproj/xcshareddata/xcschemes/ObjectiveC-iOS-WithoutEncryption.xcscheme

Lines changed: 0 additions & 78 deletions
This file was deleted.

Consumption-Tests/Carthage-Latest/ObjectiveC.xcodeproj/xcshareddata/xcschemes/ObjectiveC-macOS-WithoutEncryption.xcscheme

Lines changed: 0 additions & 78 deletions
This file was deleted.

Consumption-Tests/Carthage-Latest/ObjectiveC.xcodeproj/xcshareddata/xcschemes/ObjectiveC-tvOS-WithoutEncryption.xcscheme

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)