From 2d9126511e5f2658a355d2d512e0a724b9aeb3ce Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 14:47:30 -0500 Subject: [PATCH 01/18] Update starscream to latest --- Cartfile | 2 +- Cartfile.resolved | 4 +- .../ParseLiveQuery.xcodeproj/project.pbxproj | 8 +-- Sources/ParseLiveQuery/Client.swift | 23 +++++---- .../Internal/ClientPrivate.swift | 51 ++++++++++--------- 5 files changed, 47 insertions(+), 41 deletions(-) diff --git a/Cartfile b/Cartfile index 41c800aa..bb1106ae 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "BoltsFramework/Bolts-Swift" >= 1.5.0 github "ParsePlatform/Parse-SDK-iOS-OSX" >= 1.19.0 -github "daltoniam/Starscream" == 3.1.1 +github "daltoniam/Starscream" >= 4.0.4 diff --git a/Cartfile.resolved b/Cartfile.resolved index 7cc709d8..f1caa86f 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "BoltsFramework/Bolts-ObjC" "1.9.1" github "BoltsFramework/Bolts-Swift" "1.5.0" -github "ParsePlatform/Parse-SDK-iOS-OSX" "1.19.0" -github "daltoniam/Starscream" "3.1.1" +github "ParsePlatform/Parse-SDK-iOS-OSX" "1.19.1" +github "daltoniam/Starscream" "4.0.4" github "facebook/facebook-objc-sdk" "v6.5.2" diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 7719acaa..c80c74ae 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -891,7 +891,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MACOSX_DEPLOYMENT_TARGET = 10.12; ONLY_ACTIVE_ARCH = YES; SWIFT_OBJC_BRIDGING_HEADER = ""; @@ -928,7 +928,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MACOSX_DEPLOYMENT_TARGET = 10.12; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -1003,7 +1003,7 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = ParseLiveQuery/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 2.7.2; @@ -1032,7 +1032,7 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = ParseLiveQuery/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 2.7.2; diff --git a/Sources/ParseLiveQuery/Client.swift b/Sources/ParseLiveQuery/Client.swift index f24331bf..031c98c7 100644 --- a/Sources/ParseLiveQuery/Client.swift +++ b/Sources/ParseLiveQuery/Client.swift @@ -154,14 +154,19 @@ extension Client { ) subscriptions.append(subscriptionRecord) - if let socket = socket, socket.isConnected == true { - _ = sendOperationAsync(.subscribe(requestId: subscriptionRecord.requestId, query: query as! PFQuery, - sessionToken: PFUser.current()?.sessionToken)) - } else { - if !userDisconnected { - reconnect() - } else { - NSLog("ParseLiveQuery: Warning: The client was explicitly disconnected! You must explicitly call .reconnect() in order to process your subscriptions.") + if let socket = socket { + socket.onEvent = { event in + switch event { + case .connected(_): + _ = self.sendOperationAsync(.subscribe(requestId: subscriptionRecord.requestId, query: query as! PFQuery, + sessionToken: PFUser.current()?.sessionToken)) + default: + if !self.userDisconnected { + self.reconnect() + } else { + NSLog("ParseLiveQuery: Warning: The client was explicitly disconnected! You must explicitly call .reconnect() in order to process your subscriptions.") + } + } } } @@ -233,7 +238,7 @@ extension Client { guard socket == nil || !isConnecting else { return } socket?.disconnect() socket = { - let socket = WebSocket(url: host) + let socket = WebSocket(request: .init(url: host)) socket.delegate = self socket.callbackQueue = queue socket.connect() diff --git a/Sources/ParseLiveQuery/Internal/ClientPrivate.swift b/Sources/ParseLiveQuery/Internal/ClientPrivate.swift index ad19610d..df3075b1 100644 --- a/Sources/ParseLiveQuery/Internal/ClientPrivate.swift +++ b/Sources/ParseLiveQuery/Internal/ClientPrivate.swift @@ -115,32 +115,33 @@ func == (first: Client.RequestId, second: Client.RequestId) -> Bool { // --------------- extension Client: WebSocketDelegate { - - public func websocketDidReceiveData(socket: WebSocketClient, data: Data) { - if shouldPrintWebSocketLog { NSLog("ParseLiveQuery: Received binary data but we don't handle it...") } - } - - public func websocketDidReceiveMessage(socket: WebSocketClient, text: String) { - handleOperationAsync(text).continueWith { [weak self] task in - if let error = task.error, self?.shouldPrintWebSocketLog == true { - NSLog("ParseLiveQuery: Error processing message: \(error)") + public func didReceive(event: WebSocketEvent, client: WebSocket) { + switch event { + + case .connected(_): + isConnecting = false + let sessionToken = PFUser.current()?.sessionToken ?? "" + _ = self.sendOperationAsync(.connect(applicationId: applicationId, sessionToken: sessionToken, clientKey: clientKey)) + case .disconnected(let reason, let code): + isConnecting = false + if shouldPrintWebSocketLog { NSLog("ParseLiveQuery: WebSocket did disconnect with error: \(reason) code:\(code)") } + + // TODO: Better retry logic, unless `disconnect()` was explicitly called + if !userDisconnected { + reconnect() } - } - } - - public func websocketDidConnect(socket: WebSocketClient) { - isConnecting = false - let sessionToken = PFUser.current()?.sessionToken ?? "" - _ = self.sendOperationAsync(.connect(applicationId: applicationId, sessionToken: sessionToken, clientKey: clientKey)) - } - - public func websocketDidDisconnect(socket: WebSocketClient, error: Error?) { - isConnecting = false - if shouldPrintWebSocketLog { NSLog("ParseLiveQuery: WebSocket did disconnect with error: \(String(describing: error))") } - - // TODO: Better retry logic, unless `disconnect()` was explicitly called - if !userDisconnected { - reconnect() + case .text(let text): + handleOperationAsync(text).continueWith { [weak self] task in + if let error = task.error, self?.shouldPrintWebSocketLog == true { + NSLog("ParseLiveQuery: Error processing message: \(error)") + } + } + case .binary(_): + if shouldPrintWebSocketLog { NSLog("ParseLiveQuery: Received binary data but we don't handle it...") } + case .error(let error): + NSLog("ParseLiveQuery: Error processing message: \(String(describing: error))") + default: + break } } } From a2711b4a40d2c4755c2454d5be35fadd35302087 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 14:58:01 -0500 Subject: [PATCH 02/18] update carthage files --- Carthage/Checkouts/Parse-SDK-iOS-OSX | 2 +- Carthage/Checkouts/Starscream | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX index 931684b3..9d1b958f 160000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -1 +1 @@ -Subproject commit 931684b3dce25ec447d3df38b02e988970663c24 +Subproject commit 9d1b958fc146312b06a571b4ee367106e0b0f9b2 diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream index e6b65c6d..df8d8204 160000 --- a/Carthage/Checkouts/Starscream +++ b/Carthage/Checkouts/Starscream @@ -1 +1 @@ -Subproject commit e6b65c6d9077ea48b4a7bdda8994a1d3c6969c8d +Subproject commit df8d82047f6654d8e4b655d1b1525c64e1059d21 From d3dddc99656cf591b75346d34d7ed340c87104f3 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 16:04:54 -0500 Subject: [PATCH 03/18] Update pod spec --- ParseLiveQuery.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index a5982290..698135ce 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -24,6 +24,6 @@ Pod::Spec.new do |s| s.dependency 'Parse', '~> 1.19.0' s.dependency 'Bolts-Swift', '~> 1.5.0' - s.dependency 'Starscream', '3.1.0' + s.dependency 'Starscream', '~> 4.0.4' end From 073f8fc68ae15078b873db83b65897e24864e91b Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 16:16:13 -0500 Subject: [PATCH 04/18] update podspec --- ParseLiveQuery.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index 698135ce..87a386ba 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.swift_version = '5.0' s.cocoapods_version = '>= 1.4' - s.ios.deployment_target = '8.0' + s.ios.deployment_target = '9.0' s.tvos.deployment_target = '10.0' s.osx.deployment_target = '10.12' From ced8cfb3b70606ecfbddb6a5003fd4e1ff235bc1 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 17:50:11 -0500 Subject: [PATCH 05/18] Add reconnect because of change in logic from dependency --- Sources/ParseLiveQuery/Client.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/ParseLiveQuery/Client.swift b/Sources/ParseLiveQuery/Client.swift index 031c98c7..eb0fefc5 100644 --- a/Sources/ParseLiveQuery/Client.swift +++ b/Sources/ParseLiveQuery/Client.swift @@ -154,6 +154,7 @@ extension Client { ) subscriptions.append(subscriptionRecord) + self.reconnect() if let socket = socket { socket.onEvent = { event in switch event { From 7b6d343f96268adb8ba02c729717a0eb2ff27181 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Mon, 16 Nov 2020 00:16:40 -0500 Subject: [PATCH 06/18] Improve connection logic --- Sources/ParseLiveQuery/Client.swift | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Sources/ParseLiveQuery/Client.swift b/Sources/ParseLiveQuery/Client.swift index eb0fefc5..886a9c97 100644 --- a/Sources/ParseLiveQuery/Client.swift +++ b/Sources/ParseLiveQuery/Client.swift @@ -152,23 +152,23 @@ extension Client { requestId: requestIdGenerator(), handler: handler ) - subscriptions.append(subscriptionRecord) - - self.reconnect() + if let socket = socket { socket.onEvent = { event in switch event { case .connected(_): + self.subscriptions.append(subscriptionRecord) _ = self.sendOperationAsync(.subscribe(requestId: subscriptionRecord.requestId, query: query as! PFQuery, sessionToken: PFUser.current()?.sessionToken)) default: - if !self.userDisconnected { - self.reconnect() - } else { - NSLog("ParseLiveQuery: Warning: The client was explicitly disconnected! You must explicitly call .reconnect() in order to process your subscriptions.") - } + break } } + } else if !self.userDisconnected { + self.reconnect() + return self.subscribe(query, handler: handler) + } else { + NSLog("ParseLiveQuery: Warning: The client was explicitly disconnected! You must explicitly call .reconnect() in order to process your subscriptions.") } return handler From f8fc4353457c25a7d6bc120dbcb51f09d55469ee Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Mon, 16 Nov 2020 01:15:47 -0500 Subject: [PATCH 07/18] Improve connection logic --- Sources/ParseLiveQuery/Client.swift | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/Sources/ParseLiveQuery/Client.swift b/Sources/ParseLiveQuery/Client.swift index 886a9c97..e48e2b34 100644 --- a/Sources/ParseLiveQuery/Client.swift +++ b/Sources/ParseLiveQuery/Client.swift @@ -153,17 +153,10 @@ extension Client { handler: handler ) - if let socket = socket { - socket.onEvent = { event in - switch event { - case .connected(_): - self.subscriptions.append(subscriptionRecord) - _ = self.sendOperationAsync(.subscribe(requestId: subscriptionRecord.requestId, query: query as! PFQuery, - sessionToken: PFUser.current()?.sessionToken)) - default: - break - } - } + if socket != nil { + self.subscriptions.append(subscriptionRecord) + _ = self.sendOperationAsync(.subscribe(requestId: subscriptionRecord.requestId, query: query as! PFQuery, + sessionToken: PFUser.current()?.sessionToken)) } else if !self.userDisconnected { self.reconnect() return self.subscribe(query, handler: handler) From 7018087c02dfd2e2fba979e52d98519bd741417c Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Mon, 16 Nov 2020 01:18:17 -0500 Subject: [PATCH 08/18] Fix subscriptions --- Sources/ParseLiveQuery/Client.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Sources/ParseLiveQuery/Client.swift b/Sources/ParseLiveQuery/Client.swift index e48e2b34..a61a8175 100644 --- a/Sources/ParseLiveQuery/Client.swift +++ b/Sources/ParseLiveQuery/Client.swift @@ -153,12 +153,14 @@ extension Client { handler: handler ) + self.subscriptions.append(subscriptionRecord) + if socket != nil { - self.subscriptions.append(subscriptionRecord) _ = self.sendOperationAsync(.subscribe(requestId: subscriptionRecord.requestId, query: query as! PFQuery, sessionToken: PFUser.current()?.sessionToken)) } else if !self.userDisconnected { self.reconnect() + self.subscriptions.removeLast() return self.subscribe(query, handler: handler) } else { NSLog("ParseLiveQuery: Warning: The client was explicitly disconnected! You must explicitly call .reconnect() in order to process your subscriptions.") From 5020a6a765083dcec1387c25d7ea3e348c566dd7 Mon Sep 17 00:00:00 2001 From: Corey Date: Mon, 16 Nov 2020 12:03:12 -0500 Subject: [PATCH 09/18] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53ecc630..2f748295 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ [Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.2...master) +### 2.8.0 + +[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.2...2.7.3) + +- Bump Starscream dependency to >= 4.0.4 [#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236) [Corey Baker](https://github.com/cbaker6) +- Bump Parse SDK to v.1.19.1 ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)) [Corey Baker](https://github.com/cbaker6) +- Minimum support due to Xcode 12 and dependencies (iOS 9) ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)) [Corey Baker](https://github.com/cbaker6) + + ### 2.7.2 [Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.1...2.7.2) From 27867cab923c8a32bb44935f3d5f7dd755733d9e Mon Sep 17 00:00:00 2001 From: Corey Date: Mon, 16 Nov 2020 12:03:39 -0500 Subject: [PATCH 10/18] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f748295..3f468e5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ [Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.2...2.7.3) -- Bump Starscream dependency to >= 4.0.4 [#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236) [Corey Baker](https://github.com/cbaker6) +- Bump Starscream dependency to >= 4.0.4 ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)) [Corey Baker](https://github.com/cbaker6) - Bump Parse SDK to v.1.19.1 ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)) [Corey Baker](https://github.com/cbaker6) - Minimum support due to Xcode 12 and dependencies (iOS 9) ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)) [Corey Baker](https://github.com/cbaker6) From e4fc9f7f8dae00364c0ba54726a81776beed8950 Mon Sep 17 00:00:00 2001 From: Corey Date: Mon, 16 Nov 2020 12:04:25 -0500 Subject: [PATCH 11/18] Update CHANGELOG.md --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f468e5f..5d69af48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,9 @@ [Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.2...2.7.3) -- Bump Starscream dependency to >= 4.0.4 ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)) [Corey Baker](https://github.com/cbaker6) -- Bump Parse SDK to v.1.19.1 ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)) [Corey Baker](https://github.com/cbaker6) -- Minimum support due to Xcode 12 and dependencies (iOS 9) ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)) [Corey Baker](https://github.com/cbaker6) +- Bump Starscream dependency to >= 4.0.4 ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)), thanks to [Corey Baker](https://github.com/cbaker6) +- Bump Parse SDK to v.1.19.1 ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)), thanks to [Corey Baker](https://github.com/cbaker6) +- Minimum support due to Xcode 12 and dependencies (iOS 9) ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)), thanks to [Corey Baker](https://github.com/cbaker6) ### 2.7.2 From d5a66b77552e0eb1fe90f56582d82c9b8ac1cb5f Mon Sep 17 00:00:00 2001 From: Corey Date: Mon, 16 Nov 2020 12:11:38 -0500 Subject: [PATCH 12/18] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d69af48..7e8bc02d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ ### 2.8.0 -[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.2...2.7.3) +[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.3...2.8.0) - Bump Starscream dependency to >= 4.0.4 ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)), thanks to [Corey Baker](https://github.com/cbaker6) - Bump Parse SDK to v.1.19.1 ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)), thanks to [Corey Baker](https://github.com/cbaker6) From 938f37da7f31e173637d2b31ba8bb4e3936108c5 Mon Sep 17 00:00:00 2001 From: Corey Date: Mon, 16 Nov 2020 13:41:43 -0500 Subject: [PATCH 13/18] Update CHANGELOG.md Co-authored-by: Tom Fox <13188249+TomWFox@users.noreply.github.com> --- CHANGELOG.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e8bc02d..70bf1f4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,16 +2,15 @@ ### Master -[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.2...master) +[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.8.0...master) ### 2.8.0 [Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.3...2.8.0) -- Bump Starscream dependency to >= 4.0.4 ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)), thanks to [Corey Baker](https://github.com/cbaker6) -- Bump Parse SDK to v.1.19.1 ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)), thanks to [Corey Baker](https://github.com/cbaker6) -- Minimum support due to Xcode 12 and dependencies (iOS 9) ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)), thanks to [Corey Baker](https://github.com/cbaker6) - +- Bump Starscream dependency to >= 4.0.4 ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)), thanks to [Corey Baker](https://github.com/cbaker6). +- Bump Parse SDK to v.1.19.1 ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)), thanks to [Corey Baker](https://github.com/cbaker6). +- Minimum support due to Xcode 12 and dependencies (iOS 9) ([#236](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/236)), thanks to [Corey Baker](https://github.com/cbaker6). ### 2.7.2 @@ -106,4 +105,3 @@ - Fix: Deduplicates subscription requests, thanks to [Nathan Kellert](https://github.com/noobs2ninjas). - New: Support for wss, thanks to [@kajensen](https://github.com/kajensen). - Fix: Properly deliver events back to obj-c, thanks to [Richard Ross](https://github.com/richardjrossiii). - From 37cb5d59c887f93f24aa187fb3ada702c143b7e9 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Mon, 16 Nov 2020 13:47:37 -0500 Subject: [PATCH 14/18] Update versions to 2.8.0, add watchOS and tvOS to circle build --- .circleci/config.yml | 2 +- ParseLiveQuery.podspec | 2 +- Sources/ParseLiveQuery.xcodeproj/project.pbxproj | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bca63bd6..eccea064 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,7 +49,7 @@ jobs: steps: - checkout - run: *prepare - - run: carthage build --no-skip-current --platform macos,ios + - run: carthage build --no-skip-current --platform macos,ios,tvos,watchos workflows: version: 2 diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index 87a386ba..93ebd530 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'ParseLiveQuery' - s.version = '2.7.2' + s.version = '2.8.0' s.license = { :type => 'BSD' } s.summary = 'Allows for subscriptions to queries in conjunction with parse-server.' s.homepage = 'http://parseplatform.org' diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index c80c74ae..1d5ceb64 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -953,7 +953,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; - MARKETING_VERSION = 2.7.2; + MARKETING_VERSION = 2.8.0; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; PRODUCT_NAME = ParseLiveQuery; SDKROOT = macosx; @@ -980,7 +980,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; - MARKETING_VERSION = 2.7.2; + MARKETING_VERSION = 2.8.0; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; PRODUCT_NAME = ParseLiveQuery; SDKROOT = macosx; @@ -1006,7 +1006,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 2.7.2; + MARKETING_VERSION = 2.8.0; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; PRODUCT_NAME = ParseLiveQuery; SDKROOT = iphoneos; @@ -1035,7 +1035,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 2.7.2; + MARKETING_VERSION = 2.8.0; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; PRODUCT_NAME = ParseLiveQuery; SDKROOT = iphoneos; From ee5f944591e89313bf16b749176ce16445b5b4d7 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Mon, 16 Nov 2020 14:18:57 -0500 Subject: [PATCH 15/18] Update version numbers of watchOS and tvOS --- Sources/ParseLiveQuery-tvOS/Info.plist | 2 +- Sources/ParseLiveQuery-watchOS/Info.plist | 2 +- Sources/ParseLiveQuery.xcodeproj/project.pbxproj | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Sources/ParseLiveQuery-tvOS/Info.plist b/Sources/ParseLiveQuery-tvOS/Info.plist index 9bcb2444..c0701c6d 100644 --- a/Sources/ParseLiveQuery-tvOS/Info.plist +++ b/Sources/ParseLiveQuery-tvOS/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/Sources/ParseLiveQuery-watchOS/Info.plist b/Sources/ParseLiveQuery-watchOS/Info.plist index 9bcb2444..c0701c6d 100644 --- a/Sources/ParseLiveQuery-watchOS/Info.plist +++ b/Sources/ParseLiveQuery-watchOS/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 479f1bef..cbf21b25 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -1064,6 +1064,7 @@ INFOPLIST_FILE = "ParseLiveQuery-watchOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 2.8.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.parse.livequery.watchos.ParseLiveQuery-watchOS"; @@ -1111,6 +1112,7 @@ INFOPLIST_FILE = "ParseLiveQuery-watchOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 2.8.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.parse.livequery.watchos.ParseLiveQuery-watchOS"; @@ -1161,6 +1163,7 @@ INFOPLIST_FILE = "ParseLiveQuery-tvOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 2.8.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.parse.livequery.tvos.ParseLiveQuery-tvOS"; @@ -1207,6 +1210,7 @@ INFOPLIST_FILE = "ParseLiveQuery-tvOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 2.8.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.parse.livequery.tvos.ParseLiveQuery-tvOS"; From fe0b9c27dfcaaace334e596e55fc9de3ddb4cafc Mon Sep 17 00:00:00 2001 From: Corey Date: Mon, 16 Nov 2020 14:39:14 -0500 Subject: [PATCH 16/18] Show warnings from pod trunk push --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e604b90a..b4ecb1ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ jobs: deploy: provider: script skip_cleanup: true - script: travis_wait bundle exec pod trunk push ParseLiveQuery.podspec --allow-warnings + script: bundle exec pod trunk push ParseLiveQuery.podspec --allow-warnings on: tags: true all_branches: true From d8859f27707b41448c471d67dbbaf358ce19d083 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Mon, 16 Nov 2020 16:11:38 -0500 Subject: [PATCH 17/18] fix cart files --- Carthage/Checkouts/Starscream | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream index e6b65c6d..df8d8204 160000 --- a/Carthage/Checkouts/Starscream +++ b/Carthage/Checkouts/Starscream @@ -1 +1 @@ -Subproject commit e6b65c6d9077ea48b4a7bdda8994a1d3c6969c8d +Subproject commit df8d82047f6654d8e4b655d1b1525c64e1059d21 From 11f1efcfab11549c7a1fcf4452969cfb1baaceb1 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Mon, 16 Nov 2020 16:56:47 -0500 Subject: [PATCH 18/18] remove dups from merge --- .circleci/config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bc25fd4e..a350e304 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -79,9 +79,6 @@ jobs: - run: | xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo | xcpretty -c; xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo -configuration Debug | xcpretty -c; - - run: | - xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC | xcpretty -c; - xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC -configuration Debug | xcpretty -c; carthage: <<: *defaults steps: @@ -89,7 +86,6 @@ jobs: - restore_cache: *cache-pull - run: *prepare - save_cache: *cache-push - - run: carthage build --no-skip-current --platform macos,ios - run: carthage build --no-skip-current --platform macos,ios,tvos,watchos workflows: