Skip to content

Commit 668a42c

Browse files
flovilmartflovilmart
authored
Leverage dynamic builds of bolts for carthage (#1255)
1 parent 327fb9e commit 668a42c

File tree

7 files changed

+20
-51
lines changed

7 files changed

+20
-51
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
[submodule "Carthage/Checkouts/OCMock"]
88
path = Carthage/Checkouts/OCMock
99
url = https://github.com/erikdoe/OCMock.git
10-
[submodule "Vendor/facebook-ios-sdk"]
11-
path = Vendor/facebook-ios-sdk
12-
url = https://github.com/facebook/facebook-ios-sdk
13-
sparsecheckout = true
14-
shallow = true
1510
[submodule "Carthage/Checkouts/facebook-ios-sdk"]
1611
path = Carthage/Checkouts/facebook-ios-sdk
1712
url = https://github.com/facebook/facebook-ios-sdk

‎Parse/Configurations/Parse-iOS-Dynamic.xcconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-iOS.Info.plist
1919

2020
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
2121
GCC_WARN_SHADOW = NO
22+
23+
FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/../Carthage/Build/iOS

‎Parse/Configurations/Parse-tvOS-Dynamic.xcconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-tvOS.Info.plist
1717

1818
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
1919
GCC_WARN_SHADOW = NO
20+
21+
FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/../Carthage/Build/tvOS

‎Parse/Configurations/Parse-watchOS-Dynamic.xcconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-watchOS.Info.plist
1717

1818
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
1919
GCC_WARN_SHADOW = NO
20+
21+
FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/../Carthage/Build/watchOS

‎Parse/Parse.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
403093781C81F0B200CF09F8 /* PFQueryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */; };
2424
4A0ECC9A200DA25700BA84A3 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0ECC9B200DA25700BA84A3 /* OCMock.framework */; };
2525
4A0ECC9C200DA26000BA84A3 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0ECC9D200DA26000BA84A3 /* OCMock.framework */; };
26-
4A1352482028235D000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518420281768000F5FD5 /* Bolts.framework */; };
27-
4A13524B2028236D000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518C20281768000F5FD5 /* Bolts.framework */; };
28-
4A13524E2028237C000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13519020281768000F5FD5 /* Bolts.framework */; };
2926
4A13525520282A51000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518420281768000F5FD5 /* Bolts.framework */; };
3027
4A13525620282B4D000F5FD5 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97010FAC1630B18F00AB761E /* Parse.framework */; };
3128
4A13525720282B4D000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518820281768000F5FD5 /* Bolts.framework */; };
3229
4A13525F20283603000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518820281768000F5FD5 /* Bolts.framework */; };
30+
4A13528A202895ED000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A135289202895ED000F5FD5 /* Bolts.framework */; };
31+
4A13528C20289BB6000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13528B20289BB5000F5FD5 /* Bolts.framework */; };
32+
4A13528F20289BD1000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13528D20289BC3000F5FD5 /* Bolts.framework */; };
3333
4AAEAA40200BE14B00AA7479 /* third_party_licenses.txt in Resources */ = {isa = PBXBuildFile; fileRef = 8139B12C1A7BF559002BEF84 /* third_party_licenses.txt */; };
3434
4ABF398C1F54592100BBA75A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4ABF398B1F54592100BBA75A /* Main.storyboard */; };
3535
4AE33A0F1F5451AD0088DCA0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AE33A0E1F5451AD0088DCA0 /* AppDelegate.m */; };
@@ -2865,27 +2865,6 @@
28652865
remoteGlobalIDString = 81ED94111BE147CF00795F05;
28662866
remoteInfo = "Bolts-iOS";
28672867
};
2868-
4A13524620282355000F5FD5 /* PBXContainerItemProxy */ = {
2869-
isa = PBXContainerItemProxy;
2870-
containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */;
2871-
proxyType = 1;
2872-
remoteGlobalIDString = 1D5D7DA61BE3CE8200FD67C7;
2873-
remoteInfo = "Bolts-iOS-Dynamic";
2874-
};
2875-
4A13524920282366000F5FD5 /* PBXContainerItemProxy */ = {
2876-
isa = PBXContainerItemProxy;
2877-
containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */;
2878-
proxyType = 1;
2879-
remoteGlobalIDString = 81E94D521C2B8BF200A6291E;
2880-
remoteInfo = "Bolts-tvOS-Dynamic";
2881-
};
2882-
4A13524C20282372000F5FD5 /* PBXContainerItemProxy */ = {
2883-
isa = PBXContainerItemProxy;
2884-
containerPortal = 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */;
2885-
proxyType = 1;
2886-
remoteGlobalIDString = 819573D91C2B8ECB00BFCA39;
2887-
remoteInfo = "Bolts-watchOS-Dynamic";
2888-
};
28892868
4AE33A2C1F5451B20088DCA0 /* PBXContainerItemProxy */ = {
28902869
isa = PBXContainerItemProxy;
28912870
containerPortal = 09D33641139C54930098E916 /* Project object */;
@@ -2971,6 +2950,9 @@
29712950
4A0ECC9B200DA25700BA84A3 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; };
29722951
4A0ECC9D200DA26000BA84A3 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; };
29732952
4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = "<group>"; };
2953+
4A135289202895ED000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/iOS/Bolts.framework; sourceTree = "<group>"; };
2954+
4A13528B20289BB5000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/watchOS/Bolts.framework; sourceTree = "<group>"; };
2955+
4A13528D20289BC3000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/tvOS/Bolts.framework; sourceTree = "<group>"; };
29742956
4ABF398B1F54592100BBA75A /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
29752957
4AE33A0B1F5451AD0088DCA0 /* ParseUnitTests-iOS-host.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ParseUnitTests-iOS-host.app"; sourceTree = BUILT_PRODUCTS_DIR; };
29762958
4AE33A0D1F5451AD0088DCA0 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -3598,36 +3580,36 @@
35983580
isa = PBXFrameworksBuildPhase;
35993581
buildActionMask = 2147483647;
36003582
files = (
3601-
4A1352482028235D000F5FD5 /* Bolts.framework in Frameworks */,
36023583
81C5871F1C3B0B3A000063C6 /* libsqlite3.tbd in Frameworks */,
36033584
81C5871D1C3B0B35000063C6 /* SystemConfiguration.framework in Frameworks */,
36043585
81C5871B1C3B0B2F000063C6 /* StoreKit.framework in Frameworks */,
36053586
81C587191C3B0B2A000063C6 /* Security.framework in Frameworks */,
36063587
81C587171C3B0B22000063C6 /* CoreLocation.framework in Frameworks */,
36073588
81C587151C3B0B1C000063C6 /* AudioToolbox.framework in Frameworks */,
36083589
81C587131C3B0B18000063C6 /* UIKit.framework in Frameworks */,
3590+
4A13528A202895ED000F5FD5 /* Bolts.framework in Frameworks */,
36093591
);
36103592
runOnlyForDeploymentPostprocessing = 0;
36113593
};
36123594
81C584F01C3B0AA1000063C6 /* Frameworks */ = {
36133595
isa = PBXFrameworksBuildPhase;
36143596
buildActionMask = 2147483647;
36153597
files = (
3616-
4A13524B2028236D000F5FD5 /* Bolts.framework in Frameworks */,
36173598
81C5872C1C3B0B8D000063C6 /* libsqlite3.tbd in Frameworks */,
36183599
81C5872A1C3B0B8A000063C6 /* UIKit.framework in Frameworks */,
36193600
81C587281C3B0B84000063C6 /* StoreKit.framework in Frameworks */,
36203601
81C587261C3B0B7F000063C6 /* CoreLocation.framework in Frameworks */,
36213602
81C587241C3B0B7B000063C6 /* Security.framework in Frameworks */,
36223603
81C587221C3B0B77000063C6 /* SystemConfiguration.framework in Frameworks */,
3604+
4A13528F20289BD1000F5FD5 /* Bolts.framework in Frameworks */,
36233605
);
36243606
runOnlyForDeploymentPostprocessing = 0;
36253607
};
36263608
81C5864B1C3B0AA9000063C6 /* Frameworks */ = {
36273609
isa = PBXFrameworksBuildPhase;
36283610
buildActionMask = 2147483647;
36293611
files = (
3630-
4A13524E2028237C000F5FD5 /* Bolts.framework in Frameworks */,
3612+
4A13528C20289BB6000F5FD5 /* Bolts.framework in Frameworks */,
36313613
81C587351C3B0BBE000063C6 /* WatchKit.framework in Frameworks */,
36323614
81C587331C3B0BB9000063C6 /* CoreLocation.framework in Frameworks */,
36333615
81C587311C3B0BB6000063C6 /* Security.framework in Frameworks */,
@@ -3868,6 +3850,9 @@
38683850
09D3364C139C54940098E916 /* Frameworks */ = {
38693851
isa = PBXGroup;
38703852
children = (
3853+
4A135289202895ED000F5FD5 /* Bolts.framework */,
3854+
4A13528B20289BB5000F5FD5 /* Bolts.framework */,
3855+
4A13528D20289BC3000F5FD5 /* Bolts.framework */,
38713856
4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */,
38723857
4A0ECC9D200DA26000BA84A3 /* OCMock.framework */,
38733858
4A0ECC9B200DA25700BA84A3 /* OCMock.framework */,
@@ -6875,7 +6860,6 @@
68756860
buildRules = (
68766861
);
68776862
dependencies = (
6878-
4A13524720282355000F5FD5 /* PBXTargetDependency */,
68796863
);
68806864
name = "Parse-iOS-Dynamic";
68816865
productName = "Parse-iOS";
@@ -6895,7 +6879,6 @@
68956879
buildRules = (
68966880
);
68976881
dependencies = (
6898-
4A13524A20282366000F5FD5 /* PBXTargetDependency */,
68996882
);
69006883
name = "Parse-tvOS-Dynamic";
69016884
productName = "Parse-iOS";
@@ -6915,7 +6898,6 @@
69156898
buildRules = (
69166899
);
69176900
dependencies = (
6918-
4A13524D20282372000F5FD5 /* PBXTargetDependency */,
69196901
);
69206902
name = "Parse-watchOS-Dynamic";
69216903
productName = "Parse-iOS";
@@ -8614,21 +8596,6 @@
86148596
name = "Bolts-iOS";
86158597
targetProxy = 4A1351FA2028194C000F5FD5 /* PBXContainerItemProxy */;
86168598
};
8617-
4A13524720282355000F5FD5 /* PBXTargetDependency */ = {
8618-
isa = PBXTargetDependency;
8619-
name = "Bolts-iOS-Dynamic";
8620-
targetProxy = 4A13524620282355000F5FD5 /* PBXContainerItemProxy */;
8621-
};
8622-
4A13524A20282366000F5FD5 /* PBXTargetDependency */ = {
8623-
isa = PBXTargetDependency;
8624-
name = "Bolts-tvOS-Dynamic";
8625-
targetProxy = 4A13524920282366000F5FD5 /* PBXContainerItemProxy */;
8626-
};
8627-
4A13524D20282372000F5FD5 /* PBXTargetDependency */ = {
8628-
isa = PBXTargetDependency;
8629-
name = "Bolts-watchOS-Dynamic";
8630-
targetProxy = 4A13524C20282372000F5FD5 /* PBXContainerItemProxy */;
8631-
};
86328599
4AE33A2D1F5451B20088DCA0 /* PBXTargetDependency */ = {
86338600
isa = PBXTargetDependency;
86348601
target = 4AE33A0A1F5451AD0088DCA0 /* ParseUnitTests-iOS-host */;

‎ParseTwitterUtils/Configurations/ParseTwitterUtils-iOS-Dynamic.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ INFOPLIST_FILE = $(SRCROOT)/Resources/Info.plist
2020
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
2121
GCC_WARN_SHADOW = NO
2222

23+
FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/../Carthage/Build/iOS

‎ParseUI/Configurations/ParseUI-iOS-Dynamic.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ PRODUCT_BUNDLE_IDENTIFIER = com.parse.parseui
1515

1616
INFOPLIST_FILE = $(SRCROOT)/Resources/Info.plist
1717

18-
FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/Vendor
18+
FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/../Carthage/Build/iOS

0 commit comments

Comments
 (0)