Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
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.2
github "pusher/NWWebSocket" ~> 0.5.3
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.1.0"
github "pusher/NWWebSocket" "0.5.2"
github "pusher/NWWebSocket" "0.5.3"
4 changes: 2 additions & 2 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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.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: [
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 = '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'
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.2'
s.dependency 'NWWebSocket', '~> 0.5.3'

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 = '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'
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.2'
s.dependency 'NWWebSocket', '~> 0.5.3'

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 @@ -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

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>10.1.2</string>
<string>10.1.3</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 = "10.1.2"
let VERSION = "10.1.3"
// 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>10.1.2</string>
<string>10.1.3</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 = "10.1.2"
let VERSION = "10.1.3"

class ClientInitializationTests: XCTestCase {
private var key: String!
Expand Down