From 61e0d9d85fd0be02370c7ecb274f3dc1b312544a Mon Sep 17 00:00:00 2001 From: Daniel Browne Date: Thu, 11 Mar 2021 11:23:31 +0000 Subject: [PATCH 1/2] Update NWWebSocket to v0.5.2 - This brings in a fix for an issue where App Store submissions would fail for users integrating using Carthage (and possibly also Cocoapods). --- 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 002a03b9..c596633f 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ github "bitmark-inc/tweetnacl-swiftwrap" ~> 1.0 -github "pusher/NWWebSocket" ~> 0.5.1 +github "pusher/NWWebSocket" ~> 0.5.2 diff --git a/Cartfile.resolved b/Cartfile.resolved index 286d4581..07e6f92d 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ github "bitmark-inc/tweetnacl-swiftwrap" "1.0.2" -github "pusher/NWWebSocket" "0.5.1" +github "pusher/NWWebSocket" "0.5.2" diff --git a/Package.resolved b/Package.resolved index 75d8a27a..a318f3c8 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/pusher/NWWebSocket.git", "state": { "branch": null, - "revision": "f62ab0ace742531ad8f99355823fa8429fac4bbe", - "version": "0.5.1" + "revision": "eed470bc3607bc4893046f461107ec463dbd1220", + "version": "0.5.2" } }, { diff --git a/Package.swift b/Package.swift index 0f7f889b..144e3adf 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.1")), + .package(url: "https://github.com/pusher/NWWebSocket.git", .upToNextMajor(from: "0.5.2")), .package(url: "https://github.com/bitmark-inc/tweetnacl-swiftwrap", .upToNextMajor(from: "1.0.0")), ], targets: [ diff --git a/PusherSwift.podspec b/PusherSwift.podspec index 3a9ddea9..5ef4f355 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.1' + s.dependency 'NWWebSocket', '~> 0.5.2' s.ios.deployment_target = '13.0' s.osx.deployment_target = '10.15' diff --git a/PusherSwiftWithEncryption.podspec b/PusherSwiftWithEncryption.podspec index 0022be76..4c572619 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.1' + s.dependency 'NWWebSocket', '~> 0.5.2' s.ios.deployment_target = '13.0' s.osx.deployment_target = '10.15' From ca6130e552b02865472920b9ff73ee98a890fe1f Mon Sep 17 00:00:00 2001 From: Daniel Browne Date: Thu, 11 Mar 2021 12:26:17 +0000 Subject: [PATCH 2/2] v9.2.2 --- 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 6b2fc518..eac262db 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.2.1...HEAD) +## [Unreleased](https://github.com/pusher/pusher-websocket-swift/compare/9.2.2...HEAD) + +## [9.2.2](https://github.com/pusher/pusher-websocket-swift/compare/9.2.1...9.2.2) - 2021-03-11 + +### Fixed + +- Resolved an issue preventing App Store submission when integrating the SDK using certain dependency managers. ## [9.2.1](https://github.com/pusher/pusher-websocket-swift/compare/9.2.0...9.2.1) - 2021-03-04 diff --git a/PusherSwift.podspec b/PusherSwift.podspec index 5ef4f355..bf530c19 100644 --- a/PusherSwift.podspec +++ b/PusherSwift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'PusherSwift' - s.version = '9.2.1' + s.version = '9.2.2' 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 4c572619..04f80b13 100644 --- a/PusherSwiftWithEncryption.podspec +++ b/PusherSwiftWithEncryption.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'PusherSwiftWithEncryption' - s.version = '9.2.1' + s.version = '9.2.2' 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 cbce0580..2ab96403 100644 --- a/README.md +++ b/README.md @@ -150,7 +150,7 @@ let package = Package( targets: ["YourPackage"]), ], dependencies: [ - .package(url: "https://github.com/pusher/pusher-websocket-swift.git", from: "9.2.1"), + .package(url: "https://github.com/pusher/pusher-websocket-swift.git", from: "9.2.2"), ], targets: [ .target( diff --git a/Sources/Info.plist b/Sources/Info.plist index b9ba7707..ad9e566d 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 9.2.1 + 9.2.2 CFBundleSignature ???? CFBundleVersion diff --git a/Sources/PusherSwift.swift b/Sources/PusherSwift.swift index e61d13ac..3552c4da 100644 --- a/Sources/PusherSwift.swift +++ b/Sources/PusherSwift.swift @@ -2,7 +2,7 @@ import Foundation import NWWebSocket let PROTOCOL = 7 -let VERSION = "9.2.1" +let VERSION = "9.2.2" // swiftlint:disable:next identifier_name let CLIENT_NAME = "pusher-websocket-swift" diff --git a/Tests/Info.plist b/Tests/Info.plist index 5a6b9f11..85cbe3cd 100644 --- a/Tests/Info.plist +++ b/Tests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 9.2.1 + 9.2.2 CFBundleSignature ???? CFBundleVersion diff --git a/Tests/Integration/PusherClientInitializationTests.swift b/Tests/Integration/PusherClientInitializationTests.swift index c31cf581..bc3ee34b 100644 --- a/Tests/Integration/PusherClientInitializationTests.swift +++ b/Tests/Integration/PusherClientInitializationTests.swift @@ -2,7 +2,7 @@ import XCTest @testable import PusherSwift -let VERSION = "9.2.1" +let VERSION = "9.2.2" class ClientInitializationTests: XCTestCase { private var key: String!