From 888e781b3171ed6c44824b0660a26a63e9f94334 Mon Sep 17 00:00:00 2001 From: Daniel Browne Date: Tue, 15 Dec 2020 10:15:44 +0000 Subject: [PATCH 1/2] Update to v0.5.1 of 'NWWebSocket' - This brings in the race condition fix for reconnection attempts --- Cartfile | 2 +- Cartfile.resolved | 2 +- Package.resolved | 4 ++-- Package.swift | 2 +- PusherSwift.podspec | 2 +- PusherSwiftWithEncryption.podspec | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cartfile b/Cartfile index 59028230..002a03b9 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ github "bitmark-inc/tweetnacl-swiftwrap" ~> 1.0 -github "pusher/NWWebSocket" ~> 0.5.0 +github "pusher/NWWebSocket" ~> 0.5.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index ec11a86f..286d4581 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ github "bitmark-inc/tweetnacl-swiftwrap" "1.0.2" -github "pusher/NWWebSocket" "0.5.0" +github "pusher/NWWebSocket" "0.5.1" diff --git a/Package.resolved b/Package.resolved index b8ba48ac..75d8a27a 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/pusher/NWWebSocket.git", "state": { "branch": null, - "revision": "1e433614ac85aba7928320ecd9279b375dce1333", - "version": "0.5.0" + "revision": "f62ab0ace742531ad8f99355823fa8429fac4bbe", + "version": "0.5.1" } }, { diff --git a/Package.swift b/Package.swift index 008e6b60..0f7f889b 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let package = Package( .library(name: "PusherSwift", targets: ["PusherSwift"]) ], dependencies: [ - .package(url: "https://github.com/pusher/NWWebSocket.git", .upToNextMajor(from: "0.5.0")), + .package(url: "https://github.com/pusher/NWWebSocket.git", .upToNextMajor(from: "0.5.1")), .package(url: "https://github.com/bitmark-inc/tweetnacl-swiftwrap", .upToNextMajor(from: "1.0.0")), ], targets: [ diff --git a/PusherSwift.podspec b/PusherSwift.podspec index 011d1a6d..ce4becb7 100644 --- a/PusherSwift.podspec +++ b/PusherSwift.podspec @@ -13,7 +13,7 @@ Pod::Spec.new do |s| s.source_files = ['Sources/**/*.swift'] s.dependency 'TweetNacl', '~> 1.0.0' - s.dependency 'NWWebSocket', '~> 0.5.0' + s.dependency 'NWWebSocket', '~> 0.5.1' s.ios.deployment_target = '13.0' s.osx.deployment_target = '10.15' diff --git a/PusherSwiftWithEncryption.podspec b/PusherSwiftWithEncryption.podspec index 013ecde2..4b4f33af 100644 --- a/PusherSwiftWithEncryption.podspec +++ b/PusherSwiftWithEncryption.podspec @@ -13,7 +13,7 @@ Pod::Spec.new do |s| s.source_files = ['Sources/**/*.swift'] s.dependency 'TweetNacl', '~> 1.0.0' - s.dependency 'NWWebSocket', '~> 0.5.0' + s.dependency 'NWWebSocket', '~> 0.5.1' s.ios.deployment_target = '13.0' s.osx.deployment_target = '10.15' From 96d9f9605a7101875b6dfcc4532913342b1a82ae Mon Sep 17 00:00:00 2001 From: Daniel Browne Date: Tue, 15 Dec 2020 10:55:11 +0000 Subject: [PATCH 2/2] v9.1.1 --- CHANGELOG.md | 8 +++++++- PusherSwift.podspec | 2 +- PusherSwiftWithEncryption.podspec | 2 +- README.md | 2 +- Sources/Info.plist | 2 +- Sources/PusherSwift.swift | 2 +- Tests/Info.plist | 2 +- Tests/Integration/PusherClientInitializationTests.swift | 2 +- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b09f521..3f6efe9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,13 @@ 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/9.1.0...HEAD) +## [Unreleased](https://github.com/pusher/pusher-websocket-swift/compare/9.1.1...HEAD) + +## [9.1.1](https://github.com/pusher/pusher-websocket-swift/compare/9.1.0...9.1.1) - 2020-12-15 + +### Fixed + +- Resolved a race condition that could prevent automatic reconnection attempts in certain circumstances. ## [9.1.0](https://github.com/pusher/pusher-websocket-swift/compare/9.0.0...9.1.0) - 2020-12-07 diff --git a/PusherSwift.podspec b/PusherSwift.podspec index ce4becb7..f191558c 100644 --- a/PusherSwift.podspec +++ b/PusherSwift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'PusherSwift' - s.version = '9.1.0' + s.version = '9.1.1' s.summary = 'A Pusher client library in Swift' s.homepage = 'https://github.com/pusher/pusher-websocket-swift' s.license = 'MIT' diff --git a/PusherSwiftWithEncryption.podspec b/PusherSwiftWithEncryption.podspec index 4b4f33af..2f8a5c51 100644 --- a/PusherSwiftWithEncryption.podspec +++ b/PusherSwiftWithEncryption.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'PusherSwiftWithEncryption' - s.version = '9.1.0' + s.version = '9.1.1' s.summary = 'A Pusher client library in Swift that supports encrypted channels' s.homepage = 'https://github.com/pusher/pusher-websocket-swift' s.license = 'MIT' diff --git a/README.md b/README.md index d96199c0..19d81b0e 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,7 @@ let package = Package( targets: ["YourPackage"]), ], dependencies: [ - .package(url: "https://github.com/pusher/pusher-websocket-swift.git", from: "9.1.0"), + .package(url: "https://github.com/pusher/pusher-websocket-swift.git", from: "9.1.1"), ], targets: [ .target( diff --git a/Sources/Info.plist b/Sources/Info.plist index 2c318313..d5383ef8 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 9.1.0 + 9.1.1 CFBundleSignature ???? CFBundleVersion diff --git a/Sources/PusherSwift.swift b/Sources/PusherSwift.swift index dc1a8569..431f3326 100644 --- a/Sources/PusherSwift.swift +++ b/Sources/PusherSwift.swift @@ -2,7 +2,7 @@ import Foundation import NWWebSocket let PROTOCOL = 7 -let VERSION = "9.1.0" +let VERSION = "9.1.1" // swiftlint:disable:next identifier_name let CLIENT_NAME = "pusher-websocket-swift" diff --git a/Tests/Info.plist b/Tests/Info.plist index b437fa41..984319bc 100644 --- a/Tests/Info.plist +++ b/Tests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 9.1.0 + 9.1.1 CFBundleSignature ???? CFBundleVersion diff --git a/Tests/Integration/PusherClientInitializationTests.swift b/Tests/Integration/PusherClientInitializationTests.swift index 6e1cfd15..266f537f 100644 --- a/Tests/Integration/PusherClientInitializationTests.swift +++ b/Tests/Integration/PusherClientInitializationTests.swift @@ -2,7 +2,7 @@ import XCTest @testable import PusherSwift -let VERSION = "9.1.0" +let VERSION = "9.1.1" class ClientInitializationTests: XCTestCase { var key: String!