This repository was archived by the owner on Jun 13, 2023. It is now read-only.
Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork132
Update sockets#236
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Update sockets#236
Changes fromall commits
Commits
Show all changes
20 commits Select commitHold shift + click to select a range
2d91265 Update starscream to latest
cbaker6a2711b4 update carthage files
cbaker6d3dddc9 Update pod spec
cbaker6073f8fc update podspec
cbaker6ced8cfb Add reconnect because of change in logic from dependency
cbaker67b6d343 Improve connection logic
cbaker6f8fc435 Improve connection logic
cbaker67018087 Fix subscriptions
cbaker65020a6a Update CHANGELOG.md
cbaker627867ca Update CHANGELOG.md
cbaker6e4fc9f7 Update CHANGELOG.md
cbaker6d5a66b7 Update CHANGELOG.md
cbaker6938f37d Update CHANGELOG.md
cbaker637cb5d5 Update versions to 2.8.0, add watchOS and tvOS to circle build
cbaker680e446a Merge branch 'master'
cbaker6ee5f944 Update version numbers of watchOS and tvOS
cbaker6fe0b9c2 Show warnings from pod trunk push
cbaker6d8859f2 fix cart files
cbaker6ac53c62 Merge branch 'sockets' of https://github.com/cbaker6/ParseLiveQuery-i…
cbaker611f1efc remove dups from merge
cbaker6File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
5 changes: 1 addition & 4 deletions.circleci/config.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion.travis.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
10 changes: 9 additions & 1 deletionCHANGELOG.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletionCartfile
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| github "BoltsFramework/Bolts-Swift" >= 1.5.0 | ||
| github "ParsePlatform/Parse-SDK-iOS-OSX" >= 1.19.1 | ||
| github "daltoniam/Starscream">= 4.0.4 |
2 changes: 1 addition & 1 deletionCartfile.resolved
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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.1" | ||
| github "daltoniam/Starscream" "4.0.4" | ||
| github "facebook/facebook-objc-sdk" "v6.5.2" |
2 changes: 1 addition & 1 deletionCarthage/Checkouts/Starscream
SubmoduleStarscream updated 46 files
6 changes: 3 additions & 3 deletionsParseLiveQuery.podspec
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletionSources/ParseLiveQuery-tvOS/Info.plist
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletionSources/ParseLiveQuery-watchOS/Info.plist
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
20 changes: 12 additions & 8 deletionsSources/ParseLiveQuery.xcodeproj/project.pbxproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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"; | ||
| @@ -1252,7 +1256,7 @@ | ||
| GCC_WARN_UNINITIALIZED_AUTOS = YES; | ||
| GCC_WARN_UNUSED_FUNCTION = YES; | ||
| GCC_WARN_UNUSED_VARIABLE = YES; | ||
| IPHONEOS_DEPLOYMENT_TARGET =9.0; | ||
drdaz marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| MACOSX_DEPLOYMENT_TARGET = 10.12; | ||
| ONLY_ACTIVE_ARCH = YES; | ||
| SWIFT_OBJC_BRIDGING_HEADER = ""; | ||
| @@ -1289,7 +1293,7 @@ | ||
| GCC_WARN_UNINITIALIZED_AUTOS = YES; | ||
| GCC_WARN_UNUSED_FUNCTION = YES; | ||
| GCC_WARN_UNUSED_VARIABLE = YES; | ||
| IPHONEOS_DEPLOYMENT_TARGET =9.0; | ||
| MACOSX_DEPLOYMENT_TARGET = 10.12; | ||
| SWIFT_OBJC_BRIDGING_HEADER = ""; | ||
| SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; | ||
| @@ -1314,7 +1318,7 @@ | ||
| INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; | ||
| LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; | ||
| MACOSX_DEPLOYMENT_TARGET = 10.10; | ||
| MARKETING_VERSION = 2.8.0; | ||
| PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; | ||
| PRODUCT_NAME = ParseLiveQuery; | ||
| SDKROOT = macosx; | ||
| @@ -1341,7 +1345,7 @@ | ||
| INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; | ||
| LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; | ||
| MACOSX_DEPLOYMENT_TARGET = 10.10; | ||
| MARKETING_VERSION = 2.8.0; | ||
| PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; | ||
| PRODUCT_NAME = ParseLiveQuery; | ||
| SDKROOT = macosx; | ||
| @@ -1364,10 +1368,10 @@ | ||
| FRAMEWORK_VERSION = A; | ||
| INFOPLIST_FILE = ParseLiveQuery/Info.plist; | ||
| INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; | ||
| IPHONEOS_DEPLOYMENT_TARGET =9.0; | ||
| LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; | ||
| LIBRARY_SEARCH_PATHS = "$(inherited)"; | ||
| MARKETING_VERSION = 2.8.0; | ||
| PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; | ||
| PRODUCT_NAME = ParseLiveQuery; | ||
| SDKROOT = iphoneos; | ||
| @@ -1393,10 +1397,10 @@ | ||
| FRAMEWORK_VERSION = A; | ||
| INFOPLIST_FILE = ParseLiveQuery/Info.plist; | ||
| INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; | ||
| IPHONEOS_DEPLOYMENT_TARGET =9.0; | ||
| LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; | ||
| LIBRARY_SEARCH_PATHS = "$(inherited)"; | ||
| MARKETING_VERSION = 2.8.0; | ||
| PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; | ||
| PRODUCT_NAME = ParseLiveQuery; | ||
| SDKROOT = iphoneos; | ||
19 changes: 10 additions & 9 deletionsSources/ParseLiveQuery/Client.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
51 changes: 26 additions & 25 deletionsSources/ParseLiveQuery/Internal/ClientPrivate.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.