Skip to content
This repository was archived by the owner on Jan 16, 2021. It is now read-only.

Commit 9a33974

Browse files
nlutsenkonlutsenko
committed
Update to latest shared configurations.
1 parent 9a06491 commit 9a33974

File tree

6 files changed

+67
-77
lines changed

6 files changed

+67
-77
lines changed

‎Configurations/ParseFacebookTestApplicationV4.xcconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,4 @@
1313
PRODUCT_NAME = ParseFacebookTestApplicationV4
1414
PRODUCT_BUNDLE_IDENTIFIER = com.parse.facebookutils-ios.unit.app
1515

16-
CLANG_ENABLE_MODULES = YES
17-
1816
INFOPLIST_FILE = $(SRCROOT)/Tests/TestApplication/Resources/Info.plist

‎Configurations/ParseFacebookUtilsV4-UnitTests.xcconfig‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@
88
//
99

1010
#include "Shared/Platform/iOS.xcconfig"
11-
#include "Shared/Product/UnitTest.xcconfig"
11+
#include "Shared/Product/LogicTests.xcconfig"
1212
#include "Pods/Target Support Files/Pods-ParseFacebookUtilsV4-UnitTests/Pods-ParseFacebookUtilsV4-UnitTests.debug.xcconfig"
1313

1414
PRODUCT_NAME = ParseFacebookUtilsV4-UnitTests
1515
PRODUCT_BUNDLE_IDENTIFIER = com.parse.facebookutils-ios.unit
1616

17-
CLANG_ENABLE_MODULES = YES
17+
IPHONEOS_DEPLOYMENT_TARGET = 8.0
18+
19+
FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(SRCROOT)/Vendor "$PODS_CONFIGURATION_BUILD_DIR/OCMock"
1820

1921
INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/Info.plist
2022
TEST_HOST = $(BUILT_PRODUCTS_DIR)/ParseFacebookTestApplicationV4.app/ParseFacebookTestApplicationV4
21-
22-
FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(SRCROOT)/Vendor
23-
LIBRARY_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
24-
HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)

‎Configurations/ParseFacebookUtilsV4-iOS.xcconfig‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,11 @@
88
//
99

1010
#include "Shared/Platform/iOS.xcconfig"
11-
#include "Shared/Product/Framework.xcconfig"
11+
#include "Shared/Product/StaticFramework.xcconfig"
1212

1313
PRODUCT_NAME = ParseFacebookUtilsV4
1414
PRODUCT_BUNDLE_IDENTIFIER = com.parse.facebookutils-ios
1515

16-
MACH_O_TYPE = staticlib
17-
DEFINES_MODULE = YES
18-
CLANG_ENABLE_MODULES = YES
19-
2016
INFOPLIST_FILE = $(SRCROOT)/Resources/Info-iOS.plist
2117

2218
FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/Vendor
23-
LIBRARY_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
24-
HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
25-
26-
OTHER_CFLAGS[sdk=iphoneos9.*] = $(inherited) -fembed-bitcode

‎Configurations/ParseFacebookUtilsV4-tvOS.xcconfig‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,11 @@
88
//
99

1010
#include "Shared/Platform/tvOS.xcconfig"
11-
#include "Shared/Product/Framework.xcconfig"
11+
#include "Shared/Product/StaticFramework.xcconfig"
1212

1313
PRODUCT_NAME = ParseFacebookUtilsV4
1414
PRODUCT_BUNDLE_IDENTIFIER = com.parse.facebookutils-tvos
1515

16-
MACH_O_TYPE = staticlib
17-
DEFINES_MODULE = YES
18-
CLANG_ENABLE_MODULES = YES
19-
2016
INFOPLIST_FILE = $(SRCROOT)/Resources/Info-tvOS.plist
2117

2218
FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/Vendor/tvOS

‎ParseFacebookUtils.xcodeproj/project.pbxproj‎

Lines changed: 60 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,25 @@
7171
/* End PBXContainerItemProxy section */
7272

7373
/* Begin PBXFileReference section */
74+
8121EA9F1D39862400AC0B02 /* Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = "<group>"; };
75+
8121EAA11D39862400AC0B02 /* iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
76+
8121EAA21D39862400AC0B02 /* macOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = macOS.xcconfig; sourceTree = "<group>"; };
77+
8121EAA31D39862400AC0B02 /* tvOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = tvOS.xcconfig; sourceTree = "<group>"; };
78+
8121EAA41D39862400AC0B02 /* watchOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = watchOS.xcconfig; sourceTree = "<group>"; };
79+
8121EAA61D39862400AC0B02 /* Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Application.xcconfig; sourceTree = "<group>"; };
80+
8121EAA71D39862400AC0B02 /* DynamicFramework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DynamicFramework.xcconfig; sourceTree = "<group>"; };
81+
8121EAA81D39862400AC0B02 /* LogicTests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = LogicTests.xcconfig; sourceTree = "<group>"; };
82+
8121EAA91D39862400AC0B02 /* StaticFramework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = StaticFramework.xcconfig; sourceTree = "<group>"; };
83+
8121EAAB1D39862400AC0B02 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
84+
8121EAAC1D39862400AC0B02 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
85+
8121EAAD1D39862400AC0B02 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
7486
813DFC841AB2510300F25A08 /* PFFacebookUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFFacebookUtils.h; sourceTree = "<group>"; };
7587
813DFC851AB2510300F25A08 /* PFFacebookUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFFacebookUtils.m; sourceTree = "<group>"; };
7688
813DFC921AB2515A00F25A08 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = Vendor/Bolts.framework; sourceTree = "<group>"; };
7789
813DFC941AB251F700F25A08 /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7890
815FC5971BBF74890006AF6E /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
7991
815FC5991BBF74890006AF6E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8092
81643D761AB79ABD00DD3E65 /* PFFacebookUtils_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PFFacebookUtils_Private.h; path = Internal/PFFacebookUtils_Private.h; sourceTree = "<group>"; };
81-
8178BE9C1B716BF200051CF4 /* Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = "<group>"; };
82-
8178BE9E1B716BF200051CF4 /* iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
83-
8178BE9F1B716BF300051CF4 /* OSX.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = OSX.xcconfig; sourceTree = "<group>"; };
84-
8178BEA11B716BF300051CF4 /* Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Application.xcconfig; sourceTree = "<group>"; };
85-
8178BEA21B716BF300051CF4 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Framework.xcconfig; sourceTree = "<group>"; };
86-
8178BEA31B716BF300051CF4 /* UnitTest.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = UnitTest.xcconfig; sourceTree = "<group>"; };
87-
8178BEA51B716BF300051CF4 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
88-
8178BEA61B716BF300051CF4 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
89-
8178BEA81B716BF300051CF4 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
9093
81930A3C1BBE1A0600A5E4BB /* PFFacebookTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFFacebookTestCase.h; sourceTree = "<group>"; };
9194
81930A3D1BBE1A0600A5E4BB /* PFFacebookTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFFacebookTestCase.m; sourceTree = "<group>"; };
9295
81B3F22A1AC9CA5300A92677 /* Localizable.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = Localizable.strings; path = Resources/Localizable.strings; sourceTree = SOURCE_ROOT; };
@@ -193,7 +196,7 @@
193196
81CB98D21AB7906D00136FA5 /* Tests */,
194197
0867D69AFE84028FC02AAC07 /* Frameworks */,
195198
034768DFFF38A50411DB9C8B /* Products */,
196-
9274417D12A02673DA657222 /* Pods */,
199+
8C6FD7306DE656C87CF08305 /* Pods */,
197200
);
198201
indentWidth = 4;
199202
name = Breakpad;
@@ -209,6 +212,49 @@
209212
name = Frameworks;
210213
sourceTree = "<group>";
211214
};
215+
8121EA9E1D39862400AC0B02 /* Shared */ = {
216+
isa = PBXGroup;
217+
children = (
218+
8121EA9F1D39862400AC0B02 /* Common.xcconfig */,
219+
8121EAA01D39862400AC0B02 /* Platform */,
220+
8121EAA51D39862400AC0B02 /* Product */,
221+
8121EAAA1D39862400AC0B02 /* Project */,
222+
8121EAAD1D39862400AC0B02 /* Warnings.xcconfig */,
223+
);
224+
path = Shared;
225+
sourceTree = "<group>";
226+
};
227+
8121EAA01D39862400AC0B02 /* Platform */ = {
228+
isa = PBXGroup;
229+
children = (
230+
8121EAA11D39862400AC0B02 /* iOS.xcconfig */,
231+
8121EAA21D39862400AC0B02 /* macOS.xcconfig */,
232+
8121EAA31D39862400AC0B02 /* tvOS.xcconfig */,
233+
8121EAA41D39862400AC0B02 /* watchOS.xcconfig */,
234+
);
235+
path = Platform;
236+
sourceTree = "<group>";
237+
};
238+
8121EAA51D39862400AC0B02 /* Product */ = {
239+
isa = PBXGroup;
240+
children = (
241+
8121EAA61D39862400AC0B02 /* Application.xcconfig */,
242+
8121EAA71D39862400AC0B02 /* DynamicFramework.xcconfig */,
243+
8121EAA81D39862400AC0B02 /* LogicTests.xcconfig */,
244+
8121EAA91D39862400AC0B02 /* StaticFramework.xcconfig */,
245+
);
246+
path = Product;
247+
sourceTree = "<group>";
248+
};
249+
8121EAAA1D39862400AC0B02 /* Project */ = {
250+
isa = PBXGroup;
251+
children = (
252+
8121EAAB1D39862400AC0B02 /* Debug.xcconfig */,
253+
8121EAAC1D39862400AC0B02 /* Release.xcconfig */,
254+
);
255+
path = Project;
256+
sourceTree = "<group>";
257+
};
212258
813DFC7E1AB2510300F25A08 /* ParseFacebookUtilsV4 */ = {
213259
isa = PBXGroup;
214260
children = (
@@ -286,46 +332,6 @@
286332
path = Resources;
287333
sourceTree = "<group>";
288334
};
289-
8178BE9B1B716BF200051CF4 /* Shared */ = {
290-
isa = PBXGroup;
291-
children = (
292-
8178BE9C1B716BF200051CF4 /* Common.xcconfig */,
293-
8178BE9D1B716BF200051CF4 /* Platform */,
294-
8178BEA01B716BF300051CF4 /* Product */,
295-
8178BEA41B716BF300051CF4 /* Project */,
296-
8178BEA81B716BF300051CF4 /* Warnings.xcconfig */,
297-
);
298-
path = Shared;
299-
sourceTree = "<group>";
300-
};
301-
8178BE9D1B716BF200051CF4 /* Platform */ = {
302-
isa = PBXGroup;
303-
children = (
304-
8178BE9E1B716BF200051CF4 /* iOS.xcconfig */,
305-
8178BE9F1B716BF300051CF4 /* OSX.xcconfig */,
306-
);
307-
path = Platform;
308-
sourceTree = "<group>";
309-
};
310-
8178BEA01B716BF300051CF4 /* Product */ = {
311-
isa = PBXGroup;
312-
children = (
313-
8178BEA11B716BF300051CF4 /* Application.xcconfig */,
314-
8178BEA21B716BF300051CF4 /* Framework.xcconfig */,
315-
8178BEA31B716BF300051CF4 /* UnitTest.xcconfig */,
316-
);
317-
path = Product;
318-
sourceTree = "<group>";
319-
};
320-
8178BEA41B716BF300051CF4 /* Project */ = {
321-
isa = PBXGroup;
322-
children = (
323-
8178BEA51B716BF300051CF4 /* Debug.xcconfig */,
324-
8178BEA61B716BF300051CF4 /* Release.xcconfig */,
325-
);
326-
path = Project;
327-
sourceTree = "<group>";
328-
};
329335
81930A3A1BBE1A0600A5E4BB /* Other */ = {
330336
isa = PBXGroup;
331337
children = (
@@ -406,7 +412,7 @@
406412
path = tvOS;
407413
sourceTree = "<group>";
408414
};
409-
9274417D12A02673DA657222 /* Pods */ = {
415+
8C6FD7306DE656C87CF08305 /* Pods */ = {
410416
isa = PBXGroup;
411417
children = (
412418
);
@@ -416,11 +422,11 @@
416422
F52CD63A1B58383C0051AB86 /* Configurations */ = {
417423
isa = PBXGroup;
418424
children = (
419-
8178BE9B1B716BF200051CF4 /* Shared */,
420425
F52CD64A1B5838560051AB86 /* ParseFacebookUtilsV4-iOS.xcconfig */,
421426
F52CD64B1B5838620051AB86 /* ParseFacebookUtilsV4-UnitTests.xcconfig */,
422427
F52CD64C1B58386F0051AB86 /* ParseFacebookTestApplicationV4.xcconfig */,
423428
81FE7F721C1778FC00E6BD34 /* ParseFacebookUtilsV4-tvOS.xcconfig */,
429+
8121EA9E1D39862400AC0B02 /* Shared */,
424430
);
425431
path = Configurations;
426432
sourceTree = "<group>";
@@ -813,15 +819,15 @@
813819
};
814820
1DEB922308733DC00010E9CD /* Debug */ = {
815821
isa = XCBuildConfiguration;
816-
baseConfigurationReference = 8178BEA51B716BF300051CF4 /* Debug.xcconfig */;
822+
baseConfigurationReference = 8121EAAB1D39862400AC0B02 /* Debug.xcconfig */;
817823
buildSettings = {
818824
PARSE_DIR = "$(PROJECT_DIR)/..";
819825
};
820826
name = Debug;
821827
};
822828
1DEB922408733DC00010E9CD /* Release */ = {
823829
isa = XCBuildConfiguration;
824-
baseConfigurationReference = 8178BEA61B716BF300051CF4 /* Release.xcconfig */;
830+
baseConfigurationReference = 8121EAAC1D39862400AC0B02 /* Release.xcconfig */;
825831
buildSettings = {
826832
PARSE_DIR = "$(PROJECT_DIR)/..";
827833
};

‎Vendor/xctoolchain‎

0 commit comments

Comments
 (0)