Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: starscream upgrade to 4.0.8, iOS min 12 #159

Merged
merged 1 commit into from
Apr 16, 2024
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
4 changes: 2 additions & 2 deletions AppSyncRealTimeClient.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ Pod::Spec.new do |s|
s.homepage = 'https://aws.amazon.com/amplify/'
s.license = 'Apache License, Version 2.0'
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
s.platform = :ios, '9.0'
s.platform = :ios, '12.0'
s.source = { :git => 'https://github.com/aws-amplify/aws-appsync-realtime-client-ios.git', :tag => s.version}
s.swift_version = '5.1'

s.requires_arc = true

s.source_files = 'AppSyncRealTimeClient/**/*.swift'
s.dependency 'Starscream', '4.0.6'
s.dependency 'Starscream', '4.0.8'
end
6 changes: 4 additions & 2 deletions AppSyncRealTimeClient.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = AppSyncRealTimeClient/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1542,7 +1542,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = AppSyncRealTimeClient/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1564,6 +1564,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = W3DRXD72QU;
INFOPLIST_FILE = AppSyncRealTimeClientTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1584,6 +1585,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = W3DRXD72QU;
INFOPLIST_FILE = AppSyncRealTimeClientTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Starscream

/// Extension to handle delegate callback from Starscream
extension StarscreamAdapter: Starscream.WebSocketDelegate {
public func didReceive(event: WebSocketEvent, client: WebSocket) {
public func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocketClient) {
switch event {
case .connected:
websocketDidConnect(socket: client)
Expand All @@ -33,6 +33,8 @@ extension StarscreamAdapter: Starscream.WebSocketDelegate {
websocketDidDisconnect(socket: client, error: nil)
case .error(let error):
websocketDidDisconnect(socket: client, error: error)
case .peerClosed:
websocketDidDisconnect(socket: client, error: nil)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class StarscreamAdapter: AppSyncWebsocketProvider {
}

let watchOSConnectivityTimer: CountdownTimer

public init() {
let serialQueue = DispatchQueue(label: "com.amazonaws.StarscreamAdapter.serialQueue")
let callbackQueue = DispatchQueue(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ class ConnectionProviderStaleConnectionTests: RealtimeConnectionProviderTestBase
/// - Connectivity updates to satisfied (network is back up)
/// - Then:
/// - Websocket is disconnected
func testConnectionDisconnectsAfterConnectivityUpdates() {
func testConnectionDisconnectsAfterConnectivityUpdates() throws {
#if os(watchOS)
throw XCTSkip("Disabled on watchOS since connectivity monitor is disabled.")
#endif
receivedNotConnected.isInverted = true
receivedError.isInverted = true

Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "daltoniam/starscream" == 4.0.6
github "daltoniam/starscream" == 4.0.8
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/daltoniam/Starscream",
"state": {
"branch": null,
"revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33",
"version": "4.0.6"
"revision": "c6bfd1af48efcc9a9ad203665db12375ba6b145a",
"version": "4.0.8"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let package = Package(
targets: ["AppSyncRealTimeClient"]),
],
dependencies: [
.package(url: "https://github.com/daltoniam/Starscream", .exact("4.0.6"))
.package(url: "https://github.com/daltoniam/Starscream", .exact("4.0.8"))
],
targets: [
.target(
Expand Down
4 changes: 2 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment the next line to define a global platform for your project
platform :ios, '13.0'
platform :ios, '12.0'

def include_build_tools!
pod 'SwiftFormat/CLI', "~> 0.49.0"
Expand All @@ -13,7 +13,7 @@ target 'AppSyncRealTimeClient' do
# Pods for AppSyncRealTimeClient

# If you update this dependency version, be sure to update the Cartfile also
pod "Starscream", "4.0.6"
pod "Starscream", "4.0.8"

include_build_tools!

Expand Down
10 changes: 5 additions & 5 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PODS:
- Starscream (4.0.6)
- Starscream (4.0.8)
- SwiftFormat/CLI (0.49.18)
- SwiftLint (0.51.0)

DEPENDENCIES:
- Starscream (= 4.0.6)
- Starscream (= 4.0.8)
- SwiftFormat/CLI (~> 0.49.0)
- SwiftLint

Expand All @@ -15,10 +15,10 @@ SPEC REPOS:
- SwiftLint

SPEC CHECKSUMS:
Starscream: fb2c4510bebf908c62bd383bcf05e673720e91fd
Starscream: 19b5533ddb925208db698f0ac508a100b884a1b9
SwiftFormat: 2402d29b26746f169cce5454d5af88314cbb2e35
SwiftLint: 1b7561918a19e23bfed960e40759086e70f4dba5

PODFILE CHECKSUM: 18a2d10b11b24dce612d4399e16e3ab10b872058
PODFILE CHECKSUM: 43515608e1fa3b2e846584f8cdea05e80181bbe3

COCOAPODS: 1.14.3
COCOAPODS: 1.15.2
10 changes: 5 additions & 5 deletions Pods/Manifest.lock

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

Loading
Loading