diff --git a/.gitmodules b/.gitmodules index 055eb9d7..df49e544 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,9 @@ [submodule "Carthage/Checkouts/Bolts-Swift"] path = Carthage/Checkouts/Bolts-Swift url = https://github.com/BoltsFramework/Bolts-Swift.git -[submodule "Carthage/Checkouts/SocketRocket"] - path = Carthage/Checkouts/SocketRocket - url = https://github.com/facebook/SocketRocket.git [submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"] path = Carthage/Checkouts/Parse-SDK-iOS-OSX url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git +[submodule "Carthage/Checkouts/Starscream"] + path = Carthage/Checkouts/Starscream + url = https://github.com/daltoniam/Starscream.git diff --git a/.travis.yml b/.travis.yml index 94cb33d5..73322263 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,6 @@ env: install: - | bundle install - bundle exec pod repo update - bundle exec pod install script: - | if [ "$TEST_TYPE" = iOS ]; then @@ -36,8 +34,8 @@ script: xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC | xcpretty -c xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC -configuration Debug | xcpretty -c elif [ "$TEST_TYPE" = CocoaPods ]; then - # SocketRocket produces warnings on xcode8 - pod lib lint ParseLiveQuery.podspec --allow-warnings + bundle exec pod repo update 2>&1 || exit 1 + pod lib lint ParseLiveQuery.podspec elif [ "$TEST_TYPE" = Carthage ]; then carthage build --no-skip-current fi diff --git a/Cartfile b/Cartfile index 3c369a21..880a569d 100644 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1,4 @@ github "BoltsFramework/Bolts-Swift" == 1.3.0 -github "facebook/SocketRocket" "master" github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.14.2 +github "daltoniam/Starscream" == 2.0.3 diff --git a/Cartfile.resolved b/Cartfile.resolved index 593e0aca..059b3b8f 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ github "BoltsFramework/Bolts-ObjC" "1.8.4" github "BoltsFramework/Bolts-Swift" "1.3.0" -github "facebook/SocketRocket" "41b57bb2fc292a814f758441a05243eb38457027" +github "daltoniam/Starscream" "2.0.3" github "ParsePlatform/Parse-SDK-iOS-OSX" "1.14.2" diff --git a/Carthage/Checkouts/SocketRocket b/Carthage/Checkouts/SocketRocket deleted file mode 160000 index 41b57bb2..00000000 --- a/Carthage/Checkouts/SocketRocket +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 41b57bb2fc292a814f758441a05243eb38457027 diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream new file mode 160000 index 00000000..13859364 --- /dev/null +++ b/Carthage/Checkouts/Starscream @@ -0,0 +1 @@ +Subproject commit 13859364e33368687a5ee0c9cc0d5782e4212b66 diff --git a/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj b/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj index 5b76e859..9c78cc06 100644 --- a/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj +++ b/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 8F68026DAC07EBB6ABECA553 /* Pods_LiveQueryDemo_ObjC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B8FE714A9B78962AE71BE6E5 /* Pods_LiveQueryDemo_ObjC.framework */; }; F509D5461CA9E5B8007B15B0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F519CBB41CA9CA04005295C0 /* main.m */; }; F509D5471CA9E5B8007B15B0 /* Message.m in Sources */ = {isa = PBXBuildFile; fileRef = F519CBBC1CA9CA2B005295C0 /* Message.m */; }; F509D5481CA9E5B8007B15B0 /* Room.m in Sources */ = {isa = PBXBuildFile; fileRef = F519CBBF1CA9CA34005295C0 /* Room.m */; }; @@ -61,7 +60,6 @@ buildActionMask = 2147483647; files = ( F570348B1CAC837800EB3067 /* ParseLiveQuery.framework in Frameworks */, - 8F68026DAC07EBB6ABECA553 /* Pods_LiveQueryDemo_ObjC.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -135,15 +133,9 @@ isa = PBXNativeTarget; buildConfigurationList = F509D5431CA9E597007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo-ObjC" */; buildPhases = ( - 208FAA4977FAE6125655600F /* [CP] Check Pods Manifest.lock */, - 87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */, F509D52E1CA9E597007B15B0 /* Sources */, F509D52F1CA9E597007B15B0 /* Frameworks */, F509D5301CA9E597007B15B0 /* Resources */, - EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */, - A8851B9B8AD727FB055366F2 /* [CP] Copy Pods Resources */, - AEF3C7E9E62737C95CCEDF15 /* 📦 Embed Pods Frameworks */, - 6527F5DEB5EFD1866B2614D7 /* 📦 Copy Pods Resources */, ); buildRules = ( ); @@ -220,99 +212,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 208FAA4977FAE6125655600F /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - 6527F5DEB5EFD1866B2614D7 /* 📦 Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "📦 Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - A8851B9B8AD727FB055366F2 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - AEF3C7E9E62737C95CCEDF15 /* 📦 Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "📦 Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ F509D52E1CA9E597007B15B0 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -338,7 +237,6 @@ /* Begin XCBuildConfiguration section */ F509D5401CA9E597007B15B0 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 46BB59B59BEB1C1B30D1528A /* Pods-LiveQueryDemo-ObjC.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; COMBINE_HIDPI_IMAGES = YES; @@ -352,7 +250,6 @@ }; F509D5411CA9E597007B15B0 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BBA908F914DAEEBB466454E2 /* Pods-LiveQueryDemo-ObjC.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; COMBINE_HIDPI_IMAGES = YES; diff --git a/Examples/LiveQueryDemo.xcodeproj/project.pbxproj b/Examples/LiveQueryDemo.xcodeproj/project.pbxproj index 8972e023..fb26c842 100644 --- a/Examples/LiveQueryDemo.xcodeproj/project.pbxproj +++ b/Examples/LiveQueryDemo.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - B88040BD3E7C225E22705572 /* Pods_LiveQueryDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E6A6F02FD57E57309877DA38 /* Pods_LiveQueryDemo.framework */; }; F509D5281CA9E4D9007B15B0 /* ParseLiveQuery.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8199A4061CA1EF1800BF61E1 /* ParseLiveQuery.framework */; }; F509D5291CA9E53D007B15B0 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = F59F85B61C9BB4B600566A29 /* Message.swift */; }; F509D52A1CA9E53D007B15B0 /* Room.swift in Sources */ = {isa = PBXBuildFile; fileRef = F59F85B71C9BB4B600566A29 /* Room.swift */; }; @@ -50,7 +49,6 @@ buildActionMask = 2147483647; files = ( F509D5281CA9E4D9007B15B0 /* ParseLiveQuery.framework in Frameworks */, - B88040BD3E7C225E22705572 /* Pods_LiveQueryDemo.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -123,15 +121,9 @@ isa = PBXNativeTarget; buildConfigurationList = F509D5251CA9E4AE007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo" */; buildPhases = ( - 9D539417025C30ADB0E1A1F6 /* [CP] Check Pods Manifest.lock */, - E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */, F509D5131CA9E4AE007B15B0 /* Sources */, F509D5141CA9E4AE007B15B0 /* Frameworks */, F509D5151CA9E4AE007B15B0 /* Resources */, - 045C33FD1807E3932888A2F9 /* [CP] Embed Pods Frameworks */, - D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */, - EAD62EF23FE70C6E3984EDE6 /* 📦 Embed Pods Frameworks */, - E3F143CFD9CCD46782420827 /* 📦 Copy Pods Resources */, ); buildRules = ( ); @@ -209,99 +201,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 045C33FD1807E3932888A2F9 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 9D539417025C30ADB0E1A1F6 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - E3F143CFD9CCD46782420827 /* 📦 Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "📦 Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - EAD62EF23FE70C6E3984EDE6 /* 📦 Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "📦 Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ F509D5131CA9E4AE007B15B0 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -318,7 +217,6 @@ /* Begin XCBuildConfiguration section */ F509D5261CA9E4AE007B15B0 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3AC9312CEDA0007F8EAA9880 /* Pods-LiveQueryDemo.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; @@ -333,7 +231,6 @@ }; F509D5271CA9E4AE007B15B0 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 497772719B97C861F0896BFC /* Pods-LiveQueryDemo.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; diff --git a/Gemfile b/Gemfile index 9be29567..1ad78d9f 100644 --- a/Gemfile +++ b/Gemfile @@ -2,4 +2,4 @@ source 'https://rubygems.org' gem 'xcpretty' # xcode8 compat -gem 'cocoapods', '1.1.0.rc.2' +gem 'cocoapods', '1.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index eb587398..69b9a19b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,64 +1,68 @@ GEM remote: https://rubygems.org/ specs: + CFPropertyList (2.3.4) activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - claide (1.0.0) - cocoapods (1.1.0.rc.2) + claide (1.0.1) + cocoapods (1.1.1) activesupport (>= 4.0.2, < 5) - claide (>= 1.0.0, < 2.0) - cocoapods-core (= 1.1.0.rc.2) + claide (>= 1.0.1, < 2.0) + cocoapods-core (= 1.1.1) cocoapods-deintegrate (>= 1.0.1, < 2.0) - cocoapods-downloader (>= 1.1.1, < 2.0) + cocoapods-downloader (>= 1.1.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.1.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored (~> 1.2) escape (~> 0.0.4) - fourflusher (~> 1.0.1) + fourflusher (~> 2.0.1) gh_inspector (~> 1.0) molinillo (~> 0.5.1) nap (~> 1.0) - xcodeproj (>= 1.3.1, < 2.0) - cocoapods-core (1.1.0.rc.2) + xcodeproj (>= 1.3.3, < 2.0) + cocoapods-core (1.1.1) activesupport (>= 4.0.2, < 5) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.1) - cocoapods-downloader (1.1.1) + cocoapods-downloader (1.1.3) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) cocoapods-stats (1.0.0) - cocoapods-trunk (1.0.0) + cocoapods-trunk (1.1.2) nap (>= 0.8, < 2.0) netrc (= 0.7.8) cocoapods-try (1.1.0) colored (1.2) escape (0.0.4) - fourflusher (1.0.1) + fourflusher (2.0.1) fuzzy_match (2.0.4) gh_inspector (1.0.2) i18n (0.7.0) json (1.8.3) minitest (5.9.0) - molinillo (0.5.1) + molinillo (0.5.5) + nanaimo (0.2.3) nap (1.1.0) netrc (0.7.8) rouge (1.11.1) thread_safe (0.3.5) tzinfo (1.2.2) thread_safe (~> 0.1) - xcodeproj (1.3.1) + xcodeproj (1.4.2) + CFPropertyList (~> 2.3.3) activesupport (>= 3) - claide (>= 1.0.0, < 2.0) + claide (>= 1.0.1, < 2.0) colored (~> 1.2) + nanaimo (~> 0.2.3) xcpretty (0.2.2) rouge (~> 1.8) @@ -66,7 +70,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.1.0.rc.2) + cocoapods (= 1.1.1) xcpretty BUNDLED WITH diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index b40bdcdf..e04e8970 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -1,10 +1,10 @@ Pod::Spec.new do |s| s.name = 'ParseLiveQuery' - s.version = '1.1.0' + s.version = '2.0.0' s.license = { :type => 'BSD' } s.summary = 'Allows for subscriptions to queries in conjunction with parse-server.' s.homepage = 'https://github.com/ParsePlatform/parse-server' - s.authors = { 'Richard Ross' => 'richardross@fb.com', 'Nikita Lutsenko' => 'nlutsenko@me.com' } + s.authors = { 'Richard Ross' => 'richardross@fb.com', 'Nikita Lutsenko' => 'nlutsenko@me.com', 'Florent Vilmart' => 'florent@flovilmart.com' } s.source = { :git => 'https://github.com/ParsePlatform/ParseLiveQuery-iOS-OSX.git', :tag => s.version.to_s } @@ -21,5 +21,5 @@ Pod::Spec.new do |s| s.dependency 'Parse', '~> 1.14.2' s.dependency 'Bolts-Swift', '~> 1.3' - s.dependency 'SocketRocket', '~> 0.5' + s.dependency 'Starscream', '2.0.3' end diff --git a/ParseLiveQuery.xcworkspace/contents.xcworkspacedata b/ParseLiveQuery.xcworkspace/contents.xcworkspacedata index 9a4a21e0..9f6431ca 100644 --- a/ParseLiveQuery.xcworkspace/contents.xcworkspacedata +++ b/ParseLiveQuery.xcworkspace/contents.xcworkspacedata @@ -1,24 +1,20 @@ - - - - + + + location = "group:Examples/LiveQueryDemo-ObjC.xcodeproj"> + location = "group:Examples/LiveQueryDemo.xcodeproj"> + location = "group:Carthage/Checkouts/Bolts-Swift/BoltsSwift.xcodeproj"> diff --git a/Podfile b/Podfile deleted file mode 100644 index ace66cd6..00000000 --- a/Podfile +++ /dev/null @@ -1,45 +0,0 @@ -use_frameworks! -workspace 'ParseLiveQuery.xcworkspace' - -def commonPods - pod 'Parse' - pod 'Bolts-Swift', :git => 'https://github.com/BoltsFramework/Bolts-Swift.git', tag: '1.3.0' - pod 'SocketRocket' -end - -post_install do |installer| - # Force Swift version for Xcode 8 - installer.pods_project.targets.each do |target| - target.build_configurations.each do |config| - config.build_settings['SWIFT_VERSION'] = '3.0' - end - end -end - -target 'ParseLiveQuery-OSX' do - project 'Sources/ParseLiveQuery.xcodeproj' - platform :osx, '10.10' - - commonPods -end - -target 'ParseLiveQuery-iOS' do - project 'Sources/ParseLiveQuery.xcodeproj' - platform :ios, '8.0' - - commonPods -end - -target 'LiveQueryDemo' do - project 'Examples/LiveQueryDemo.xcodeproj' - platform :osx, '10.10' - - commonPods -end - -target 'LiveQueryDemo-ObjC' do - project 'Examples/LiveQueryDemo-ObjC.xcodeproj' - platform :osx, '10.10' - - commonPods -end diff --git a/Podfile.lock b/Podfile.lock deleted file mode 100644 index 665f4ccb..00000000 --- a/Podfile.lock +++ /dev/null @@ -1,31 +0,0 @@ -PODS: - - Bolts-Swift (1.3.0) - - Bolts/Tasks (1.8.4) - - Parse (1.14.2): - - Bolts/Tasks (~> 1.8) - - SocketRocket (0.5.1) - -DEPENDENCIES: - - Bolts-Swift (from `https://github.com/BoltsFramework/Bolts-Swift.git`, tag `1.3.0`) - - Parse - - SocketRocket - -EXTERNAL SOURCES: - Bolts-Swift: - :git: https://github.com/BoltsFramework/Bolts-Swift.git - :tag: 1.3.0 - -CHECKOUT OPTIONS: - Bolts-Swift: - :git: https://github.com/BoltsFramework/Bolts-Swift.git - :tag: 1.3.0 - -SPEC CHECKSUMS: - Bolts: 8a7995239dbe724f9cba2248b766d48b7ebdd322 - Bolts-Swift: fa98d1b59fc1acea9b21a21306dcdca1c85e3737 - Parse: 4335d65f40cb3d43190d723144bbe1afb9c38230 - SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531 - -PODFILE CHECKSUM: ccd9b68a1b8b06aee68db55ab458175ae7383cef - -COCOAPODS: 1.1.0.rc.2 diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index f4cdd77d..eb91fcf9 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -17,8 +17,26 @@ 4AEAE5771DAFC808005F9FFB /* ParseLiveQuery-Bridging-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AEAE5731DAFC488005F9FFB /* ParseLiveQuery-Bridging-Header.h */; settings = {ATTRIBUTES = (Private, ); }; }; 4AEAE5781DAFC809005F9FFB /* PFDecoder_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AEAE5701DAFC3AF005F9FFB /* PFDecoder_internal.h */; settings = {ATTRIBUTES = (Private, ); }; }; 4AEAE5791DAFC809005F9FFB /* ParseLiveQuery-Bridging-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AEAE5731DAFC488005F9FFB /* ParseLiveQuery-Bridging-Header.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 629DC3BE90DA87A7857677D2 /* Pods_ParseLiveQuery_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE2643D85A7565FC20EE144C /* Pods_ParseLiveQuery_iOS.framework */; }; - DE7126BDB27E5DDB1C21490A /* Pods_ParseLiveQuery_OSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF5A55E51D52E372CD28FF08 /* Pods_ParseLiveQuery_OSX.framework */; }; + 094AE8F01E25ADF300F408BC /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE8EF1E25ADF300F408BC /* libicucore.tbd */; }; + 094AE8F21E25AE0500F408BC /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE8F11E25AE0500F408BC /* CFNetwork.framework */; }; + 094AE8F41E25AE1100F408BC /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE8F31E25AE1100F408BC /* Security.framework */; }; + 094AE8F61E25AE1C00F408BC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE8F51E25AE1C00F408BC /* Foundation.framework */; }; + 094AE9001E25AF3100F408BC /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE8FF1E25AF3100F408BC /* libicucore.tbd */; }; + 094AE9021E25AF3A00F408BC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE9011E25AF3A00F408BC /* Foundation.framework */; }; + 094AE9041E25AF4300F408BC /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE9031E25AF4300F408BC /* Security.framework */; }; + 094AE9061E25AF5A00F408BC /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE9051E25AF5A00F408BC /* CFNetwork.framework */; }; + 09A31C851E25C5100037C3BC /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C841E25C5100037C3BC /* Parse.framework */; }; + 09C9FCE31E25D07B00369AA6 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09C9FCE11E25C9BA00369AA6 /* Bolts.framework */; }; + 09C9FCE41E25D08400369AA6 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C7E1E25C2000037C3BC /* BoltsSwift.framework */; }; + 09D80FD11E26BC7800AC7A2D /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C7A1E25C18E0037C3BC /* Parse.framework */; }; + 09D80FD51E26BD7900AC7A2D /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09C9FCDF1E25C99400369AA6 /* Bolts.framework */; }; + 09D80FD61E26BD9100AC7A2D /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C8A1E25C5C60037C3BC /* BoltsSwift.framework */; }; + 09D80FD81E26BF0500AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FD71E26BF0500AC7A2D /* libsqlite3.tbd */; }; + 09D80FDA1E26BFAA00AC7A2D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FD91E26BFAA00AC7A2D /* AudioToolbox.framework */; }; + 09D80FDC1E26C02600AC7A2D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDB1E26C02600AC7A2D /* SystemConfiguration.framework */; }; + 09D80FDE1E26C03E00AC7A2D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */; }; + 09D80FE01E26C04800AC7A2D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */; }; + 09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */; }; F534A5B21BDAFE0200CBD11A /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = F534A5B11BDAFE0200CBD11A /* Subscription.swift */; }; F534A5B41BDB09CE00CBD11A /* Operation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F534A5B31BDB09CE00CBD11A /* Operation.swift */; }; F54D58B81C8E3446009F8D6C /* ClientPrivate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B71C8E3446009F8D6C /* ClientPrivate.swift */; }; @@ -37,20 +55,162 @@ F5D965381BD99DA200C3AAFC /* QueryEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5591BA91BD97BB70072F966 /* QueryEncoder.swift */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 090FFBB31E26F14F0010EC2E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 81C3821C19CCA89E0066284A; + remoteInfo = "Parse-iOS"; + }; + 090FFBB51E26F14F0010EC2E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 81C5845D1C3B0A98000063C6; + remoteInfo = "Parse-iOS-Dynamic"; + }; + 090FFBB71E26F14F0010EC2E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 816F449B1A8E8933009CDB32; + remoteInfo = "ParseUnitTests-iOS"; + }; + 090FFBB91E26F14F0010EC2E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 97010FAC1630B18F00AB761E; + remoteInfo = "Parse-macOS"; + }; + 090FFBBB1E26F14F0010EC2E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 81C09F861AF97A490043B49C; + remoteInfo = "ParseUnitTests-macOS"; + }; + 090FFBBD1E26F14F0010EC2E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 815F24151BD04D150054659F; + remoteInfo = "Parse-tvOS"; + }; + 090FFBBF1E26F14F0010EC2E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 81C585BF1C3B0AA1000063C6; + remoteInfo = "Parse-tvOS-Dynamic"; + }; + 090FFBC11E26F14F0010EC2E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 810156691BB3832700D7C7BD; + remoteInfo = "Parse-watchOS"; + }; + 090FFBC31E26F14F0010EC2E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 81C5870F1C3B0AA9000063C6; + remoteInfo = "Parse-watchOS-Dynamic"; + }; + 090FFBC51E26F1730010EC2E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 81C582E11C3B0A98000063C6; + remoteInfo = "Parse-iOS-Dynamic"; + }; + 4A1A996A1E5E8DBB0047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 6B3E79E619D48B7F006071F7; + remoteInfo = "Starscream iOS"; + }; + 4A1A996C1E5E8DBB0047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 6B3E79F119D48B7F006071F7; + remoteInfo = "Starscream iOSTests"; + }; + 4A1A996E1E5E8DBB0047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = D9C3E35F19E48FF1009FC285; + remoteInfo = "Starscream OSX"; + }; + 4A1A99701E5E8DBB0047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = D9C3E36919E48FF1009FC285; + remoteInfo = "Starscream OSXTests"; + }; + 4A1A99721E5E8DBB0047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 091277971BD673A70003036D; + remoteInfo = "Starscream tvOS"; + }; + 4A1A99741E5E8DBB0047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 091277A01BD673A70003036D; + remoteInfo = "Starscream tvOSTests"; + }; + 4A1A99761E5E8E040047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 6B3E79E519D48B7F006071F7; + remoteInfo = "Starscream iOS"; + }; + 4A1A99781E5E8E0C0047B84B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = D9C3E35E19E48FF1009FC285; + remoteInfo = "Starscream OSX"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Parse+LiveQuery.swift"; sourceTree = ""; }; - 11F6DFE2732DB0DE49976BA5 /* Pods-ParseLiveQuery OSX.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ParseLiveQuery OSX.release.xcconfig"; path = "../Pods/Target Support Files/Pods-ParseLiveQuery OSX/Pods-ParseLiveQuery OSX.release.xcconfig"; sourceTree = ""; }; 3B68E5B61DECC32300038DDD /* PFEncoder_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFEncoder_internal.h; sourceTree = ""; }; 4AEAE5701DAFC3AF005F9FFB /* PFDecoder_internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PFDecoder_internal.h; sourceTree = ""; }; 4AEAE5731DAFC488005F9FFB /* ParseLiveQuery-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ParseLiveQuery-Bridging-Header.h"; sourceTree = ""; }; - 6062D7994653A4F07D1358B9 /* Pods-ParseLiveQuery iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ParseLiveQuery iOS.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-ParseLiveQuery iOS/Pods-ParseLiveQuery iOS.debug.xcconfig"; sourceTree = ""; }; - 7A40A16386D0D6B38F8B2F07 /* Pods-ParseLiveQuery-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ParseLiveQuery-iOS.release.xcconfig"; path = "../Pods/Target Support Files/Pods-ParseLiveQuery-iOS/Pods-ParseLiveQuery-iOS.release.xcconfig"; sourceTree = ""; }; - 8445DD921B87567C1E6A6042 /* Pods-ParseLiveQuery OSX.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ParseLiveQuery OSX.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-ParseLiveQuery OSX/Pods-ParseLiveQuery OSX.debug.xcconfig"; sourceTree = ""; }; - 89BFA3478A42D22F84D9F19C /* Pods-ParseLiveQuery-OSX.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ParseLiveQuery-OSX.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-ParseLiveQuery-OSX/Pods-ParseLiveQuery-OSX.debug.xcconfig"; sourceTree = ""; }; - 9A79B9CA1B493BADC66AE15A /* Pods-ParseLiveQuery-OSX.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ParseLiveQuery-OSX.release.xcconfig"; path = "../Pods/Target Support Files/Pods-ParseLiveQuery-OSX/Pods-ParseLiveQuery-OSX.release.xcconfig"; sourceTree = ""; }; - AF5A55E51D52E372CD28FF08 /* Pods_ParseLiveQuery_OSX.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ParseLiveQuery_OSX.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - BE2643D85A7565FC20EE144C /* Pods_ParseLiveQuery_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ParseLiveQuery_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - E4BFFC7C2B6C5374CA5F7440 /* Pods-ParseLiveQuery iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ParseLiveQuery iOS.release.xcconfig"; path = "../Pods/Target Support Files/Pods-ParseLiveQuery iOS/Pods-ParseLiveQuery iOS.release.xcconfig"; sourceTree = ""; }; + 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "../Carthage/Checkouts/Parse-SDK-iOS-OSX/Parse.xcodeproj"; sourceTree = ""; }; + 094AE8EF1E25ADF300F408BC /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/usr/lib/libicucore.tbd; sourceTree = DEVELOPER_DIR; }; + 094AE8F11E25AE0500F408BC /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; }; + 094AE8F31E25AE1100F408BC /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; + 094AE8F51E25AE1C00F408BC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + 094AE8FF1E25AF3100F408BC /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = usr/lib/libicucore.tbd; sourceTree = SDKROOT; }; + 094AE9011E25AF3A00F408BC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 094AE9031E25AF4300F408BC /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + 094AE9051E25AF5A00F408BC /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = ../../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 09A31C7A1E25C18E0037C3BC /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Parse.framework; path = "../Release-iphoneos/Parse.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 09A31C7E1E25C2000037C3BC /* BoltsSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 09A31C841E25C5100037C3BC /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 09A31C8A1E25C5C60037C3BC /* BoltsSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BoltsSwift.framework; path = "../Release-iphoneos/BoltsSwift.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 09C9FCDF1E25C99400369AA6 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = "../Release-iphoneos/Bolts.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 09C9FCE11E25C9BA00369AA6 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Bolts.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 09D80FD71E26BF0500AC7A2D /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; + 09D80FD91E26BFAA00AC7A2D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; }; + 09D80FDB1E26C02600AC7A2D /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; + 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; + 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; + 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = ../Carthage/Checkouts/Starscream/Starscream.xcodeproj; sourceTree = ""; }; F5256FD31BD71F9A0052FB8A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; F534A5B11BDAFE0200CBD11A /* Subscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Subscription.swift; sourceTree = ""; }; F534A5B31BDB09CE00CBD11A /* Operation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Operation.swift; sourceTree = ""; }; @@ -63,7 +223,6 @@ F59CA92E1C8E496200329737 /* Errors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Errors.swift; path = Internal/Errors.swift; sourceTree = ""; }; F5A88F491C9B6EBA002F0E0D /* PFQuery+Subscribe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "PFQuery+Subscribe.swift"; sourceTree = ""; }; F5A9BFCA1BE0248D00E78326 /* ParseLiveQuery.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseLiveQuery.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - FC3C8121FAAE363257898195 /* Pods-ParseLiveQuery-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ParseLiveQuery-iOS.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-ParseLiveQuery-iOS/Pods-ParseLiveQuery-iOS.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -71,7 +230,16 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DE7126BDB27E5DDB1C21490A /* Pods_ParseLiveQuery_OSX.framework in Frameworks */, + 09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */, + 09D80FE01E26C04800AC7A2D /* AudioToolbox.framework in Frameworks */, + 09D80FDE1E26C03E00AC7A2D /* SystemConfiguration.framework in Frameworks */, + 094AE9021E25AF3A00F408BC /* Foundation.framework in Frameworks */, + 09C9FCE41E25D08400369AA6 /* BoltsSwift.framework in Frameworks */, + 094AE9061E25AF5A00F408BC /* CFNetwork.framework in Frameworks */, + 094AE9041E25AF4300F408BC /* Security.framework in Frameworks */, + 094AE9001E25AF3100F408BC /* libicucore.tbd in Frameworks */, + 09A31C851E25C5100037C3BC /* Parse.framework in Frameworks */, + 09C9FCE31E25D07B00369AA6 /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -79,35 +247,76 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 629DC3BE90DA87A7857677D2 /* Pods_ParseLiveQuery_iOS.framework in Frameworks */, + 09D80FDC1E26C02600AC7A2D /* SystemConfiguration.framework in Frameworks */, + 094AE8F61E25AE1C00F408BC /* Foundation.framework in Frameworks */, + 094AE8F41E25AE1100F408BC /* Security.framework in Frameworks */, + 094AE8F21E25AE0500F408BC /* CFNetwork.framework in Frameworks */, + 09D80FDA1E26BFAA00AC7A2D /* AudioToolbox.framework in Frameworks */, + 09D80FD81E26BF0500AC7A2D /* libsqlite3.tbd in Frameworks */, + 094AE8F01E25ADF300F408BC /* libicucore.tbd in Frameworks */, + 09D80FD51E26BD7900AC7A2D /* Bolts.framework in Frameworks */, + 09D80FD61E26BD9100AC7A2D /* BoltsSwift.framework in Frameworks */, + 09D80FD11E26BC7800AC7A2D /* Parse.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 090FFBA81E26F14F0010EC2E /* Products */ = { + isa = PBXGroup; + children = ( + 090FFBB41E26F14F0010EC2E /* Parse.framework */, + 090FFBB61E26F14F0010EC2E /* Parse.framework */, + 090FFBB81E26F14F0010EC2E /* ParseUnitTests-iOS.xctest */, + 090FFBBA1E26F14F0010EC2E /* Parse.framework */, + 090FFBBC1E26F14F0010EC2E /* ParseUnitTests-macOS.xctest */, + 090FFBBE1E26F14F0010EC2E /* Parse.framework */, + 090FFBC01E26F14F0010EC2E /* Parse.framework */, + 090FFBC21E26F14F0010EC2E /* Parse.framework */, + 090FFBC41E26F14F0010EC2E /* Parse.framework */, + ); + name = Products; + sourceTree = ""; + }; 0BD13CAB7945A6C1A2A7B613 /* Frameworks */ = { isa = PBXGroup; children = ( - AF5A55E51D52E372CD28FF08 /* Pods_ParseLiveQuery_OSX.framework */, - BE2643D85A7565FC20EE144C /* Pods_ParseLiveQuery_iOS.framework */, + 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */, + 09D80FDB1E26C02600AC7A2D /* SystemConfiguration.framework */, + 09D80FD91E26BFAA00AC7A2D /* AudioToolbox.framework */, + 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */, + 09D80FD71E26BF0500AC7A2D /* libsqlite3.tbd */, + 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */, + 09C9FCDF1E25C99400369AA6 /* Bolts.framework */, + 09C9FCE11E25C9BA00369AA6 /* Bolts.framework */, + 09A31C8A1E25C5C60037C3BC /* BoltsSwift.framework */, + 09A31C7E1E25C2000037C3BC /* BoltsSwift.framework */, + 09A31C7A1E25C18E0037C3BC /* Parse.framework */, + 09A31C841E25C5100037C3BC /* Parse.framework */, + 094AE9011E25AF3A00F408BC /* Foundation.framework */, + 094AE8F51E25AE1C00F408BC /* Foundation.framework */, + 094AE9031E25AF4300F408BC /* Security.framework */, + 094AE8F31E25AE1100F408BC /* Security.framework */, + 094AE9051E25AF5A00F408BC /* CFNetwork.framework */, + 094AE8F11E25AE0500F408BC /* CFNetwork.framework */, + 094AE8FF1E25AF3100F408BC /* libicucore.tbd */, + 094AE8EF1E25ADF300F408BC /* libicucore.tbd */, ); name = Frameworks; sourceTree = ""; }; - 173CC277BE04603C70FB4E43 /* Pods */ = { + 4A1A99621E5E8DBB0047B84B /* Products */ = { isa = PBXGroup; children = ( - 8445DD921B87567C1E6A6042 /* Pods-ParseLiveQuery OSX.debug.xcconfig */, - 11F6DFE2732DB0DE49976BA5 /* Pods-ParseLiveQuery OSX.release.xcconfig */, - 6062D7994653A4F07D1358B9 /* Pods-ParseLiveQuery iOS.debug.xcconfig */, - E4BFFC7C2B6C5374CA5F7440 /* Pods-ParseLiveQuery iOS.release.xcconfig */, - 89BFA3478A42D22F84D9F19C /* Pods-ParseLiveQuery-OSX.debug.xcconfig */, - 9A79B9CA1B493BADC66AE15A /* Pods-ParseLiveQuery-OSX.release.xcconfig */, - FC3C8121FAAE363257898195 /* Pods-ParseLiveQuery-iOS.debug.xcconfig */, - 7A40A16386D0D6B38F8B2F07 /* Pods-ParseLiveQuery-iOS.release.xcconfig */, + 4A1A996B1E5E8DBB0047B84B /* Starscream.framework */, + 4A1A996D1E5E8DBB0047B84B /* Starscream iOSTests.xctest */, + 4A1A996F1E5E8DBB0047B84B /* Starscream.framework */, + 4A1A99711E5E8DBB0047B84B /* Starscream OSXTests.xctest */, + 4A1A99731E5E8DBB0047B84B /* Starscream.framework */, + 4A1A99751E5E8DBB0047B84B /* Starscream tvOSTests.xctest */, ); - name = Pods; + name = Products; sourceTree = ""; }; 81464FC51CA31DA0000235E7 /* Resources */ = { @@ -123,7 +332,8 @@ children = ( F5256FD01BD71F9A0052FB8A /* ParseLiveQuery */, F5256FCF1BD71F9A0052FB8A /* Products */, - 173CC277BE04603C70FB4E43 /* Pods */, + 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */, + 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */, 0BD13CAB7945A6C1A2A7B613 /* Frameworks */, ); indentWidth = 4; @@ -198,18 +408,15 @@ isa = PBXNativeTarget; buildConfigurationList = F5903CEF1BD999C500C3EFFE /* Build configuration list for PBXNativeTarget "ParseLiveQuery-OSX" */; buildPhases = ( - 42957978F8F9CAAE6BE3FE9C /* [CP] Check Pods Manifest.lock */, - 432EB76C64066D923373DC45 /* [CP] Check Pods Manifest.lock */, F5903CE51BD999C500C3EFFE /* Sources */, F5903CE61BD999C500C3EFFE /* Frameworks */, F5903CE71BD999C500C3EFFE /* Headers */, F5903CE81BD999C500C3EFFE /* Resources */, - 458C6F69E79D3F67465FC4DB /* [CP] Copy Pods Resources */, - 8D6D42D741753A8DA3FEBB44 /* 📦 Copy Pods Resources */, ); buildRules = ( ); dependencies = ( + 4A1A99791E5E8E0C0047B84B /* PBXTargetDependency */, ); name = "ParseLiveQuery-OSX"; productName = ParseLiveQuery; @@ -220,18 +427,16 @@ isa = PBXNativeTarget; buildConfigurationList = F5A9BFC71BE0248D00E78326 /* Build configuration list for PBXNativeTarget "ParseLiveQuery-iOS" */; buildPhases = ( - 12BD489D413AD268FF85A8FA /* [CP] Check Pods Manifest.lock */, - 0779A1A9A8C094A6EC98CD51 /* [CP] Check Pods Manifest.lock */, F5A9BFBA1BE0248D00E78326 /* Sources */, F5A9BFC01BE0248D00E78326 /* Frameworks */, F5A9BFC31BE0248D00E78326 /* Headers */, F5A9BFC51BE0248D00E78326 /* Resources */, - 89E3C0C052352147C9B80227 /* [CP] Copy Pods Resources */, - 23E82A71A220B624E9EEDD3B /* 📦 Copy Pods Resources */, ); buildRules = ( ); dependencies = ( + 4A1A99771E5E8E040047B84B /* PBXTargetDependency */, + 090FFBC61E26F1730010EC2E /* PBXTargetDependency */, ); name = "ParseLiveQuery-iOS"; productName = ParseLiveQuery; @@ -267,6 +472,16 @@ mainGroup = F5256FC41BD71F9A0052FB8A; productRefGroup = F5256FCF1BD71F9A0052FB8A /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 090FFBA81E26F14F0010EC2E /* Products */; + ProjectRef = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + }, + { + ProductGroup = 4A1A99621E5E8DBB0047B84B /* Products */; + ProjectRef = 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */; + }, + ); projectRoot = ""; targets = ( F5A9BFB61BE0248D00E78326 /* ParseLiveQuery-iOS */, @@ -275,6 +490,114 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 090FFBB41E26F14F0010EC2E /* Parse.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Parse.framework; + remoteRef = 090FFBB31E26F14F0010EC2E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 090FFBB61E26F14F0010EC2E /* Parse.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Parse.framework; + remoteRef = 090FFBB51E26F14F0010EC2E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 090FFBB81E26F14F0010EC2E /* ParseUnitTests-iOS.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "ParseUnitTests-iOS.xctest"; + remoteRef = 090FFBB71E26F14F0010EC2E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 090FFBBA1E26F14F0010EC2E /* Parse.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Parse.framework; + remoteRef = 090FFBB91E26F14F0010EC2E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 090FFBBC1E26F14F0010EC2E /* ParseUnitTests-macOS.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "ParseUnitTests-macOS.xctest"; + remoteRef = 090FFBBB1E26F14F0010EC2E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 090FFBBE1E26F14F0010EC2E /* Parse.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Parse.framework; + remoteRef = 090FFBBD1E26F14F0010EC2E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 090FFBC01E26F14F0010EC2E /* Parse.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Parse.framework; + remoteRef = 090FFBBF1E26F14F0010EC2E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 090FFBC21E26F14F0010EC2E /* Parse.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Parse.framework; + remoteRef = 090FFBC11E26F14F0010EC2E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 090FFBC41E26F14F0010EC2E /* Parse.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Parse.framework; + remoteRef = 090FFBC31E26F14F0010EC2E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A1A996B1E5E8DBB0047B84B /* Starscream.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Starscream.framework; + remoteRef = 4A1A996A1E5E8DBB0047B84B /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A1A996D1E5E8DBB0047B84B /* Starscream iOSTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Starscream iOSTests.xctest"; + remoteRef = 4A1A996C1E5E8DBB0047B84B /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A1A996F1E5E8DBB0047B84B /* Starscream.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Starscream.framework; + remoteRef = 4A1A996E1E5E8DBB0047B84B /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A1A99711E5E8DBB0047B84B /* Starscream OSXTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Starscream OSXTests.xctest"; + remoteRef = 4A1A99701E5E8DBB0047B84B /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A1A99731E5E8DBB0047B84B /* Starscream.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Starscream.framework; + remoteRef = 4A1A99721E5E8DBB0047B84B /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A1A99751E5E8DBB0047B84B /* Starscream tvOSTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Starscream tvOSTests.xctest"; + remoteRef = 4A1A99741E5E8DBB0047B84B /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ F5903CE81BD999C500C3EFFE /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -292,129 +615,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 0779A1A9A8C094A6EC98CD51 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - 12BD489D413AD268FF85A8FA /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - 23E82A71A220B624E9EEDD3B /* 📦 Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "📦 Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-ParseLiveQuery-iOS/Pods-ParseLiveQuery-iOS-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 42957978F8F9CAAE6BE3FE9C /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - 432EB76C64066D923373DC45 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - 458C6F69E79D3F67465FC4DB /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-ParseLiveQuery-OSX/Pods-ParseLiveQuery-OSX-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 89E3C0C052352147C9B80227 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-ParseLiveQuery-iOS/Pods-ParseLiveQuery-iOS-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 8D6D42D741753A8DA3FEBB44 /* 📦 Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "📦 Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-ParseLiveQuery-OSX/Pods-ParseLiveQuery-OSX-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ F5903CE51BD999C500C3EFFE /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -452,6 +652,24 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 090FFBC61E26F1730010EC2E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Parse-iOS-Dynamic"; + targetProxy = 090FFBC51E26F1730010EC2E /* PBXContainerItemProxy */; + }; + 4A1A99771E5E8E040047B84B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Starscream iOS"; + targetProxy = 4A1A99761E5E8E040047B84B /* PBXContainerItemProxy */; + }; + 4A1A99791E5E8E0C0047B84B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Starscream OSX"; + targetProxy = 4A1A99781E5E8E0C0047B84B /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ F5256FE01BD71F9A0052FB8A /* Debug */ = { isa = XCBuildConfiguration; @@ -512,7 +730,6 @@ }; F5903CF01BD999C500C3EFFE /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 89BFA3478A42D22F84D9F19C /* Pods-ParseLiveQuery-OSX.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; @@ -538,7 +755,6 @@ }; F5903CF11BD999C500C3EFFE /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9A79B9CA1B493BADC66AE15A /* Pods-ParseLiveQuery-OSX.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; @@ -563,9 +779,8 @@ }; F5A9BFC81BE0248D00E78326 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FC3C8121FAAE363257898195 /* Pods-ParseLiveQuery-iOS.debug.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGNING_REQUIRED = NO; DEFINES_MODULE = YES; @@ -576,7 +791,8 @@ INFOPLIST_FILE = ParseLiveQuery/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; PRODUCT_NAME = ParseLiveQuery; SDKROOT = iphoneos; @@ -590,9 +806,8 @@ }; F5A9BFC91BE0248D00E78326 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7A40A16386D0D6B38F8B2F07 /* Pods-ParseLiveQuery-iOS.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGNING_REQUIRED = NO; DEFINES_MODULE = YES; @@ -603,7 +818,8 @@ INFOPLIST_FILE = ParseLiveQuery/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; PRODUCT_NAME = ParseLiveQuery; SDKROOT = iphoneos; diff --git a/Sources/ParseLiveQuery/Client.swift b/Sources/ParseLiveQuery/Client.swift index a6b4be00..370ba277 100644 --- a/Sources/ParseLiveQuery/Client.swift +++ b/Sources/ParseLiveQuery/Client.swift @@ -10,7 +10,7 @@ import Foundation import Parse import BoltsSwift -import SocketRocket +import Starscream /** This is the 'advanced' view of live query subscriptions. It allows you to customize your subscriptions @@ -22,7 +22,7 @@ open class Client: NSObject { let applicationId: String let clientKey: String? - var socket: SRWebSocket? + var socket: WebSocket? public var userDisconnected = false // This allows us to easily plug in another request ID generation scheme, or more easily change the request id type @@ -149,11 +149,11 @@ extension Client { handler: handler ) subscriptions.append(subscriptionRecord) - - if socket?.readyState == .OPEN { + + if let socket = socket, socket.isConnected == true { _ = sendOperationAsync(.subscribe(requestId: subscriptionRecord.requestId, query: query as! PFQuery, sessionToken: PFUser.current()?.sessionToken)) - } else if socket == nil || socket?.readyState != .CONNECTING { + } else { if !userDisconnected { reconnect() } else { @@ -221,12 +221,12 @@ extension Client { you use the client, and should usually only be called when an error occurs. */ public func reconnect() { - socket?.close() + socket?.disconnect() socket = { - let socket: SRWebSocket = SRWebSocket(url: host) + let socket = WebSocket(url: host) socket.delegate = self - socket.setDelegateDispatchQueue(queue) - socket.open() + socket.callbackQueue = queue + socket.connect() userDisconnected = false return socket }() @@ -243,7 +243,7 @@ extension Client { else { return } - socket.close() + socket.disconnect() self.socket = nil userDisconnected = true } diff --git a/Sources/ParseLiveQuery/Internal/ClientPrivate.swift b/Sources/ParseLiveQuery/Internal/ClientPrivate.swift index a691274d..456b38bd 100644 --- a/Sources/ParseLiveQuery/Internal/ClientPrivate.swift +++ b/Sources/ParseLiveQuery/Internal/ClientPrivate.swift @@ -9,7 +9,7 @@ import Foundation import Parse -import SocketRocket +import Starscream import BoltsSwift private func parseObject(_ objectDictionary: [String:AnyObject]) throws -> T { @@ -114,32 +114,35 @@ func == (first: Client.RequestId, second: Client.RequestId) -> Bool { // MARK: Web Socket // --------------- -extension Client: SRWebSocketDelegate { - public func webSocket(_ webSocket: SRWebSocket!, didReceiveMessage message: Any!) { - guard let messageString = message as? String else { - fatalError("Socket got into inconsistent state and received \(message) instead.") - } - handleOperationAsync(messageString).continueWith { task in +extension Client: WebSocketDelegate { + + public func websocketDidReceiveData(socket: WebSocket, data: Data) { + print("Received binary data but we don't handle it...") + } + + public func websocketDidReceiveMessage(socket: WebSocket, text: String) { + handleOperationAsync(text).continueWith { task in if let error = task.error { print("Error: \(error)") } } } - public func webSocketDidOpen(_ webSocket: SRWebSocket!) { + public func websocketDidConnect(socket: WebSocket) { let sessionToken = PFUser.current()?.sessionToken ?? "" _ = self.sendOperationAsync(.connect(applicationId: applicationId, sessionToken: sessionToken)) } - public func webSocket(_ webSocket: SRWebSocket!, didFailWithError error: Error!) { - print("Error: \(error)") + public func websocketDidDisconnect(socket: WebSocket, error: NSError?) { + print("error: \(error)") + // TODO: Better retry logic, unless `disconnect()` was explicitly called if !userDisconnected { reconnect() } } - public func webSocket(_ webSocket: SRWebSocket!, didCloseWithCode code: Int, reason: String!, wasClean: Bool) { + public func webSocket(_ webSocket: WebSocket, didCloseWithCode code: Int, reason: String?, wasClean: Bool) { print("code: \(code) reason: \(reason)") // TODO: Better retry logic, unless `disconnect()` was explicitly called @@ -196,8 +199,7 @@ extension Client { let jsonEncoded = operation.JSONObjectRepresentation let jsonData = try JSONSerialization.data(withJSONObject: jsonEncoded, options: JSONSerialization.WritingOptions(rawValue: 0)) let jsonString = String(data: jsonData, encoding: String.Encoding.utf8) - - self.socket?.send(jsonString) + self.socket?.write(string: jsonString!) } }