Skip to content

Commit 03da850

Browse files
committed
Merge pull request #433 from ParsePlatform/nlutsenko.tvos.config
Cleanup configuration of tvOS target.
2 parents c8e90f6 + 598a197 commit 03da850

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

Configurations/Parse-tvOS.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ OTHER_LDFLAGS = $(inherited) -ObjC
2020

2121
FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(VENDOR_DIR)/Bolts-ObjC/build/tvOS/
2222

23-
INFOPLIST_FILE = $(PARSE_DIR)/Parse/Resources/Parse-tvOS.Info.plist
23+
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-tvOS.Info.plist

Parse.xcodeproj/project.pbxproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,10 +1808,10 @@
18081808
812B62FF1B5F30D3009CEAA9 /* PFObjectFileCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFObjectFileCoder.m; sourceTree = "<group>"; };
18091809
812B7AB61AF2FA4800D15FF5 /* PFQueryController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFQueryController.h; sourceTree = "<group>"; };
18101810
812B7AB71AF2FA4800D15FF5 /* PFQueryController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFQueryController.m; sourceTree = "<group>"; };
1811+
812F31DD1BCF3F7000FCBCD4 /* Parse-watchOS.Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Parse-watchOS.Info.plist"; sourceTree = "<group>"; };
18111812
812F31FB1BCF40DC00FCBCD4 /* Bolts-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Bolts-iOS.xcconfig"; sourceTree = "<group>"; };
18121813
812F31FC1BCF40DC00FCBCD4 /* Bolts-OSX.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Bolts-OSX.xcconfig"; sourceTree = "<group>"; };
18131814
812F31FD1BCF40DC00FCBCD4 /* Bolts-watchOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Bolts-watchOS.xcconfig"; sourceTree = "<group>"; };
1814-
812F31DD1BCF3F7000FCBCD4 /* Parse-watchOS.Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Parse-watchOS.Info.plist"; sourceTree = "<group>"; };
18151815
812FC61E1B0FF9FA0043C07F /* PFPurchaseController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPurchaseController.h; sourceTree = "<group>"; };
18161816
812FC61F1B0FF9FA0043C07F /* PFPurchaseController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFPurchaseController.m; sourceTree = "<group>"; };
18171817
81308B6B1B5781F500FFFF44 /* PFTestSwizzledMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFTestSwizzledMethod.h; sourceTree = "<group>"; };
@@ -1959,7 +1959,7 @@
19591959
815EE93F19FA5A390076FE5D /* PFHTTPRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFHTTPRequest.h; sourceTree = "<group>"; };
19601960
815EE94419FAD12F0076FE5D /* PFRESTQueryCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFRESTQueryCommand.h; sourceTree = "<group>"; };
19611961
815EE94519FAD12F0076FE5D /* PFRESTQueryCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFRESTQueryCommand.m; sourceTree = "<group>"; };
1962-
815F24151BD04D150054659F /* Parse-tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "Parse-tvOS.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
1962+
815F24151BD04D150054659F /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; };
19631963
815F24171BD04D310054659F /* Parse-tvOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Parse-tvOS.xcconfig"; sourceTree = "<group>"; };
19641964
815F24181BD04D480054659F /* Parse-tvOS.Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Parse-tvOS.Info.plist"; sourceTree = "<group>"; };
19651965
815F24191BD04DB70054659F /* Bolts-tvOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Bolts-tvOS.xcconfig"; sourceTree = "<group>"; };
@@ -2477,7 +2477,7 @@
24772477
816F449B1A8E8933009CDB32 /* ParseUnitTests-iOS.xctest */,
24782478
81C09F861AF97A490043B49C /* ParseUnitTests-OSX.xctest */,
24792479
810156691BB3832700D7C7BD /* Parse.framework */,
2480-
815F24151BD04D150054659F /* Parse-tvOS.framework */,
2480+
815F24151BD04D150054659F /* Parse.framework */,
24812481
);
24822482
name = Products;
24832483
sourceTree = "<group>";
@@ -4698,7 +4698,7 @@
46984698
);
46994699
name = "Parse-tvOS";
47004700
productName = "Parse-iOS";
4701-
productReference = 815F24151BD04D150054659F /* Parse-tvOS.framework */;
4701+
productReference = 815F24151BD04D150054659F /* Parse.framework */;
47024702
productType = "com.apple.product-type.framework";
47034703
};
47044704
816F441B1A8E8933009CDB32 /* ParseUnitTests-iOS */ = {
@@ -5924,17 +5924,13 @@
59245924
isa = XCBuildConfiguration;
59255925
baseConfigurationReference = 815F24171BD04D310054659F /* Parse-tvOS.xcconfig */;
59265926
buildSettings = {
5927-
INFOPLIST_FILE = "Parse-iOS copy-Info.plist";
5928-
PRODUCT_NAME = "$(TARGET_NAME)";
59295927
};
59305928
name = Debug;
59315929
};
59325930
815F24141BD04D150054659F /* Release */ = {
59335931
isa = XCBuildConfiguration;
59345932
baseConfigurationReference = 815F24171BD04D310054659F /* Parse-tvOS.xcconfig */;
59355933
buildSettings = {
5936-
INFOPLIST_FILE = "Parse-iOS copy-Info.plist";
5937-
PRODUCT_NAME = "$(TARGET_NAME)";
59385934
};
59395935
name = Release;
59405936
};

0 commit comments

Comments
 (0)