diff --git a/Cartfile b/Cartfile index d1bc0598..3c369a21 100644 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1,4 @@ -github "BoltsFramework/Bolts-Swift" -github "facebook/SocketRocket" "0.4.2" -github "ParsePlatform/Parse-SDK-iOS-OSX" +github "BoltsFramework/Bolts-Swift" == 1.3.0 +github "facebook/SocketRocket" "master" +github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.14.2 diff --git a/Cartfile.resolved b/Cartfile.resolved index c7ea29a4..593e0aca 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" "0.4.2" +github "facebook/SocketRocket" "41b57bb2fc292a814f758441a05243eb38457027" github "ParsePlatform/Parse-SDK-iOS-OSX" "1.14.2" diff --git a/Carthage/Checkouts/SocketRocket b/Carthage/Checkouts/SocketRocket index 954c9478..41b57bb2 160000 --- a/Carthage/Checkouts/SocketRocket +++ b/Carthage/Checkouts/SocketRocket @@ -1 +1 @@ -Subproject commit 954c9478b5710903a485c68fe046e65293e2c900 +Subproject commit 41b57bb2fc292a814f758441a05243eb38457027 diff --git a/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj b/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj index 9a1ecc23..5b76e859 100644 --- a/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj +++ b/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj @@ -135,12 +135,15 @@ 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 = ( ); @@ -218,6 +221,36 @@ /* 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; @@ -248,6 +281,21 @@ 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; @@ -298,6 +346,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.parse.LiveQueryDemo; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -311,6 +360,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.parse.LiveQueryDemo; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 3.0; }; name = Release; }; diff --git a/Examples/LiveQueryDemo.xcodeproj/project.pbxproj b/Examples/LiveQueryDemo.xcodeproj/project.pbxproj index faed07f9..8972e023 100644 --- a/Examples/LiveQueryDemo.xcodeproj/project.pbxproj +++ b/Examples/LiveQueryDemo.xcodeproj/project.pbxproj @@ -123,12 +123,15 @@ 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 = ( ); @@ -222,6 +225,21 @@ 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; @@ -237,6 +255,21 @@ 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; @@ -252,6 +285,21 @@ 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 */ diff --git a/Gemfile b/Gemfile index 4618115d..9be29567 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ source 'https://rubygems.org' gem 'xcpretty' -gem 'cocoapods' +# xcode8 compat +gem 'cocoapods', '1.1.0.rc.2' diff --git a/Gemfile.lock b/Gemfile.lock index e57b1914..eb587398 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,35 +1,37 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.0.0) - concurrent-ruby (~> 1.0, >= 1.0.2) + 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.0.1) - activesupport (>= 4.0.2) + cocoapods (1.1.0.rc.2) + activesupport (>= 4.0.2, < 5) claide (>= 1.0.0, < 2.0) - cocoapods-core (= 1.0.1) - cocoapods-deintegrate (>= 1.0.0, < 2.0) - cocoapods-downloader (>= 1.0.0, < 2.0) + cocoapods-core (= 1.1.0.rc.2) + cocoapods-deintegrate (>= 1.0.1, < 2.0) + cocoapods-downloader (>= 1.1.1, < 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-try (>= 1.0.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) colored (~> 1.2) escape (~> 0.0.4) - fourflusher (~> 0.3.0) - molinillo (~> 0.4.5) + fourflusher (~> 1.0.1) + gh_inspector (~> 1.0) + molinillo (~> 0.5.1) nap (~> 1.0) - xcodeproj (>= 1.1.0, < 2.0) - cocoapods-core (1.0.1) - activesupport (>= 4.0.2) + xcodeproj (>= 1.3.1, < 2.0) + cocoapods-core (1.1.0.rc.2) + activesupport (>= 4.0.2, < 5) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.0) - cocoapods-downloader (1.1.0) + cocoapods-deintegrate (1.0.1) + cocoapods-downloader (1.1.1) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) @@ -39,20 +41,21 @@ GEM netrc (= 0.7.8) cocoapods-try (1.1.0) colored (1.2) - concurrent-ruby (1.0.2) escape (0.0.4) - fourflusher (0.3.2) + fourflusher (1.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.4.5) + molinillo (0.5.1) 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.2.0) + xcodeproj (1.3.1) activesupport (>= 3) claide (>= 1.0.0, < 2.0) colored (~> 1.2) @@ -63,8 +66,8 @@ PLATFORMS ruby DEPENDENCIES - cocoapods + cocoapods (= 1.1.0.rc.2) xcpretty BUNDLED WITH - 1.12.5 + 1.13.1 diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index 683225d3..afd30915 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -11,12 +11,12 @@ Pod::Spec.new do |s| s.requires_arc = true s.ios.deployment_target = '8.0' - s.osx.deployment_target = '10.9' + s.osx.deployment_target = '10.10' s.source_files = 'Sources/ParseLiveQuery/**/*.swift' s.module_name = 'ParseLiveQuery' - s.dependency 'Parse', '~> 1.14' - s.dependency 'Bolts-Swift', '~> 1.2' + s.dependency 'Parse', '~> 1.14.2' + s.dependency 'Bolts-Swift', '~> 1.3' s.dependency 'SocketRocket', '~> 0.5' end diff --git a/Podfile b/Podfile index 62692f7e..ace66cd6 100644 --- a/Podfile +++ b/Podfile @@ -8,7 +8,7 @@ def commonPods end post_install do |installer| - # Disable bitcode for now. Specifically needed for HockeySDK and ARAnalytics. + # 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' diff --git a/Podfile.lock b/Podfile.lock index 5b4ac929..665f4ccb 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -26,6 +26,6 @@ SPEC CHECKSUMS: Parse: 4335d65f40cb3d43190d723144bbe1afb9c38230 SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531 -PODFILE CHECKSUM: 6e85eacd328c6d22732f2290677ff90162634615 +PODFILE CHECKSUM: ccd9b68a1b8b06aee68db55ab458175ae7383cef -COCOAPODS: 1.0.1 +COCOAPODS: 1.1.0.rc.2 diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index ac2412a1..1c3bd90b 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -180,12 +180,14 @@ 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 = ( ); @@ -200,12 +202,14 @@ 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 = ( ); @@ -286,6 +290,51 @@ 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; @@ -331,6 +380,21 @@ 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 */