diff --git a/.circleci/config.yml b/.circleci/config.yml index dc91bb2be..e1d828481 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ aliases: - &prepare | git submodule update --init --recursive - gem install bundler + sudo gem install bundler bundle install - &filter-only-master branches: @@ -19,7 +19,6 @@ jobs: <<: *defaults steps: - checkout - - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: bundle exec rake test:ios - run: bash <(curl -s https://codecov.io/bash) @@ -29,7 +28,6 @@ jobs: <<: *defaults steps: - checkout - - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: name: "Create and set the default keychain" @@ -49,7 +47,6 @@ jobs: <<: *defaults steps: - checkout - - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: bundle exec rake test:facebook_utils:ios - run: bash <(curl -s https://codecov.io/bash) @@ -59,7 +56,6 @@ jobs: <<: *defaults steps: - checkout - - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: bundle exec rake test:twitter_utils:ios - run: bash <(curl -s https://codecov.io/bash) @@ -69,7 +65,6 @@ jobs: <<: *defaults steps: - checkout - - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: bundle exec rake test:parseui:all - run: bash <(curl -s https://codecov.io/bash) @@ -87,21 +82,18 @@ jobs: <<: *defaults steps: - checkout - - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: ./Scripts/jazzy.sh carthage: <<: *defaults steps: - checkout - - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: bundle exec rake test:carthage cocoapods: <<: *defaults steps: - checkout - - run: echo 'chruby ruby-2.6' >> ~/.bash_profile - run: *prepare - run: bundle exec rake test:cocoapods diff --git a/.gitignore b/.gitignore index 329eeaaf3..ec269cf76 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ ## Build generated build/ DerivedData +OCMock.framework ## Various settings *.pbxuser diff --git a/.gitmodules b/.gitmodules index 7d774d0ea..ad4c2af75 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "Carthage/Checkouts/facebook-objc-sdk"] path = Carthage/Checkouts/facebook-objc-sdk url = https://github.com/facebook/facebook-objc-sdk.git +[submodule "Carthage/Checkouts/OCMock"] + path = Carthage/Checkouts/OCMock + url = https://github.com/erikdoe/OCMock.git diff --git a/Cartfile.resolved b/Cartfile.resolved index 33cc42956..c2b29cfdd 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "facebook/facebook-objc-sdk" "v5.13.1" +github "facebook/facebook-objc-sdk" "v5.15.1" github "parse-community/Bolts-ObjC" "1.9.1" diff --git a/Carthage/Checkouts/OCMock b/Carthage/Checkouts/OCMock new file mode 160000 index 000000000..62fd0b23c --- /dev/null +++ b/Carthage/Checkouts/OCMock @@ -0,0 +1 @@ +Subproject commit 62fd0b23c6f5be5c4166211f82b4e162af9ad4ce diff --git a/Carthage/Checkouts/facebook-objc-sdk b/Carthage/Checkouts/facebook-objc-sdk index 54219ba9f..9398d3008 160000 --- a/Carthage/Checkouts/facebook-objc-sdk +++ b/Carthage/Checkouts/facebook-objc-sdk @@ -1 +1 @@ -Subproject commit 54219ba9f5c7bdaabdd92aeac10023731e09efc8 +Subproject commit 9398d30089c2c14e0f0026e24388ca0829f8f1c5 diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj index aeb81cb15..516e1d307 100644 --- a/Parse/Parse.xcodeproj/project.pbxproj +++ b/Parse/Parse.xcodeproj/project.pbxproj @@ -21,8 +21,6 @@ 403093761C81F0B200CF09F8 /* PFQueryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */; }; 403093771C81F0B200CF09F8 /* PFQueryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */; }; 403093781C81F0B200CF09F8 /* PFQueryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */; }; - 4A0ECC9A200DA25700BA84A3 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0ECC9B200DA25700BA84A3 /* OCMock.framework */; }; - 4A0ECC9C200DA26000BA84A3 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0ECC9D200DA26000BA84A3 /* OCMock.framework */; platformFilter = ios; }; 4A13525620282B4D000F5FD5 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97010FAC1630B18F00AB761E /* Parse.framework */; }; 4A13525F20283603000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518820281768000F5FD5 /* Bolts.framework */; }; 4AAEAA40200BE14B00AA7479 /* third_party_licenses.txt in Resources */ = {isa = PBXBuildFile; fileRef = 8139B12C1A7BF559002BEF84 /* third_party_licenses.txt */; }; @@ -2351,23 +2349,6 @@ 81C587081C3B0AA9000063C6 /* PFCurrentConfigController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BF4ABA1B0BF64B00A3D75B /* PFCurrentConfigController.h */; settings = {ATTRIBUTES = (Private, ); }; }; 81C5870A1C3B0AA9000063C6 /* Parse.strings in Resources */ = {isa = PBXBuildFile; fileRef = 81E7BE011B82B931007ACDD8 /* Parse.strings */; }; 81C5870B1C3B0AA9000063C6 /* third_party_licenses.txt in Resources */ = {isa = PBXBuildFile; fileRef = 8139B12C1A7BF559002BEF84 /* third_party_licenses.txt */; }; - 81C587131C3B0B18000063C6 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C587121C3B0B18000063C6 /* UIKit.framework */; }; - 81C587151C3B0B1C000063C6 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C587141C3B0B1C000063C6 /* AudioToolbox.framework */; }; - 81C587171C3B0B22000063C6 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C587161C3B0B22000063C6 /* CoreLocation.framework */; }; - 81C587191C3B0B2A000063C6 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C587181C3B0B2A000063C6 /* Security.framework */; }; - 81C5871B1C3B0B2F000063C6 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C5871A1C3B0B2F000063C6 /* StoreKit.framework */; }; - 81C5871D1C3B0B35000063C6 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C5871C1C3B0B35000063C6 /* SystemConfiguration.framework */; }; - 81C5871F1C3B0B3A000063C6 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C5871E1C3B0B3A000063C6 /* libsqlite3.tbd */; }; - 81C587221C3B0B77000063C6 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C587211C3B0B77000063C6 /* SystemConfiguration.framework */; }; - 81C587241C3B0B7B000063C6 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C587231C3B0B7B000063C6 /* Security.framework */; }; - 81C587261C3B0B7F000063C6 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C587251C3B0B7F000063C6 /* CoreLocation.framework */; }; - 81C587281C3B0B84000063C6 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C587271C3B0B84000063C6 /* StoreKit.framework */; }; - 81C5872A1C3B0B8A000063C6 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C587291C3B0B8A000063C6 /* UIKit.framework */; }; - 81C5872C1C3B0B8D000063C6 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C5872B1C3B0B8D000063C6 /* libsqlite3.tbd */; }; - 81C5872F1C3B0BB1000063C6 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C5872E1C3B0BB1000063C6 /* libsqlite3.tbd */; }; - 81C587311C3B0BB6000063C6 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C587301C3B0BB6000063C6 /* Security.framework */; }; - 81C587331C3B0BB9000063C6 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C587321C3B0BB9000063C6 /* CoreLocation.framework */; }; - 81C587351C3B0BBE000063C6 /* WatchKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81C587341C3B0BBE000063C6 /* WatchKit.framework */; }; 81C6BDEE1B4DB16500553A83 /* PFInstallationConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 81C6BDEC1B4DB16500553A83 /* PFInstallationConstants.h */; settings = {ATTRIBUTES = (Private, ); }; }; 81C6BDEF1B4DB16500553A83 /* PFInstallationConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 81C6BDEC1B4DB16500553A83 /* PFInstallationConstants.h */; settings = {ATTRIBUTES = (Private, ); }; }; 81C6BDF01B4DB16500553A83 /* PFInstallationConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 81C6BDED1B4DB16500553A83 /* PFInstallationConstants.m */; }; @@ -2658,6 +2639,8 @@ B141170F1E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; B14117101E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; B14117111E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B9312D5B23C4A6FC002D4A4C /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9312D5623C4A6FC002D4A4C /* OCMock.framework */; }; + B9312D5D23C4A775002D4A4C /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9312D5C23C4A775002D4A4C /* OCMock.framework */; }; BCC5EAB322D5F97E00CF8900 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC5EAB222D5F97D00CF8900 /* Bolts.framework */; }; BCC5EAB522D5F98F00CF8900 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC5EAB422D5F98F00CF8900 /* Bolts.framework */; }; BCC5EAB622D5F9BA00CF8900 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC5EAAC22D5F96600CF8900 /* Bolts.framework */; }; @@ -3005,8 +2988,6 @@ 499E425615B6409000A2C28E /* PFProduct.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFProduct.m; sourceTree = ""; }; 49FDE2EC158C138F00126F64 /* PFPurchase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPurchase.h; sourceTree = ""; }; 49FDE2ED158C138F00126F64 /* PFPurchase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFPurchase.m; sourceTree = ""; }; - 4A0ECC9B200DA25700BA84A3 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A0ECC9D200DA26000BA84A3 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = ""; }; 4ABF398B1F54592100BBA75A /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; 4AE33A0B1F5451AD0088DCA0 /* ParseUnitTests-iOS-host.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ParseUnitTests-iOS-host.app"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -3377,23 +3358,6 @@ 81C5845D1C3B0A98000063C6 /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 81C585BF1C3B0AA1000063C6 /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 81C5870F1C3B0AA9000063C6 /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 81C587121C3B0B18000063C6 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; - 81C587141C3B0B1C000063C6 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; }; - 81C587161C3B0B22000063C6 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/System/Library/Frameworks/CoreLocation.framework; sourceTree = DEVELOPER_DIR; }; - 81C587181C3B0B2A000063C6 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; - 81C5871A1C3B0B2F000063C6 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; }; - 81C5871C1C3B0B35000063C6 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; - 81C5871E1C3B0B3A000063C6 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; - 81C587211C3B0B77000063C6 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; - 81C587231C3B0B7B000063C6 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; - 81C587251C3B0B7F000063C6 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/CoreLocation.framework; sourceTree = DEVELOPER_DIR; }; - 81C587271C3B0B84000063C6 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; }; - 81C587291C3B0B8A000063C6 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; - 81C5872B1C3B0B8D000063C6 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; - 81C5872E1C3B0BB1000063C6 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.1.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; - 81C587301C3B0BB6000063C6 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.1.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; - 81C587321C3B0BB9000063C6 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.1.sdk/System/Library/Frameworks/CoreLocation.framework; sourceTree = DEVELOPER_DIR; }; - 81C587341C3B0BBE000063C6 /* WatchKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WatchKit.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.1.sdk/System/Library/Frameworks/WatchKit.framework; sourceTree = DEVELOPER_DIR; }; 81C6BDEC1B4DB16500553A83 /* PFInstallationConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFInstallationConstants.h; sourceTree = ""; }; 81C6BDED1B4DB16500553A83 /* PFInstallationConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFInstallationConstants.m; sourceTree = ""; }; 81C6BDF31B4DD32700553A83 /* PFCurrentObjectControlling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFCurrentObjectControlling.h; sourceTree = ""; }; @@ -3518,6 +3482,8 @@ B141169D1E5BC24B00F70D7A /* PFFileUploadController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFFileUploadController.h; sourceTree = ""; }; B14116FB1E5D078E00F70D7A /* PFFileUploadResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFFileUploadResult.m; sourceTree = ""; }; B141170A1E5D081500F70D7A /* PFFileUploadResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFFileUploadResult.h; sourceTree = ""; }; + B9312D5623C4A6FC002D4A4C /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = ../Carthage/Build/iOS/OCMock.framework; sourceTree = ""; }; + B9312D5C23C4A775002D4A4C /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = ../Carthage/Build/Mac/OCMock.framework; sourceTree = ""; }; BCC5EAAC22D5F96600CF8900 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/iOS/Bolts.framework; sourceTree = ""; }; BCC5EAB222D5F97D00CF8900 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/tvOS/Bolts.framework; sourceTree = ""; }; BCC5EAB422D5F98F00CF8900 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/watchOS/Bolts.framework; sourceTree = ""; }; @@ -3603,13 +3569,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B9312D5B23C4A6FC002D4A4C /* OCMock.framework in Frameworks */, F5C42CC71B34C22100C720D8 /* AudioToolbox.framework in Frameworks */, 816F44761A8E8933009CDB32 /* StoreKit.framework in Frameworks */, 816F44771A8E8933009CDB32 /* libsqlite3.dylib in Frameworks */, 816F44781A8E8933009CDB32 /* Accounts.framework in Frameworks */, 816F44791A8E8933009CDB32 /* Social.framework in Frameworks */, F5B0B3151B44A21100F3EBC4 /* SystemConfiguration.framework in Frameworks */, - 4A0ECC9C200DA26000BA84A3 /* OCMock.framework in Frameworks */, 816F44741A8E8933009CDB32 /* Parse.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3619,7 +3585,7 @@ buildActionMask = 2147483647; files = ( 4A13525620282B4D000F5FD5 /* Parse.framework in Frameworks */, - 4A0ECC9A200DA25700BA84A3 /* OCMock.framework in Frameworks */, + B9312D5D23C4A775002D4A4C /* OCMock.framework in Frameworks */, F5B0B3171B44A2CA00F3EBC4 /* StoreKit.framework in Frameworks */, F5B0B3161B44A22300F3EBC4 /* SystemConfiguration.framework in Frameworks */, ); @@ -3636,13 +3602,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 81C5871F1C3B0B3A000063C6 /* libsqlite3.tbd in Frameworks */, - 81C5871D1C3B0B35000063C6 /* SystemConfiguration.framework in Frameworks */, - 81C5871B1C3B0B2F000063C6 /* StoreKit.framework in Frameworks */, - 81C587191C3B0B2A000063C6 /* Security.framework in Frameworks */, - 81C587171C3B0B22000063C6 /* CoreLocation.framework in Frameworks */, - 81C587151C3B0B1C000063C6 /* AudioToolbox.framework in Frameworks */, - 81C587131C3B0B18000063C6 /* UIKit.framework in Frameworks */, BCC5EAB622D5F9BA00CF8900 /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3651,12 +3610,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 81C5872C1C3B0B8D000063C6 /* libsqlite3.tbd in Frameworks */, - 81C5872A1C3B0B8A000063C6 /* UIKit.framework in Frameworks */, - 81C587281C3B0B84000063C6 /* StoreKit.framework in Frameworks */, - 81C587261C3B0B7F000063C6 /* CoreLocation.framework in Frameworks */, - 81C587241C3B0B7B000063C6 /* Security.framework in Frameworks */, - 81C587221C3B0B77000063C6 /* SystemConfiguration.framework in Frameworks */, BCC5EAB322D5F97E00CF8900 /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3666,10 +3619,6 @@ buildActionMask = 2147483647; files = ( BCC5EAB522D5F98F00CF8900 /* Bolts.framework in Frameworks */, - 81C587351C3B0BBE000063C6 /* WatchKit.framework in Frameworks */, - 81C587331C3B0BB9000063C6 /* CoreLocation.framework in Frameworks */, - 81C587311C3B0BB6000063C6 /* Security.framework in Frameworks */, - 81C5872F1C3B0BB1000063C6 /* libsqlite3.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3906,29 +3855,12 @@ 09D3364C139C54940098E916 /* Frameworks */ = { isa = PBXGroup; children = ( + B9312D5623C4A6FC002D4A4C /* OCMock.framework */, + B9312D5C23C4A775002D4A4C /* OCMock.framework */, BCC5EAAC22D5F96600CF8900 /* Bolts.framework */, BCC5EAB222D5F97D00CF8900 /* Bolts.framework */, BCC5EAB422D5F98F00CF8900 /* Bolts.framework */, 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */, - 4A0ECC9D200DA26000BA84A3 /* OCMock.framework */, - 4A0ECC9B200DA25700BA84A3 /* OCMock.framework */, - 81C587341C3B0BBE000063C6 /* WatchKit.framework */, - 81C587321C3B0BB9000063C6 /* CoreLocation.framework */, - 81C587301C3B0BB6000063C6 /* Security.framework */, - 81C5872E1C3B0BB1000063C6 /* libsqlite3.tbd */, - 81C5872B1C3B0B8D000063C6 /* libsqlite3.tbd */, - 81C587291C3B0B8A000063C6 /* UIKit.framework */, - 81C587271C3B0B84000063C6 /* StoreKit.framework */, - 81C587251C3B0B7F000063C6 /* CoreLocation.framework */, - 81C587231C3B0B7B000063C6 /* Security.framework */, - 81C587211C3B0B77000063C6 /* SystemConfiguration.framework */, - 81C5871E1C3B0B3A000063C6 /* libsqlite3.tbd */, - 81C5871C1C3B0B35000063C6 /* SystemConfiguration.framework */, - 81C5871A1C3B0B2F000063C6 /* StoreKit.framework */, - 81C587181C3B0B2A000063C6 /* Security.framework */, - 81C587161C3B0B22000063C6 /* CoreLocation.framework */, - 81C587141C3B0B1C000063C6 /* AudioToolbox.framework */, - 81C587121C3B0B18000063C6 /* UIKit.framework */, 813E97A91A26A76A00373BA7 /* System Frameworks */, ); name = Frameworks; diff --git a/Parse/Parse/Internal/PFApplication.m b/Parse/Parse/Internal/PFApplication.m index b415e6d2d..925b7a23d 100644 --- a/Parse/Parse/Internal/PFApplication.m +++ b/Parse/Parse/Internal/PFApplication.m @@ -39,8 +39,10 @@ - (id)init { if (self) { #if TARGET_OS_IOS || TARGET_OS_TV if (@available(iOS 1.0, tvOS 10.0, *)) { - [self.systemApplication addObserver:self forKeyPath:@"applicationIconBadgeNumber" options:NSKeyValueObservingOptionNew context:nil]; - _iconBadgeNumber = self.systemApplication.applicationIconBadgeNumber; + dispatch_async(dispatch_get_main_queue(), ^{ + [self.systemApplication addObserver:self forKeyPath:@"applicationIconBadgeNumber" options:NSKeyValueObservingOptionNew context:nil]; + self->_iconBadgeNumber = self.systemApplication.applicationIconBadgeNumber; + }); } #endif } diff --git a/Parse/Tests/Other/StoreKitMocking/PFTestSKProductsRequest.m b/Parse/Tests/Other/StoreKitMocking/PFTestSKProductsRequest.m index 215889be5..b2b83abc0 100644 --- a/Parse/Tests/Other/StoreKitMocking/PFTestSKProductsRequest.m +++ b/Parse/Tests/Other/StoreKitMocking/PFTestSKProductsRequest.m @@ -67,4 +67,4 @@ - (void)start { - (void)cancel { } -@end \ No newline at end of file +@end diff --git a/Parse/Tests/Unit/FileControllerTests.m b/Parse/Tests/Unit/FileControllerTests.m index 3d4dfa4ee..78d723a02 100644 --- a/Parse/Tests/Unit/FileControllerTests.m +++ b/Parse/Tests/Unit/FileControllerTests.m @@ -340,8 +340,8 @@ - (void)testDownloadStreamSharesOperations { BFTaskCompletionSource *taskCompletionSource = [BFTaskCompletionSource taskCompletionSource]; __block PFProgressBlock progressBlock = nil; - id mockedCommandRunner = [mockedDataSource commandRunner]; - OCMStub([mockedCommandRunner runFileDownloadCommandAsyncWithFileURL:tempPath + id commandRunner = [mockedDataSource commandRunner]; + OCMStub([commandRunner runFileDownloadCommandAsyncWithFileURL:tempPath targetFilePath:[OCMArg isNotNil] cancellationToken:nil progressBlock:[OCMArg checkWithBlock:^BOOL(id obj) { diff --git a/Parse/Tests/Unit/KeyValueCacheTests.m b/Parse/Tests/Unit/KeyValueCacheTests.m index ff4197f83..64bd2537d 100644 --- a/Parse/Tests/Unit/KeyValueCacheTests.m +++ b/Parse/Tests/Unit/KeyValueCacheTests.m @@ -54,7 +54,7 @@ - (void)testConstructors { XCTAssertEqual(cache.maxDiskCacheRecords, 1000); XCTAssertEqual(cache.maxMemoryCacheBytesPerRecord, 1024 * 1024); - id mockedFileManager = [TestFileManager fileManager]; + id mockedFileManager = [OCMockObject partialMockForObject:[TestFileManager fileManager]]; OCMExpect([mockedFileManager createDirectoryAtURL:OCMOCK_ANY withIntermediateDirectories:YES attributes:nil error:NULL]); NSCache *mockedCache = [TestCache cache]; diff --git a/Parse/Tests/Unit/PinningObjectStoreTests.m b/Parse/Tests/Unit/PinningObjectStoreTests.m index 524319adb..f06ecd5b6 100644 --- a/Parse/Tests/Unit/PinningObjectStoreTests.m +++ b/Parse/Tests/Unit/PinningObjectStoreTests.m @@ -38,9 +38,8 @@ @implementation PinningObjectStoreTests - (void)setUp { - [PFPin registerSubclass]; - [super setUp]; + [PFPin registerSubclass]; } - (void)testConstructors { diff --git a/Parse/Tests/Unit/PurchaseControllerTests.m b/Parse/Tests/Unit/PurchaseControllerTests.m index 398894ec4..1236b24ea 100644 --- a/Parse/Tests/Unit/PurchaseControllerTests.m +++ b/Parse/Tests/Unit/PurchaseControllerTests.m @@ -187,8 +187,10 @@ - (void)testBuyProductsAsync { }]; [self waitForTestExpectations]; - - OCMStub([purchaseController canPurchase]).andReturn(YES); + + id partial = [OCMockObject partialMockForObject:purchaseController]; + OCMStub([partial canPurchase]).andReturn(YES); + XCTestExpectation *failInvalidProductExpectation = [self expectationWithDescription:@"Failed Invalid Product"]; [[purchaseController buyProductAsyncWithIdentifier:@"nonexistent"] continueWithBlock:^id(BFTask *task) { diff --git a/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj b/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj index 779a4ee3a..4bc5f9cf0 100644 --- a/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj +++ b/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj @@ -3,32 +3,17 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ - 4A0ECC80200D99FF00BA84A3 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAA45200BE26C00AA7479 /* Bolts.framework */; }; - 4A0ECC84200D9A0D00BA84A3 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAA45200BE26C00AA7479 /* Bolts.framework */; }; - 4A0ECC88200D9A1D00BA84A3 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A9A9503200D1462005D8F4B /* Parse.framework */; }; - 4A0ECC8A200D9A1E00BA84A3 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A9A9503200D1462005D8F4B /* Parse.framework */; }; - 4A0ECC8B200D9A7300BA84A3 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAA0200C0FC500AA7479 /* SystemConfiguration.framework */; }; - 4A0ECC8C200D9A7F00BA84A3 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAA2200C0FCC00AA7479 /* libsqlite3.tbd */; }; - 4A0ECC8D200D9A8900BA84A3 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAAA200C0FEC00AA7479 /* AudioToolbox.framework */; }; 4A1350672027EA53000F5FD5 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13505B2027EA26000F5FD5 /* Parse.framework */; }; 4A1351BF2028185E000F5FD5 /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1351BD2028185E000F5FD5 /* FBSDKCoreKit.framework */; }; 4A1351C02028185E000F5FD5 /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1351BE2028185E000F5FD5 /* FBSDKLoginKit.framework */; }; 4A1351C320281868000F5FD5 /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1351C120281867000F5FD5 /* FBSDKCoreKit.framework */; }; 4A1351C420281868000F5FD5 /* FBSDKTVOSKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1351C220281867000F5FD5 /* FBSDKTVOSKit.framework */; }; - 4A1351C920281889000F5FD5 /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1351C720281889000F5FD5 /* FBSDKLoginKit.framework */; }; - 4A1351CA20281889000F5FD5 /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1351C820281889000F5FD5 /* FBSDKCoreKit.framework */; }; 4A1351CD20281897000F5FD5 /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1351CB20281897000F5FD5 /* FBSDKCoreKit.framework */; }; 4A1351CE20281897000F5FD5 /* FBSDKTVOSKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1351CC20281897000F5FD5 /* FBSDKTVOSKit.framework */; }; - 4A13521C20281B49000F5FD5 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13504F2027EA26000F5FD5 /* Parse.framework */; }; - 4A13524F20282583000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13525020282583000F5FD5 /* Bolts.framework */; }; - 4A1352512028259D000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1352522028259D000F5FD5 /* Bolts.framework */; }; - 4A13525C20282C03000F5FD5 /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1351BD2028185E000F5FD5 /* FBSDKCoreKit.framework */; }; - 4A13525D20282C03000F5FD5 /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1351BE2028185E000F5FD5 /* FBSDKLoginKit.framework */; }; - 4AAEAA41200BE19A00AA7479 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAA42200BE19A00AA7479 /* OCMock.framework */; }; 4AAEAA5F200C020E00AA7479 /* PFFacebookUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 813DFC841AB2510300F25A08 /* PFFacebookUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AAEAA60200C020E00AA7479 /* PFFacebookAuthenticationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 81EA09C91C178DED00B0F875 /* PFFacebookAuthenticationProvider.h */; }; 4AAEAA61200C020E00AA7479 /* PFFacebookMobileAuthenticationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 81EA09C61C178DED00B0F875 /* PFFacebookMobileAuthenticationProvider.h */; }; @@ -50,26 +35,11 @@ 4AAEAA83200C022300AA7479 /* PFFacebookAuthenticationProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 81EA09CA1C178DED00B0F875 /* PFFacebookAuthenticationProvider.m */; }; 4AAEAA84200C022300AA7479 /* PFFacebookUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 813DFC851AB2510300F25A08 /* PFFacebookUtils.m */; }; 4AAEAA85200C022300AA7479 /* PFFacebookPrivateUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81E35FD31BAA6F8400348526 /* PFFacebookPrivateUtilities.m */; }; - 4AAEAAA1200C0FC500AA7479 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAA0200C0FC500AA7479 /* SystemConfiguration.framework */; }; - 4AAEAAA3200C0FCC00AA7479 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAA2200C0FCC00AA7479 /* libsqlite3.tbd */; }; - 4AAEAAA5200C0FD200AA7479 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAA4200C0FD200AA7479 /* StoreKit.framework */; }; - 4AAEAAA7200C0FDC00AA7479 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAA6200C0FDC00AA7479 /* Security.framework */; }; - 4AAEAAA9200C0FE100AA7479 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAA8200C0FE100AA7479 /* CoreLocation.framework */; }; - 4AAEAAAB200C0FEC00AA7479 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAAA200C0FEC00AA7479 /* AudioToolbox.framework */; }; - 4AAEAAAD200C0FF300AA7479 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAAC200C0FF300AA7479 /* UIKit.framework */; }; - 4AAEAAAF200C101100AA7479 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAAE200C101100AA7479 /* AudioToolbox.framework */; }; - 4AAEAAB1200C101700AA7479 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAB0200C101700AA7479 /* libsqlite3.tbd */; }; - 4AAEAAB3200C102100AA7479 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAB2200C102100AA7479 /* UIKit.framework */; }; - 4AAEAAB5200C102600AA7479 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAB4200C102600AA7479 /* StoreKit.framework */; }; - 4AAEAAB7200C103000AA7479 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAB6200C103000AA7479 /* CoreLocation.framework */; }; - 4AAEAAB9200C103500AA7479 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAAB8200C103500AA7479 /* Security.framework */; }; - 4AAEAABB200C103B00AA7479 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAABA200C103B00AA7479 /* SystemConfiguration.framework */; }; 813DFC8A1AB2510300F25A08 /* PFFacebookUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 813DFC841AB2510300F25A08 /* PFFacebookUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; 813DFC8B1AB2510300F25A08 /* PFFacebookUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 813DFC851AB2510300F25A08 /* PFFacebookUtils.m */; }; 815FC59A1BBF74890006AF6E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 815FC5971BBF74890006AF6E /* main.m */; }; 81643D771AB79ABD00DD3E65 /* PFFacebookUtils_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 81643D761AB79ABD00DD3E65 /* PFFacebookUtils_Private.h */; }; - 81930A3E1BBE1A0600A5E4BB /* PFFacebookTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 81930A3D1BBE1A0600A5E4BB /* PFFacebookTestCase.m */; }; - 81CB98CC1AB7905D00136FA5 /* ParseFacebookUtilsV4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AAC07E0554694100DB518D /* ParseFacebookUtilsV4.framework */; }; + 81930A3E1BBE1A0600A5E4BB /* PFFacebookTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 81930A3D1BBE1A0600A5E4BB /* PFFacebookTestCase.m */; platformFilter = ios; }; 81E35FD41BAA6F8400348526 /* PFFacebookPrivateUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 81E35FD21BAA6F8400348526 /* PFFacebookPrivateUtilities.h */; }; 81E35FD51BAA6F8400348526 /* PFFacebookPrivateUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81E35FD31BAA6F8400348526 /* PFFacebookPrivateUtilities.m */; }; 81EA09CE1C178DED00B0F875 /* PFFacebookMobileAuthenticationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 81EA09C61C178DED00B0F875 /* PFFacebookMobileAuthenticationProvider.h */; }; @@ -88,8 +58,19 @@ 81FE7F7B1C17790400E6BD34 /* PFFacebookUtils_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 81643D761AB79ABD00DD3E65 /* PFFacebookUtils_Private.h */; }; 81FE7F7E1C17790400E6BD34 /* PFFacebookUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 813DFC851AB2510300F25A08 /* PFFacebookUtils.m */; }; 81FE7F801C17790400E6BD34 /* PFFacebookPrivateUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81E35FD31BAA6F8400348526 /* PFFacebookPrivateUtilities.m */; }; - F5E3229B1B549C2C00E319F9 /* FacebookAuthenticationProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F5E3229A1B549C2C00E319F9 /* FacebookAuthenticationProviderTests.m */; }; - F5E3229D1B5583A800E319F9 /* FacebookUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F5E3229C1B5583A800E319F9 /* FacebookUtilsTests.m */; }; + B9312D4123C4A290002D4A4C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9A7EE9D23C497D2003E606E /* SystemConfiguration.framework */; platformFilter = ios; }; + B9312D4923C4A2B5002D4A4C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9A7EE9D23C497D2003E606E /* SystemConfiguration.framework */; }; + B9783177240D32260049C02B /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9783176240D32260049C02B /* OCMock.framework */; }; + B9A7EEA523C49956003E606E /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1350512027EA26000F5FD5 /* Parse.framework */; }; + B9A7EEAF23C49A87003E606E /* ParseFacebookUtilsV4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AAEAA75200C020E00AA7479 /* ParseFacebookUtilsV4.framework */; platformFilter = ios; }; + B9A7EEB823C49CB5003E606E /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B9A7EE9B23C497C3003E606E /* libsqlite3.tbd */; platformFilter = ios; }; + B9A7EECC23C49DAE003E606E /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9A7EECB23C49DAD003E606E /* CoreGraphics.framework */; platformFilter = ios; }; + B9A7EED023C49F05003E606E /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9A7EECF23C49F04003E606E /* Accelerate.framework */; platformFilter = ios; }; + B9A7EED123C49F9B003E606E /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1351C820281889000F5FD5 /* FBSDKCoreKit.framework */; }; + B9A7EED223C49F9B003E606E /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1351C720281889000F5FD5 /* FBSDKLoginKit.framework */; }; + B9A7EED323C4A001003E606E /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B9A7EECD23C49DE3003E606E /* libc++.tbd */; platformFilter = ios; }; + F5E3229B1B549C2C00E319F9 /* FacebookAuthenticationProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F5E3229A1B549C2C00E319F9 /* FacebookAuthenticationProviderTests.m */; platformFilter = ios; }; + F5E3229D1B5583A800E319F9 /* FacebookUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F5E3229C1B5583A800E319F9 /* FacebookUtilsTests.m */; platformFilter = ios; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -163,13 +144,6 @@ remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0; remoteInfo = "ParseUnitTests-iOS-host"; }; - 4A1350622027EA32000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1350412027EA26000F5FD5 /* Parse.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81C582E11C3B0A98000063C6; - remoteInfo = "Parse-iOS-Dynamic"; - }; 4A1350652027EA43000F5FD5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 4A1350412027EA26000F5FD5 /* Parse.xcodeproj */; @@ -191,19 +165,26 @@ remoteGlobalIDString = 815F22AF1BD04D150054659F; remoteInfo = "Parse-tvOS"; }; - 81CB98CD1AB7905D00136FA5 /* PBXContainerItemProxy */ = { + B9A7EE7323C49272003E606E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; proxyType = 1; - remoteGlobalIDString = D2AAC07D0554694100DB518D; - remoteInfo = "ParseFacebookUtils_v4-iOS"; + remoteGlobalIDString = F535C73A1B54B4A800A7D81E; + remoteInfo = ParseFacebookTestApplicationV4; }; - F52CD6191B58311F0051AB86 /* PBXContainerItemProxy */ = { + B9A7EEB423C49C18003E606E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A1350412027EA26000F5FD5 /* Parse.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 81C3821B19CCA89E0066284A; + remoteInfo = "Parse-iOS"; + }; + B9A7EEB623C49C89003E606E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; proxyType = 1; - remoteGlobalIDString = F535C73A1B54B4A800A7D81E; - remoteInfo = ParseFacebookTestApplicationV4; + remoteGlobalIDString = D2AAC07D0554694100DB518D; + remoteInfo = "ParseFacebookUtilsV4-iOS"; }; /* End PBXContainerItemProxy section */ @@ -217,29 +198,10 @@ 4A1351C820281889000F5FD5 /* FBSDKCoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKCoreKit.framework; path = ../Carthage/Build/iOS/FBSDKCoreKit.framework; sourceTree = ""; }; 4A1351CB20281897000F5FD5 /* FBSDKCoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKCoreKit.framework; path = ../Carthage/Build/tvOS/FBSDKCoreKit.framework; sourceTree = ""; }; 4A1351CC20281897000F5FD5 /* FBSDKTVOSKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKTVOSKit.framework; path = ../Carthage/Build/tvOS/FBSDKTVOSKit.framework; sourceTree = ""; }; - 4A13525020282583000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Bolts.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A1352522028259D000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Bolts.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A9A9503200D1462005D8F4B /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4AAEAA42200BE19A00AA7479 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4AAEAA45200BE26C00AA7479 /* Bolts.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Bolts.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4AAEAA75200C020E00AA7479 /* ParseFacebookUtilsV4.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseFacebookUtilsV4.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4AAEAA90200C022300AA7479 /* ParseFacebookUtilsV4.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseFacebookUtilsV4.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4AAEAA92200C025100AA7479 /* ParseFacebookUtilsV4-iOS-Dynamic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseFacebookUtilsV4-iOS-Dynamic.xcconfig"; sourceTree = ""; }; 4AAEAA93200C026300AA7479 /* ParseFacebookUtilsV4-tvOS-Dynamic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseFacebookUtilsV4-tvOS-Dynamic.xcconfig"; sourceTree = ""; }; - 4AAEAAA0200C0FC500AA7479 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.2.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; - 4AAEAAA2200C0FCC00AA7479 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.2.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; - 4AAEAAA4200C0FD200AA7479 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.2.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; }; - 4AAEAAA6200C0FDC00AA7479 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.2.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; - 4AAEAAA8200C0FE100AA7479 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.2.sdk/System/Library/Frameworks/CoreLocation.framework; sourceTree = DEVELOPER_DIR; }; - 4AAEAAAA200C0FEC00AA7479 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.2.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; }; - 4AAEAAAC200C0FF300AA7479 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.2.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; - 4AAEAAAE200C101100AA7479 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS11.2.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; }; - 4AAEAAB0200C101700AA7479 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS11.2.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; - 4AAEAAB2200C102100AA7479 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS11.2.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; - 4AAEAAB4200C102600AA7479 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS11.2.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; }; - 4AAEAAB6200C103000AA7479 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS11.2.sdk/System/Library/Frameworks/CoreLocation.framework; sourceTree = DEVELOPER_DIR; }; - 4AAEAAB8200C103500AA7479 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS11.2.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; - 4AAEAABA200C103B00AA7479 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS11.2.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; 8121EA9F1D39862400AC0B02 /* Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; 8121EAA11D39862400AC0B02 /* iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = ""; }; 8121EAA21D39862400AC0B02 /* macOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = macOS.xcconfig; sourceTree = ""; }; @@ -275,6 +237,17 @@ 81EDD4B41B58AC7D002F69C0 /* ParseFacebookUtilsV4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParseFacebookUtilsV4.h; sourceTree = ""; }; 81FE7F721C1778FC00E6BD34 /* ParseFacebookUtilsV4-tvOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseFacebookUtilsV4-tvOS.xcconfig"; sourceTree = ""; }; 81FE7F8B1C17790400E6BD34 /* ParseFacebookUtilsV4.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseFacebookUtilsV4.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B9783176240D32260049C02B /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B9A7EE9723C497AC003E606E /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + B9A7EE9923C497B2003E606E /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; + B9A7EE9B23C497C3003E606E /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; + B9A7EE9D23C497D2003E606E /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; + B9A7EEBA23C49CEF003E606E /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; }; + B9A7EEBC23C49CF8003E606E /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; }; + B9A7EEBF23C49D36003E606E /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.2.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; + B9A7EECB23C49DAD003E606E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + B9A7EECD23C49DE3003E606E /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; + B9A7EECF23C49F04003E606E /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; D2AAC07E0554694100DB518D /* ParseFacebookUtilsV4.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseFacebookUtilsV4.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F52CD64A1B5838560051AB86 /* ParseFacebookUtilsV4-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseFacebookUtilsV4-iOS.xcconfig"; sourceTree = ""; }; F52CD64B1B5838620051AB86 /* ParseFacebookUtilsV4-UnitTests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseFacebookUtilsV4-UnitTests.xcconfig"; sourceTree = ""; }; @@ -289,17 +262,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A13524F20282583000F5FD5 /* Bolts.framework in Frameworks */, - 4A13521C20281B49000F5FD5 /* Parse.framework in Frameworks */, - 4A1351C920281889000F5FD5 /* FBSDKLoginKit.framework in Frameworks */, - 4A1351CA20281889000F5FD5 /* FBSDKCoreKit.framework in Frameworks */, - 4AAEAAAD200C0FF300AA7479 /* UIKit.framework in Frameworks */, - 4AAEAAAB200C0FEC00AA7479 /* AudioToolbox.framework in Frameworks */, - 4AAEAAA9200C0FE100AA7479 /* CoreLocation.framework in Frameworks */, - 4AAEAAA7200C0FDC00AA7479 /* Security.framework in Frameworks */, - 4AAEAAA5200C0FD200AA7479 /* StoreKit.framework in Frameworks */, - 4AAEAAA3200C0FCC00AA7479 /* libsqlite3.tbd in Frameworks */, - 4AAEAAA1200C0FC500AA7479 /* SystemConfiguration.framework in Frameworks */, + B9312D4923C4A2B5002D4A4C /* SystemConfiguration.framework in Frameworks */, + B9A7EEA523C49956003E606E /* Parse.framework in Frameworks */, + B9A7EED123C49F9B003E606E /* FBSDKCoreKit.framework in Frameworks */, + B9A7EED223C49F9B003E606E /* FBSDKLoginKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -307,17 +273,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A1352512028259D000F5FD5 /* Bolts.framework in Frameworks */, 4A1350672027EA53000F5FD5 /* Parse.framework in Frameworks */, - 4AAEAABB200C103B00AA7479 /* SystemConfiguration.framework in Frameworks */, - 4AAEAAB9200C103500AA7479 /* Security.framework in Frameworks */, - 4AAEAAB7200C103000AA7479 /* CoreLocation.framework in Frameworks */, - 4AAEAAB5200C102600AA7479 /* StoreKit.framework in Frameworks */, 4A1351CD20281897000F5FD5 /* FBSDKCoreKit.framework in Frameworks */, 4A1351CE20281897000F5FD5 /* FBSDKTVOSKit.framework in Frameworks */, - 4AAEAAB3200C102100AA7479 /* UIKit.framework in Frameworks */, - 4AAEAAB1200C101700AA7479 /* libsqlite3.tbd in Frameworks */, - 4AAEAAAF200C101100AA7479 /* AudioToolbox.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -325,15 +283,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A0ECC8C200D9A7F00BA84A3 /* libsqlite3.tbd in Frameworks */, - 4AAEAA41200BE19A00AA7479 /* OCMock.framework in Frameworks */, - 4A13525D20282C03000F5FD5 /* FBSDKLoginKit.framework in Frameworks */, - 4A0ECC88200D9A1D00BA84A3 /* Parse.framework in Frameworks */, - 81CB98CC1AB7905D00136FA5 /* ParseFacebookUtilsV4.framework in Frameworks */, - 4A0ECC8B200D9A7300BA84A3 /* SystemConfiguration.framework in Frameworks */, - 4A13525C20282C03000F5FD5 /* FBSDKCoreKit.framework in Frameworks */, - 4A0ECC8D200D9A8900BA84A3 /* AudioToolbox.framework in Frameworks */, - 4A0ECC80200D99FF00BA84A3 /* Bolts.framework in Frameworks */, + B9783177240D32260049C02B /* OCMock.framework in Frameworks */, + B9312D4123C4A290002D4A4C /* SystemConfiguration.framework in Frameworks */, + B9A7EED323C4A001003E606E /* libc++.tbd in Frameworks */, + B9A7EED023C49F05003E606E /* Accelerate.framework in Frameworks */, + B9A7EECC23C49DAE003E606E /* CoreGraphics.framework in Frameworks */, + B9A7EEB823C49CB5003E606E /* libsqlite3.tbd in Frameworks */, + B9A7EEAF23C49A87003E606E /* ParseFacebookUtilsV4.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -359,8 +315,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A0ECC8A200D9A1E00BA84A3 /* Parse.framework in Frameworks */, - 4A0ECC84200D9A0D00BA84A3 /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -397,28 +351,19 @@ 0867D69AFE84028FC02AAC07 /* Frameworks */ = { isa = PBXGroup; children = ( - 4A1352522028259D000F5FD5 /* Bolts.framework */, - 4A13525020282583000F5FD5 /* Bolts.framework */, + B9783176240D32260049C02B /* OCMock.framework */, + B9A7EECF23C49F04003E606E /* Accelerate.framework */, + B9A7EECD23C49DE3003E606E /* libc++.tbd */, + B9A7EECB23C49DAD003E606E /* CoreGraphics.framework */, + B9A7EEBF23C49D36003E606E /* UIKit.framework */, + B9A7EEBC23C49CF8003E606E /* Social.framework */, + B9A7EEBA23C49CEF003E606E /* Accounts.framework */, + B9A7EE9D23C497D2003E606E /* SystemConfiguration.framework */, + B9A7EE9B23C497C3003E606E /* libsqlite3.tbd */, + B9A7EE9923C497B2003E606E /* StoreKit.framework */, + B9A7EE9723C497AC003E606E /* AudioToolbox.framework */, 4A1350412027EA26000F5FD5 /* Parse.xcodeproj */, - 4A9A9503200D1462005D8F4B /* Parse.framework */, - 4AAEAABA200C103B00AA7479 /* SystemConfiguration.framework */, - 4AAEAAB8200C103500AA7479 /* Security.framework */, - 4AAEAAB6200C103000AA7479 /* CoreLocation.framework */, - 4AAEAAB4200C102600AA7479 /* StoreKit.framework */, - 4AAEAAB2200C102100AA7479 /* UIKit.framework */, - 4AAEAAB0200C101700AA7479 /* libsqlite3.tbd */, - 4AAEAAAE200C101100AA7479 /* AudioToolbox.framework */, - 4AAEAAAC200C0FF300AA7479 /* UIKit.framework */, - 4AAEAAAA200C0FEC00AA7479 /* AudioToolbox.framework */, - 4AAEAAA8200C0FE100AA7479 /* CoreLocation.framework */, - 4AAEAAA6200C0FDC00AA7479 /* Security.framework */, - 4AAEAAA4200C0FD200AA7479 /* StoreKit.framework */, - 4AAEAAA2200C0FCC00AA7479 /* libsqlite3.tbd */, - 4AAEAAA0200C0FC500AA7479 /* SystemConfiguration.framework */, - 4AAEAA45200BE26C00AA7479 /* Bolts.framework */, - 4AAEAA42200BE19A00AA7479 /* OCMock.framework */, 813DFC8F1AB2513D00F25A08 /* User Frameworks */, - 813DFC8E1AB2513300F25A08 /* System Frameworks */, ); name = Frameworks; sourceTree = ""; @@ -560,13 +505,6 @@ path = Internal; sourceTree = ""; }; - 813DFC8E1AB2513300F25A08 /* System Frameworks */ = { - isa = PBXGroup; - children = ( - ); - name = "System Frameworks"; - sourceTree = ""; - }; 813DFC8F1AB2513D00F25A08 /* User Frameworks */ = { isa = PBXGroup; children = ( @@ -765,7 +703,7 @@ buildRules = ( ); dependencies = ( - 4A1350632027EA32000F5FD5 /* PBXTargetDependency */, + B9A7EEB523C49C18003E606E /* PBXTargetDependency */, ); name = "ParseFacebookUtilsV4-iOS-Dynamic"; productName = Breakpad; @@ -804,8 +742,8 @@ buildRules = ( ); dependencies = ( - F52CD61A1B58311F0051AB86 /* PBXTargetDependency */, - 81CB98CE1AB7905D00136FA5 /* PBXTargetDependency */, + B9A7EEB723C49C89003E606E /* PBXTargetDependency */, + B9A7EE7423C49272003E606E /* PBXTargetDependency */, ); name = "ParseFacebookUtilsV4-UnitTests"; productName = "ParseFacebookUtilsV4-Tests"; @@ -1116,7 +1054,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Generate localizable strings\nfind $PROJECT_DIR -name '*.m' -print0 | xargs -0 genstrings -q -o $PROJECT_DIR/Resources\necho \"Finished converting images\""; + shellScript = "# Generate localizable strings\nfind $PROJECT_DIR -name '*.m' -print0 | xargs -0 genstrings -q -o $PROJECT_DIR/Resources\necho \"Finished converting images\"\n"; }; 4AAEAA79200C022300AA7479 /* Generate Localizable Strings */ = { isa = PBXShellScriptBuildPhase; @@ -1228,11 +1166,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 4A1350632027EA32000F5FD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Parse-iOS-Dynamic"; - targetProxy = 4A1350622027EA32000F5FD5 /* PBXContainerItemProxy */; - }; 4A1350662027EA43000F5FD5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "Parse-tvOS-Dynamic"; @@ -1248,15 +1181,20 @@ name = "Parse-tvOS"; targetProxy = 4A1350A62027F4B2000F5FD5 /* PBXContainerItemProxy */; }; - 81CB98CE1AB7905D00136FA5 /* PBXTargetDependency */ = { + B9A7EE7423C49272003E606E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = D2AAC07D0554694100DB518D /* ParseFacebookUtilsV4-iOS */; - targetProxy = 81CB98CD1AB7905D00136FA5 /* PBXContainerItemProxy */; + target = F535C73A1B54B4A800A7D81E /* ParseFacebookTestApplicationV4 */; + targetProxy = B9A7EE7323C49272003E606E /* PBXContainerItemProxy */; }; - F52CD61A1B58311F0051AB86 /* PBXTargetDependency */ = { + B9A7EEB523C49C18003E606E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = F535C73A1B54B4A800A7D81E /* ParseFacebookTestApplicationV4 */; - targetProxy = F52CD6191B58311F0051AB86 /* PBXContainerItemProxy */; + name = "Parse-iOS"; + targetProxy = B9A7EEB423C49C18003E606E /* PBXContainerItemProxy */; + }; + B9A7EEB723C49C89003E606E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D2AAC07D0554694100DB518D /* ParseFacebookUtilsV4-iOS */; + targetProxy = B9A7EEB623C49C89003E606E /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -1355,6 +1293,7 @@ "$(inherited)", "$(PROJECT_DIR)/Vendor", ); + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; @@ -1366,6 +1305,7 @@ "$(inherited)", "$(PROJECT_DIR)/Vendor", ); + TARGETED_DEVICE_FAMILY = 1; }; name = Release; }; diff --git a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj index 2b58c2f5c..0c38bbe88 100644 --- a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj +++ b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj @@ -3,15 +3,12 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ 06D00BAB1BC78F23005BAA6F /* ParseTwitterUtils.strings in Resources */ = {isa = PBXBuildFile; fileRef = 06D00BAD1BC78F23005BAA6F /* ParseTwitterUtils.strings */; }; 06D00BB51BC790F3005BAA6F /* PFTwitterLocalization.h in Headers */ = {isa = PBXBuildFile; fileRef = 06D00BB41BC790F3005BAA6F /* PFTwitterLocalization.h */; }; - 4A13521320281B33000F5FD5 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A51E4082027CC0F0066DE1A /* Parse.framework */; }; - 4A13522920282037000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13522820282037000F5FD5 /* Bolts.framework */; }; - 4ACBE7842151D69A008DFAAF /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ACBE7832151D69A008DFAAF /* OCMock.framework */; }; 8135E4951B4B6A0E0092F452 /* PF_Twitter_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 8135E48E1B4B6A0E0092F452 /* PF_Twitter_Private.h */; }; 8135E4961B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 8135E48F1B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.h */; }; 8135E4971B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 8135E4901B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.m */; }; @@ -32,25 +29,14 @@ 81665C771BBDE27D00AE923F /* TwitterUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 81665C721BBDE27D00AE923F /* TwitterUtilsTests.m */; }; 81665C7C1BBDE2EE00AE923F /* PFTwitterTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 81665C7B1BBDE2EE00AE923F /* PFTwitterTestCase.m */; }; 8166FB921B4F1DC5003841A2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8166FB8F1B4F1DC5003841A2 /* main.m */; }; - 816831131D1E16CC00315E21 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 816831121D1E16CC00315E21 /* UIKit.framework */; }; - 816831161D1E16D000315E21 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 816831151D1E16D000315E21 /* Accounts.framework */; }; - 816831191D1E16D500315E21 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 816831181D1E16D500315E21 /* CoreGraphics.framework */; }; - 8168311D1D1E16DC00315E21 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168311C1D1E16DC00315E21 /* Security.framework */; }; - 816831201D1E16E200315E21 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168311F1D1E16E200315E21 /* StoreKit.framework */; }; - 816831241D1E16E700315E21 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 816831231D1E16E700315E21 /* libsqlite3.tbd */; }; - 816831271D1E16EB00315E21 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 816831261D1E16EB00315E21 /* CoreLocation.framework */; }; - 8168312B1D1E16F000315E21 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168312A1D1E16F000315E21 /* SystemConfiguration.framework */; }; - 8168312F1D1E16F700315E21 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168312E1D1E16F700315E21 /* AudioToolbox.framework */; }; - 816831331D1E16FE00315E21 /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 816831321D1E16FE00315E21 /* Social.framework */; }; - 816832521D1E1A7900315E21 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168311C1D1E16DC00315E21 /* Security.framework */; }; - 816832591D1E1A7E00315E21 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168312A1D1E16F000315E21 /* SystemConfiguration.framework */; }; - 8168325E1D1E1A8600315E21 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 816831231D1E16E700315E21 /* libsqlite3.tbd */; }; - 8168326A1D1E1A8B00315E21 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168312E1D1E16F700315E21 /* AudioToolbox.framework */; }; + 816832521D1E1A7900315E21 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168311C1D1E16DC00315E21 /* Security.framework */; platformFilter = ios; }; + 816832591D1E1A7E00315E21 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168312A1D1E16F000315E21 /* SystemConfiguration.framework */; platformFilter = ios; }; + 8168325E1D1E1A8600315E21 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 816831231D1E16E700315E21 /* libsqlite3.tbd */; platformFilter = ios; }; + 8168326A1D1E1A8B00315E21 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8168312E1D1E16F700315E21 /* AudioToolbox.framework */; platformFilter = ios; }; 817A37CB1B4B741A00129AFA /* PF_OAuthCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 817A37C91B4B741A00129AFA /* PF_OAuthCore.h */; }; 817A37CC1B4B741A00129AFA /* PF_OAuthCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 817A37CA1B4B741A00129AFA /* PF_OAuthCore.m */; }; 819DAAD61BB5EC79002BDE2B /* PFTwitterAlertView.h in Headers */ = {isa = PBXBuildFile; fileRef = 819DAAD41BB5EC79002BDE2B /* PFTwitterAlertView.h */; }; 819DAAD71BB5EC79002BDE2B /* PFTwitterAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 819DAAD51BB5EC79002BDE2B /* PFTwitterAlertView.m */; }; - 81CB98CC1AB7905D00136FA5 /* ParseTwitterUtils.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AAC07E0554694100DB518D /* ParseTwitterUtils.framework */; }; 81D342A11B4C7DA500B6C124 /* ParseTwitterUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 81D342A01B4C7DA500B6C124 /* ParseTwitterUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; 81ECACBB1D1E14E000FA7673 /* PFOAuth1FlowDialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 815F183E1B4B730E0066E996 /* PFOAuth1FlowDialog.h */; }; 81ECACBC1D1E14E000FA7673 /* PF_OAuthCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 817A37C91B4B741A00129AFA /* PF_OAuthCore.h */; }; @@ -72,6 +58,9 @@ 81ECACCD1D1E14E000FA7673 /* PFTwitterAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 819DAAD51BB5EC79002BDE2B /* PFTwitterAlertView.m */; }; 81ECACD21D1E14E000FA7673 /* third_party_licenses.txt in Resources */ = {isa = PBXBuildFile; fileRef = 813DFC971AB2526000F25A08 /* third_party_licenses.txt */; }; 81ECACD31D1E14E000FA7673 /* ParseTwitterUtils.strings in Resources */ = {isa = PBXBuildFile; fileRef = 06D00BAD1BC78F23005BAA6F /* ParseTwitterUtils.strings */; }; + B9312D5223C4A48A002D4A4C /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A51E4082027CC0F0066DE1A /* Parse.framework */; }; + B9783144240D05190049C02B /* ParseTwitterUtils.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AAC07E0554694100DB518D /* ParseTwitterUtils.framework */; platformFilter = ios; }; + B9783173240D14A50049C02B /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9783172240D14A50049C02B /* OCMock.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -166,12 +155,12 @@ remoteGlobalIDString = 8166FB661B4F1D77003841A2; remoteInfo = ParseTwitterTestApplication; }; - 81CB98CD1AB7905D00136FA5 /* PBXContainerItemProxy */ = { + B9783142240D050B0049C02B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; proxyType = 1; remoteGlobalIDString = D2AAC07D0554694100DB518D; - remoteInfo = "ParseFacebookUtils_v4-iOS"; + remoteInfo = "ParseTwitterUtils-iOS"; }; /* End PBXContainerItemProxy section */ @@ -181,9 +170,6 @@ 4A0ECBDD200D41B600BA84A3 /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4A13522820282037000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/iOS/Bolts.framework; sourceTree = ""; }; 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = ../Parse/Parse.xcodeproj; sourceTree = ""; }; - 4A9A94FE200D12C9005D8F4B /* Bolts.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Bolts.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4AAEAACB200C2BBB00AA7479 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4ACBE7832151D69A008DFAAF /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8135E48E1B4B6A0E0092F452 /* PF_Twitter_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PF_Twitter_Private.h; sourceTree = ""; }; 8135E48F1B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFTwitterAuthenticationProvider.h; sourceTree = ""; }; 8135E4901B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFTwitterAuthenticationProvider.m; sourceTree = ""; }; @@ -239,6 +225,8 @@ 81D342A01B4C7DA500B6C124 /* ParseTwitterUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParseTwitterUtils.h; sourceTree = ""; }; 81ECACD71D1E14E000FA7673 /* ParseTwitterUtils.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseTwitterUtils.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 81ECACD91D1E14F300FA7673 /* ParseTwitterUtils-iOS-Dynamic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-iOS-Dynamic.xcconfig"; sourceTree = ""; }; + B9783172240D14A50049C02B /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B9A7EEC123C49D94003E606E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; D2AAC07E0554694100DB518D /* ParseTwitterUtils.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseTwitterUtils.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F51535531B57453700C49F56 /* ParseTwitterUtils-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-iOS.xcconfig"; sourceTree = ""; }; F51535541B57454500C49F56 /* ParseTwitterUtils-Tests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-Tests.xcconfig"; sourceTree = ""; }; @@ -257,12 +245,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4ACBE7842151D69A008DFAAF /* OCMock.framework in Frameworks */, + B9783173240D14A50049C02B /* OCMock.framework in Frameworks */, + B9783144240D05190049C02B /* ParseTwitterUtils.framework in Frameworks */, 8168326A1D1E1A8B00315E21 /* AudioToolbox.framework in Frameworks */, 8168325E1D1E1A8600315E21 /* libsqlite3.tbd in Frameworks */, 816832591D1E1A7E00315E21 /* SystemConfiguration.framework in Frameworks */, 816832521D1E1A7900315E21 /* Security.framework in Frameworks */, - 81CB98CC1AB7905D00136FA5 /* ParseTwitterUtils.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -270,18 +258,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A13521320281B33000F5FD5 /* Parse.framework in Frameworks */, - 816831331D1E16FE00315E21 /* Social.framework in Frameworks */, - 8168312F1D1E16F700315E21 /* AudioToolbox.framework in Frameworks */, - 4A13522920282037000F5FD5 /* Bolts.framework in Frameworks */, - 8168312B1D1E16F000315E21 /* SystemConfiguration.framework in Frameworks */, - 816831271D1E16EB00315E21 /* CoreLocation.framework in Frameworks */, - 816831241D1E16E700315E21 /* libsqlite3.tbd in Frameworks */, - 816831201D1E16E200315E21 /* StoreKit.framework in Frameworks */, - 8168311D1D1E16DC00315E21 /* Security.framework in Frameworks */, - 816831191D1E16D500315E21 /* CoreGraphics.framework in Frameworks */, - 816831161D1E16D000315E21 /* Accounts.framework in Frameworks */, - 816831131D1E16CC00315E21 /* UIKit.framework in Frameworks */, + B9312D5223C4A48A002D4A4C /* Parse.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -324,12 +301,11 @@ 0867D69AFE84028FC02AAC07 /* Frameworks */ = { isa = PBXGroup; children = ( - 4ACBE7832151D69A008DFAAF /* OCMock.framework */, + B9783172240D14A50049C02B /* OCMock.framework */, + B9A7EEC123C49D94003E606E /* CoreGraphics.framework */, 4A13522820282037000F5FD5 /* Bolts.framework */, 4A51E3FA2027CC0F0066DE1A /* Parse.xcodeproj */, 4A0ECBDD200D41B600BA84A3 /* Parse.framework */, - 4A9A94FE200D12C9005D8F4B /* Bolts.framework */, - 4AAEAACB200C2BBB00AA7479 /* OCMock.framework */, 813DFC8E1AB2513300F25A08 /* System Frameworks */, ); name = Frameworks; @@ -633,7 +609,7 @@ buildRules = ( ); dependencies = ( - 81CB98CE1AB7905D00136FA5 /* PBXTargetDependency */, + B9783143240D050B0049C02B /* PBXTargetDependency */, 8166FB951B4F1E9A003841A2 /* PBXTargetDependency */, ); name = "ParseTwitterUtils-Tests"; @@ -933,13 +909,15 @@ }; 8166FB951B4F1E9A003841A2 /* PBXTargetDependency */ = { isa = PBXTargetDependency; + platformFilter = ios; target = 8166FB661B4F1D77003841A2 /* ParseTwitterTestApplication */; targetProxy = 8166FB941B4F1E9A003841A2 /* PBXContainerItemProxy */; }; - 81CB98CE1AB7905D00136FA5 /* PBXTargetDependency */ = { + B9783143240D050B0049C02B /* PBXTargetDependency */ = { isa = PBXTargetDependency; + platformFilter = ios; target = D2AAC07D0554694100DB518D /* ParseTwitterUtils-iOS */; - targetProxy = 81CB98CD1AB7905D00136FA5 /* PBXContainerItemProxy */; + targetProxy = B9783142240D050B0049C02B /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ diff --git a/Rakefile b/Rakefile index dbd0a3ab1..0d7286668 100644 --- a/Rakefile +++ b/Rakefile @@ -499,7 +499,7 @@ namespace :test do t.formatter = XCTask::BuildFormatter::XCPRETTY end unless task.execute - puts 'OS X Tests Failed!' + puts 'macOS Tests Failed!' exit(1) end end @@ -550,7 +550,7 @@ namespace :test do result = task.execute unless result - puts 'Failed to build iOS FacebookUtils Framework.' + puts 'Failed to build iOS TwitterUtils Framework.' exit(1) end end