diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54d3cb6f..45bd48de 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
- os: ['tvOS', 'watchOS', 'iOS']
+ os: ['tvOS', 'iOS']
steps:
- uses: actions/checkout@v2
- uses: maxim-lobanov/setup-xcode@v1
diff --git a/.swiftlint.yml b/.swiftlint.yml
index 2cdf707e..eae5ac23 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -17,6 +17,10 @@ opt_in_rules:
- unneeded_parentheses_in_closure_argument
- vertical_whitespace_between_cases
- vertical_whitespace_closing_braces
+ - redundant_objc_attribute
+
+disabled_rules:
+ - redundant_objc_attribute
identifier_name:
excluded:
diff --git a/Cartfile b/Cartfile
index c596633f..0b3d6ad1 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,2 +1,2 @@
github "bitmark-inc/tweetnacl-swiftwrap" ~> 1.0
-github "pusher/NWWebSocket" ~> 0.5.2
+github "pusher/NWWebSocket" ~> 0.5.3
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 17ecbe0e..e232733b 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,2 +1,2 @@
github "bitmark-inc/tweetnacl-swiftwrap" "1.1.0"
-github "pusher/NWWebSocket" "0.5.2"
+github "pusher/NWWebSocket" "0.5.3"
diff --git a/Package.resolved b/Package.resolved
index a318f3c8..54a94f5c 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/pusher/NWWebSocket.git",
"state": {
"branch": null,
- "revision": "eed470bc3607bc4893046f461107ec463dbd1220",
- "version": "0.5.2"
+ "revision": "19d23951c8099304ad98e2fc762fa23d6bfab0b9",
+ "version": "0.5.3"
}
},
{
diff --git a/Package.swift b/Package.swift
index 1eabbfe2..e5835c7c 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.2")),
+ .package(url: "https://github.com/pusher/NWWebSocket.git", .upToNextMajor(from: "0.5.3")),
.package(url: "https://github.com/bitmark-inc/tweetnacl-swiftwrap", .upToNextMajor(from: "1.0.0")),
],
targets: [
diff --git a/PusherSwift.podspec b/PusherSwift.podspec
index 790cb362..de5378e5 100644
--- a/PusherSwift.podspec
+++ b/PusherSwift.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'PusherSwift'
- s.version = '10.1.2'
+ s.version = '10.1.3'
s.summary = 'A Pusher client library in Swift'
s.homepage = 'https://github.com/pusher/pusher-websocket-swift'
s.license = 'MIT'
@@ -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.2'
+ s.dependency 'NWWebSocket', '~> 0.5.3'
s.ios.deployment_target = '13.0'
s.osx.deployment_target = '10.15'
diff --git a/PusherSwiftWithEncryption.podspec b/PusherSwiftWithEncryption.podspec
index 185f05c4..fcac392c 100644
--- a/PusherSwiftWithEncryption.podspec
+++ b/PusherSwiftWithEncryption.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'PusherSwiftWithEncryption'
- s.version = '10.1.2'
+ s.version = '10.1.3'
s.summary = 'A Pusher client library in Swift that supports encrypted channels'
s.homepage = 'https://github.com/pusher/pusher-websocket-swift'
s.license = 'MIT'
@@ -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.2'
+ s.dependency 'NWWebSocket', '~> 0.5.3'
s.ios.deployment_target = '13.0'
s.osx.deployment_target = '10.15'
diff --git a/README.md b/README.md
index 0ceb42a6..b0eb4334 100644
--- a/README.md
+++ b/README.md
@@ -1163,7 +1163,7 @@ For full details see the [client events documentation](https://pusher.com/docs/c
There are a set of tests for the library that can be run using the standard method (Command-U in Xcode).
-The tests also get run on [Travis-CI](https://travis-ci.org/pusher/pusher-websocket-swift). See [.travis.yml](https://github.com/pusher/pusher-websocket-swift/blob/master/.travis.yml) for details on how the Travis tests are run.
+The tests also get run on Github Actions, see [CI Action](https://github.com/pusher/pusher-websocket-swift/actions/workflows/ci.yml)
## Extensions
diff --git a/Sources/Info.plist b/Sources/Info.plist
index bc16c372..fda686f7 100644
--- a/Sources/Info.plist
+++ b/Sources/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 10.1.2
+ 10.1.3
CFBundleSignature
????
CFBundleVersion
diff --git a/Sources/PusherSwift.swift b/Sources/PusherSwift.swift
index 519ee3e1..7b0b7ced 100644
--- a/Sources/PusherSwift.swift
+++ b/Sources/PusherSwift.swift
@@ -2,7 +2,7 @@ import Foundation
import NWWebSocket
let PROTOCOL = 7
-let VERSION = "10.1.2"
+let VERSION = "10.1.3"
// swiftlint:disable:next identifier_name
let CLIENT_NAME = "pusher-websocket-swift"
diff --git a/Tests/Info.plist b/Tests/Info.plist
index a18c993c..c9883d6d 100644
--- a/Tests/Info.plist
+++ b/Tests/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 10.1.2
+ 10.1.3
CFBundleSignature
????
CFBundleVersion
diff --git a/Tests/Integration/PusherClientInitializationTests.swift b/Tests/Integration/PusherClientInitializationTests.swift
index e3edb142..9792f58f 100644
--- a/Tests/Integration/PusherClientInitializationTests.swift
+++ b/Tests/Integration/PusherClientInitializationTests.swift
@@ -2,7 +2,7 @@ import XCTest
@testable import PusherSwift
-let VERSION = "10.1.2"
+let VERSION = "10.1.3"
class ClientInitializationTests: XCTestCase {
private var key: String!