diff --git a/.gitmodules b/.gitmodules index b42fef3d4..a51d9d9f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,11 +7,6 @@ [submodule "Carthage/Checkouts/OCMock"] path = Carthage/Checkouts/OCMock url = https://github.com/erikdoe/OCMock.git -[submodule "Vendor/facebook-ios-sdk"] - path = Vendor/facebook-ios-sdk - url = https://github.com/facebook/facebook-ios-sdk - sparsecheckout = true - shallow = true [submodule "Carthage/Checkouts/facebook-ios-sdk"] path = Carthage/Checkouts/facebook-ios-sdk url = https://github.com/facebook/facebook-ios-sdk diff --git a/Parse/Configurations/Parse-iOS-Dynamic.xcconfig b/Parse/Configurations/Parse-iOS-Dynamic.xcconfig index 4e564a09a..b93eb52f5 100644 --- a/Parse/Configurations/Parse-iOS-Dynamic.xcconfig +++ b/Parse/Configurations/Parse-iOS-Dynamic.xcconfig @@ -19,3 +19,5 @@ INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-iOS.Info.plist // TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings. GCC_WARN_SHADOW = NO + +FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/../Carthage/Build/iOS diff --git a/Parse/Configurations/Parse-tvOS-Dynamic.xcconfig b/Parse/Configurations/Parse-tvOS-Dynamic.xcconfig index 855ad70d8..fd002f719 100644 --- a/Parse/Configurations/Parse-tvOS-Dynamic.xcconfig +++ b/Parse/Configurations/Parse-tvOS-Dynamic.xcconfig @@ -17,3 +17,5 @@ INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-tvOS.Info.plist // TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings. GCC_WARN_SHADOW = NO + +FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/../Carthage/Build/tvOS diff --git a/Parse/Configurations/Parse-watchOS-Dynamic.xcconfig b/Parse/Configurations/Parse-watchOS-Dynamic.xcconfig index f563d857e..b1f0f27a6 100644 --- a/Parse/Configurations/Parse-watchOS-Dynamic.xcconfig +++ b/Parse/Configurations/Parse-watchOS-Dynamic.xcconfig @@ -17,3 +17,5 @@ INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-watchOS.Info.plist // TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings. GCC_WARN_SHADOW = NO + +FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/../Carthage/Build/watchOS diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj index 09f3a430d..271136e76 100644 --- a/Parse/Parse.xcodeproj/project.pbxproj +++ b/Parse/Parse.xcodeproj/project.pbxproj @@ -23,13 +23,13 @@ 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 */; }; - 4A1352482028235D000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518420281768000F5FD5 /* Bolts.framework */; }; - 4A13524B2028236D000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518C20281768000F5FD5 /* Bolts.framework */; }; - 4A13524E2028237C000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13519020281768000F5FD5 /* Bolts.framework */; }; 4A13525520282A51000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518420281768000F5FD5 /* Bolts.framework */; }; 4A13525620282B4D000F5FD5 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97010FAC1630B18F00AB761E /* Parse.framework */; }; 4A13525720282B4D000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518820281768000F5FD5 /* Bolts.framework */; }; 4A13525F20283603000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518820281768000F5FD5 /* Bolts.framework */; }; + 4A13528A202895ED000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A135289202895ED000F5FD5 /* Bolts.framework */; }; + 4A13528C20289BB6000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13528B20289BB5000F5FD5 /* Bolts.framework */; }; + 4A13528F20289BD1000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13528D20289BC3000F5FD5 /* Bolts.framework */; }; 4AAEAA40200BE14B00AA7479 /* third_party_licenses.txt in Resources */ = {isa = PBXBuildFile; fileRef = 8139B12C1A7BF559002BEF84 /* third_party_licenses.txt */; }; 4ABF398C1F54592100BBA75A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4ABF398B1F54592100BBA75A /* Main.storyboard */; }; 4AE33A0F1F5451AD0088DCA0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AE33A0E1F5451AD0088DCA0 /* AppDelegate.m */; }; @@ -2865,27 +2865,6 @@ remoteGlobalIDString = 81ED94111BE147CF00795F05; remoteInfo = "Bolts-iOS"; }; - 4A13524620282355000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1D5D7DA61BE3CE8200FD67C7; - remoteInfo = "Bolts-iOS-Dynamic"; - }; - 4A13524920282366000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 81E94D521C2B8BF200A6291E; - remoteInfo = "Bolts-tvOS-Dynamic"; - }; - 4A13524C20282372000F5FD5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 819573D91C2B8ECB00BFCA39; - remoteInfo = "Bolts-watchOS-Dynamic"; - }; 4AE33A2C1F5451B20088DCA0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 09D33641139C54930098E916 /* Project object */; @@ -2971,6 +2950,9 @@ 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 = ""; }; + 4A135289202895ED000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/iOS/Bolts.framework; sourceTree = ""; }; + 4A13528B20289BB5000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/watchOS/Bolts.framework; sourceTree = ""; }; + 4A13528D20289BC3000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/tvOS/Bolts.framework; 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; }; 4AE33A0D1F5451AD0088DCA0 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -3598,7 +3580,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A1352482028235D000F5FD5 /* Bolts.framework in Frameworks */, 81C5871F1C3B0B3A000063C6 /* libsqlite3.tbd in Frameworks */, 81C5871D1C3B0B35000063C6 /* SystemConfiguration.framework in Frameworks */, 81C5871B1C3B0B2F000063C6 /* StoreKit.framework in Frameworks */, @@ -3606,6 +3587,7 @@ 81C587171C3B0B22000063C6 /* CoreLocation.framework in Frameworks */, 81C587151C3B0B1C000063C6 /* AudioToolbox.framework in Frameworks */, 81C587131C3B0B18000063C6 /* UIKit.framework in Frameworks */, + 4A13528A202895ED000F5FD5 /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3613,13 +3595,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A13524B2028236D000F5FD5 /* Bolts.framework in Frameworks */, 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 */, + 4A13528F20289BD1000F5FD5 /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3627,7 +3609,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A13524E2028237C000F5FD5 /* Bolts.framework in Frameworks */, + 4A13528C20289BB6000F5FD5 /* Bolts.framework in Frameworks */, 81C587351C3B0BBE000063C6 /* WatchKit.framework in Frameworks */, 81C587331C3B0BB9000063C6 /* CoreLocation.framework in Frameworks */, 81C587311C3B0BB6000063C6 /* Security.framework in Frameworks */, @@ -3868,6 +3850,9 @@ 09D3364C139C54940098E916 /* Frameworks */ = { isa = PBXGroup; children = ( + 4A135289202895ED000F5FD5 /* Bolts.framework */, + 4A13528B20289BB5000F5FD5 /* Bolts.framework */, + 4A13528D20289BC3000F5FD5 /* Bolts.framework */, 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */, 4A0ECC9D200DA26000BA84A3 /* OCMock.framework */, 4A0ECC9B200DA25700BA84A3 /* OCMock.framework */, @@ -6875,7 +6860,6 @@ buildRules = ( ); dependencies = ( - 4A13524720282355000F5FD5 /* PBXTargetDependency */, ); name = "Parse-iOS-Dynamic"; productName = "Parse-iOS"; @@ -6895,7 +6879,6 @@ buildRules = ( ); dependencies = ( - 4A13524A20282366000F5FD5 /* PBXTargetDependency */, ); name = "Parse-tvOS-Dynamic"; productName = "Parse-iOS"; @@ -6915,7 +6898,6 @@ buildRules = ( ); dependencies = ( - 4A13524D20282372000F5FD5 /* PBXTargetDependency */, ); name = "Parse-watchOS-Dynamic"; productName = "Parse-iOS"; @@ -8614,21 +8596,6 @@ name = "Bolts-iOS"; targetProxy = 4A1351FA2028194C000F5FD5 /* PBXContainerItemProxy */; }; - 4A13524720282355000F5FD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bolts-iOS-Dynamic"; - targetProxy = 4A13524620282355000F5FD5 /* PBXContainerItemProxy */; - }; - 4A13524A20282366000F5FD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bolts-tvOS-Dynamic"; - targetProxy = 4A13524920282366000F5FD5 /* PBXContainerItemProxy */; - }; - 4A13524D20282372000F5FD5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Bolts-watchOS-Dynamic"; - targetProxy = 4A13524C20282372000F5FD5 /* PBXContainerItemProxy */; - }; 4AE33A2D1F5451B20088DCA0 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 4AE33A0A1F5451AD0088DCA0 /* ParseUnitTests-iOS-host */; diff --git a/ParseTwitterUtils/Configurations/ParseTwitterUtils-iOS-Dynamic.xcconfig b/ParseTwitterUtils/Configurations/ParseTwitterUtils-iOS-Dynamic.xcconfig index a51fef512..b0055e895 100644 --- a/ParseTwitterUtils/Configurations/ParseTwitterUtils-iOS-Dynamic.xcconfig +++ b/ParseTwitterUtils/Configurations/ParseTwitterUtils-iOS-Dynamic.xcconfig @@ -20,3 +20,4 @@ INFOPLIST_FILE = $(SRCROOT)/Resources/Info.plist // TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings. GCC_WARN_SHADOW = NO +FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/../Carthage/Build/iOS diff --git a/ParseUI/Configurations/ParseUI-iOS-Dynamic.xcconfig b/ParseUI/Configurations/ParseUI-iOS-Dynamic.xcconfig index 16f3af8ba..1705134b5 100644 --- a/ParseUI/Configurations/ParseUI-iOS-Dynamic.xcconfig +++ b/ParseUI/Configurations/ParseUI-iOS-Dynamic.xcconfig @@ -15,4 +15,4 @@ PRODUCT_BUNDLE_IDENTIFIER = com.parse.parseui INFOPLIST_FILE = $(SRCROOT)/Resources/Info.plist -FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/Vendor +FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/../Carthage/Build/iOS