From feadd49d98cb159db0edfd9f617b60b79a0afca5 Mon Sep 17 00:00:00 2001 From: David Starke Date: Wed, 11 Jan 2017 12:58:38 -0800 Subject: [PATCH 1/6] Build from git submodules instead of CocoaPods --- .../contents.xcworkspacedata | 22 +- Podfile | 45 --- Podfile.lock | 31 -- .../ParseLiveQuery.xcodeproj/project.pbxproj | 265 +++++++----------- 4 files changed, 106 insertions(+), 257 deletions(-) delete mode 100644 Podfile delete mode 100644 Podfile.lock diff --git a/ParseLiveQuery.xcworkspace/contents.xcworkspacedata b/ParseLiveQuery.xcworkspace/contents.xcworkspacedata index 9a4a21e0..544801b1 100644 --- a/ParseLiveQuery.xcworkspace/contents.xcworkspacedata +++ b/ParseLiveQuery.xcworkspace/contents.xcworkspacedata @@ -1,24 +1,26 @@ - - - - + + + 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 1c3bd90b..0b6936a0 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -9,10 +9,30 @@ /* Begin PBXBuildFile section */ 0632EDD41CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */; }; 0632EDD51CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */; }; + 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 */; }; + 09C9FCE51E25D08D00369AA6 /* SocketRocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C821E25C2890037C3BC /* SocketRocket.framework */; }; + 09D80FD11E26BC7800AC7A2D /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C7A1E25C18E0037C3BC /* Parse.framework */; }; + 09D80FD41E26BCF500AC7A2D /* SocketRocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C861E25C5710037C3BC /* SocketRocket.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 */; }; 4A819D9D1D937866009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; 4A819D9E1D93786A009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; - 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 */; }; 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 */; }; @@ -33,15 +53,28 @@ /* 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 = ""; }; - 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 = ""; }; + 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 = "../../../../Parse-dzmtromuaifwnveuarfflegxjsqg/Build/Products/Release-iphoneos/Parse.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 09A31C7E1E25C2000037C3BC /* BoltsSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 09A31C821E25C2890037C3BC /* SocketRocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SocketRocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 09A31C841E25C5100037C3BC /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 09A31C861E25C5710037C3BC /* SocketRocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SocketRocket.framework; path = "../Release-iphoneos/SocketRocket.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; }; 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 = ""; }; @@ -54,7 +87,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 */ @@ -62,7 +94,17 @@ 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 */, + 09C9FCE51E25D08D00369AA6 /* SocketRocket.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; }; @@ -70,7 +112,17 @@ 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 */, + 09D80FD41E26BCF500AC7A2D /* SocketRocket.framework in Frameworks */, + 09D80FD51E26BD7900AC7A2D /* Bolts.framework in Frameworks */, + 09D80FD61E26BD9100AC7A2D /* BoltsSwift.framework in Frameworks */, + 09D80FD11E26BC7800AC7A2D /* Parse.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -80,27 +132,32 @@ 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 */, + 09A31C861E25C5710037C3BC /* SocketRocket.framework */, + 09A31C821E25C2890037C3BC /* SocketRocket.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 */ = { - 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 */, - ); - name = Pods; - sourceTree = ""; - }; 81464FC51CA31DA0000235E7 /* Resources */ = { isa = PBXGroup; children = ( @@ -114,7 +171,6 @@ children = ( F5256FD01BD71F9A0052FB8A /* ParseLiveQuery */, F5256FCF1BD71F9A0052FB8A /* Products */, - 173CC277BE04603C70FB4E43 /* Pods */, 0BD13CAB7945A6C1A2A7B613 /* Frameworks */, ); indentWidth = 4; @@ -180,14 +236,10 @@ 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 = ( ); @@ -202,14 +254,10 @@ 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 = ( ); @@ -274,129 +322,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; @@ -492,7 +417,6 @@ }; F5903CF01BD999C500C3EFFE /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 89BFA3478A42D22F84D9F19C /* Pods-ParseLiveQuery-OSX.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; @@ -518,7 +442,6 @@ }; F5903CF11BD999C500C3EFFE /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9A79B9CA1B493BADC66AE15A /* Pods-ParseLiveQuery-OSX.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; @@ -543,9 +466,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; @@ -556,7 +478,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; @@ -570,9 +493,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; @@ -583,7 +505,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; From 2a09baae0aedda3b8b59b6f854f07b1c362555a9 Mon Sep 17 00:00:00 2001 From: David Starke Date: Wed, 11 Jan 2017 12:59:15 -0800 Subject: [PATCH 2/6] fix build warnings and errors from dependency changes --- Sources/ParseLiveQuery/Client.swift | 2 +- Sources/ParseLiveQuery/Internal/ClientPrivate.swift | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Sources/ParseLiveQuery/Client.swift b/Sources/ParseLiveQuery/Client.swift index d9f14e8b..73616038 100644 --- a/Sources/ParseLiveQuery/Client.swift +++ b/Sources/ParseLiveQuery/Client.swift @@ -206,7 +206,7 @@ extension Client { socket = { let socket: SRWebSocket = SRWebSocket(url: host) socket.delegate = self - socket.setDelegateDispatchQueue(queue) + socket.delegateDispatchQueue = queue socket.open() userDisconnected = false return socket diff --git a/Sources/ParseLiveQuery/Internal/ClientPrivate.swift b/Sources/ParseLiveQuery/Internal/ClientPrivate.swift index 5b9a67b7..7bd0fdc8 100644 --- a/Sources/ParseLiveQuery/Internal/ClientPrivate.swift +++ b/Sources/ParseLiveQuery/Internal/ClientPrivate.swift @@ -126,7 +126,7 @@ func == (first: Client.RequestId, second: Client.RequestId) -> Bool { // --------------- extension Client: SRWebSocketDelegate { - public func webSocket(_ webSocket: SRWebSocket!, didReceiveMessage message: Any!) { + 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.") } @@ -137,12 +137,12 @@ extension Client: SRWebSocketDelegate { } } - public func webSocketDidOpen(_ webSocket: SRWebSocket!) { + public func webSocketDidOpen(_ webSocket: SRWebSocket) { let sessionToken = PFUser.current()?.sessionToken ?? "" _ = self.sendOperationAsync(.connect(applicationId: applicationId, sessionToken: sessionToken)) } - public func webSocket(_ webSocket: SRWebSocket!, didFailWithError error: Error!) { + public func webSocket(_ webSocket: SRWebSocket, didFailWithError error: Error) { print("Error: \(error)") if !userDisconnected { @@ -150,7 +150,7 @@ extension Client: SRWebSocketDelegate { } } - public func webSocket(_ webSocket: SRWebSocket!, didCloseWithCode code: Int, reason: String!, wasClean: Bool) { + public func webSocket(_ webSocket: SRWebSocket, didCloseWithCode code: Int, reason: String?, wasClean: Bool) { print("code: \(code) reason: \(reason)") // TODO: Better retry logic, unless `disconnect()` was explicitly called @@ -208,7 +208,7 @@ extension Client { 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) + try? self.socket?.send(string:jsonString!) } } From cabd406ffafdf8d83c25635e73ae7cc57009e96f Mon Sep 17 00:00:00 2001 From: David Starke Date: Wed, 11 Jan 2017 15:12:55 -0800 Subject: [PATCH 3/6] force dynamic build of parse --- .../contents.xcworkspacedata | 3 - .../ParseLiveQuery.xcodeproj/project.pbxproj | 174 +++++++++++++++++- 2 files changed, 173 insertions(+), 4 deletions(-) diff --git a/ParseLiveQuery.xcworkspace/contents.xcworkspacedata b/ParseLiveQuery.xcworkspace/contents.xcworkspacedata index 544801b1..a94411ba 100644 --- a/ParseLiveQuery.xcworkspace/contents.xcworkspacedata +++ b/ParseLiveQuery.xcworkspace/contents.xcworkspacedata @@ -17,9 +17,6 @@ - - diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 0b6936a0..beba1e18 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -51,8 +51,82 @@ 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"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Parse+LiveQuery.swift"; 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; }; @@ -61,7 +135,7 @@ 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 = "../../../../Parse-dzmtromuaifwnveuarfflegxjsqg/Build/Products/Release-iphoneos/Parse.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; }; 09A31C821E25C2890037C3BC /* SocketRocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SocketRocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 09A31C841E25C5100037C3BC /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -129,6 +203,22 @@ /* 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 = ( @@ -171,6 +261,7 @@ children = ( F5256FD01BD71F9A0052FB8A /* ParseLiveQuery */, F5256FCF1BD71F9A0052FB8A /* Products */, + 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */, 0BD13CAB7945A6C1A2A7B613 /* Frameworks */, ); indentWidth = 4; @@ -262,6 +353,7 @@ buildRules = ( ); dependencies = ( + 090FFBC61E26F1730010EC2E /* PBXTargetDependency */, ); name = "ParseLiveQuery-iOS"; productName = ParseLiveQuery; @@ -297,6 +389,12 @@ mainGroup = F5256FC41BD71F9A0052FB8A; productRefGroup = F5256FCF1BD71F9A0052FB8A /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 090FFBA81E26F14F0010EC2E /* Products */; + ProjectRef = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; + }, + ); projectRoot = ""; targets = ( F5A9BFB61BE0248D00E78326 /* ParseLiveQuery-iOS */, @@ -305,6 +403,72 @@ }; /* 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; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ F5903CE81BD999C500C3EFFE /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -359,6 +523,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 090FFBC61E26F1730010EC2E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Parse-iOS-Dynamic"; + targetProxy = 090FFBC51E26F1730010EC2E /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ F5256FE01BD71F9A0052FB8A /* Debug */ = { isa = XCBuildConfiguration; From 366014b1a7c18140d1a56669605adedf52124f58 Mon Sep 17 00:00:00 2001 From: David Starke Date: Wed, 11 Jan 2017 16:41:09 -0800 Subject: [PATCH 4/6] Make SocketRocket dynamic an explicit dependency --- .../contents.xcworkspacedata | 3 - .../ParseLiveQuery.xcodeproj/project.pbxproj | 116 ++++++++++++++++++ 2 files changed, 116 insertions(+), 3 deletions(-) diff --git a/ParseLiveQuery.xcworkspace/contents.xcworkspacedata b/ParseLiveQuery.xcworkspace/contents.xcworkspacedata index a94411ba..9f6431ca 100644 --- a/ParseLiveQuery.xcworkspace/contents.xcworkspacedata +++ b/ParseLiveQuery.xcworkspace/contents.xcworkspacedata @@ -17,7 +17,4 @@ - - diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index beba1e18..a9256ba1 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -122,11 +122,61 @@ remoteGlobalIDString = 81C582E11C3B0A98000063C6; remoteInfo = "Parse-iOS-Dynamic"; }; + 09301A291E270795003C22EF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 09301A181E270795003C22EF /* SocketRocket.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 81D6478D1D2CA78800690609; + remoteInfo = "SocketRocket-iOS"; + }; + 09301A2B1E270795003C22EF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 09301A181E270795003C22EF /* SocketRocket.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 2D4227621BB4358C000C1A6C; + remoteInfo = "SocketRocket-iOS-Dynamic"; + }; + 09301A2D1E270795003C22EF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 09301A181E270795003C22EF /* SocketRocket.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F668C880153E91210044DBAC; + remoteInfo = "SocketRocket-macOS"; + }; + 09301A2F1E270795003C22EF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 09301A181E270795003C22EF /* SocketRocket.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3345DC901C52ACD70083CCB8; + remoteInfo = "SocketRocket-tvOS"; + }; + 09301A311E270795003C22EF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 09301A181E270795003C22EF /* SocketRocket.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F6BDA802145900D200FE3253; + remoteInfo = "SocketRocketTests-iOS"; + }; + 09301A331E270795003C22EF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 09301A181E270795003C22EF /* SocketRocket.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F62417E314D52F3C003CE997; + remoteInfo = TestChat; + }; + 09301A351E2707BC003C22EF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 09301A181E270795003C22EF /* SocketRocket.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 2D4227611BB4358C000C1A6C; + remoteInfo = "SocketRocket-iOS-Dynamic"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Parse+LiveQuery.swift"; sourceTree = ""; }; 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "../Carthage/Checkouts/Parse-SDK-iOS-OSX/Parse.xcodeproj"; sourceTree = ""; }; + 09301A181E270795003C22EF /* SocketRocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SocketRocket.xcodeproj; path = ../Carthage/Checkouts/SocketRocket/SocketRocket.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; }; @@ -219,6 +269,19 @@ name = Products; sourceTree = ""; }; + 09301A191E270795003C22EF /* Products */ = { + isa = PBXGroup; + children = ( + 09301A2A1E270795003C22EF /* SocketRocket.framework */, + 09301A2C1E270795003C22EF /* SocketRocket.framework */, + 09301A2E1E270795003C22EF /* SocketRocket.framework */, + 09301A301E270795003C22EF /* SocketRocket.framework */, + 09301A321E270795003C22EF /* SocketRocketTests-iOS.xctest */, + 09301A341E270795003C22EF /* TestChat.app */, + ); + name = Products; + sourceTree = ""; + }; 0BD13CAB7945A6C1A2A7B613 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -262,6 +325,7 @@ F5256FD01BD71F9A0052FB8A /* ParseLiveQuery */, F5256FCF1BD71F9A0052FB8A /* Products */, 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */, + 09301A181E270795003C22EF /* SocketRocket.xcodeproj */, 0BD13CAB7945A6C1A2A7B613 /* Frameworks */, ); indentWidth = 4; @@ -353,6 +417,7 @@ buildRules = ( ); dependencies = ( + 09301A361E2707BC003C22EF /* PBXTargetDependency */, 090FFBC61E26F1730010EC2E /* PBXTargetDependency */, ); name = "ParseLiveQuery-iOS"; @@ -394,6 +459,10 @@ ProductGroup = 090FFBA81E26F14F0010EC2E /* Products */; ProjectRef = 090FFBA71E26F14F0010EC2E /* Parse.xcodeproj */; }, + { + ProductGroup = 09301A191E270795003C22EF /* Products */; + ProjectRef = 09301A181E270795003C22EF /* SocketRocket.xcodeproj */; + }, ); projectRoot = ""; targets = ( @@ -467,6 +536,48 @@ remoteRef = 090FFBC31E26F14F0010EC2E /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 09301A2A1E270795003C22EF /* SocketRocket.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = SocketRocket.framework; + remoteRef = 09301A291E270795003C22EF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 09301A2C1E270795003C22EF /* SocketRocket.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = SocketRocket.framework; + remoteRef = 09301A2B1E270795003C22EF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 09301A2E1E270795003C22EF /* SocketRocket.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = SocketRocket.framework; + remoteRef = 09301A2D1E270795003C22EF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 09301A301E270795003C22EF /* SocketRocket.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = SocketRocket.framework; + remoteRef = 09301A2F1E270795003C22EF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 09301A321E270795003C22EF /* SocketRocketTests-iOS.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "SocketRocketTests-iOS.xctest"; + remoteRef = 09301A311E270795003C22EF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 09301A341E270795003C22EF /* TestChat.app */ = { + isa = PBXReferenceProxy; + fileType = wrapper.application; + path = TestChat.app; + remoteRef = 09301A331E270795003C22EF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -529,6 +640,11 @@ name = "Parse-iOS-Dynamic"; targetProxy = 090FFBC51E26F1730010EC2E /* PBXContainerItemProxy */; }; + 09301A361E2707BC003C22EF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "SocketRocket-iOS-Dynamic"; + targetProxy = 09301A351E2707BC003C22EF /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ From 485afa15b3f60973d7a109db6f2a4ee59772e592 Mon Sep 17 00:00:00 2001 From: David Starke Date: Fri, 13 Jan 2017 13:31:04 -0800 Subject: [PATCH 5/6] make example projects build --- .../project.pbxproj | 103 ------------------ .../LiveQueryDemo.xcodeproj/project.pbxproj | 103 ------------------ 2 files changed, 206 deletions(-) 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; From 59878c816cb8ece6abf463bfc549d71e36645bcd Mon Sep 17 00:00:00 2001 From: David Starke Date: Fri, 13 Jan 2017 15:47:31 -0800 Subject: [PATCH 6/6] remove CocoaPods steps from CI build --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94cb33d5..cf26b15e 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