Skip to content

Commit

Permalink
Merge pull request #324 from pusher/release/9.1.1
Browse files Browse the repository at this point in the history
v9.1.1
  • Loading branch information
danielrbrowne authored Dec 15, 2020
2 parents 61a896b + 96d9f96 commit d405b36
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 15 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "bitmark-inc/tweetnacl-swiftwrap" ~> 1.0
github "pusher/NWWebSocket" ~> 0.5.0
github "pusher/NWWebSocket" ~> 0.5.1
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "bitmark-inc/tweetnacl-swiftwrap" "1.0.2"
github "pusher/NWWebSocket" "0.5.0"
github "pusher/NWWebSocket" "0.5.1"
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
4 changes: 2 additions & 2 deletions PusherSwift.podspec
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions PusherSwiftWithEncryption.podspec
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion Sources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>9.1.0</string>
<string>9.1.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Sources/PusherSwift.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion Tests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>9.1.0</string>
<string>9.1.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Tests/Integration/PusherClientInitializationTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down

0 comments on commit d405b36

Please sign in to comment.