Skip to content

Commit 7b6cb12

Browse files
tristanhimmelmantristanhimmelman
committed
Merge branch 'swift-2.0' of https://github.com/nrbrook/ObjectMapper into nrbrook-swift-2.0
2 parents 220395c + 79fcd81 commit 7b6cb12

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

‎ObjectMapper.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113

114114
/* Begin PBXFileReference section */
115115
37AFD9B81AAD191C00AB59B5 /* CustomDateFormatTransform.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomDateFormatTransform.swift; sourceTree = "<group>"; };
116-
6A2AD03D1B2C78540097E150 /* ObjectMapperWatchOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjectMapperWatchOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
116+
6A2AD03D1B2C78540097E150 /* ObjectMapper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjectMapper.framework; sourceTree = BUILT_PRODUCTS_DIR; };
117117
6A2AD03F1B2C78540097E150 /* ObjectMapper-watchOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ObjectMapper-watchOS.h"; sourceTree = "<group>"; };
118118
6A2AD0411B2C78540097E150 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
119119
6A3774331A31427F00CC0AB5 /* BasicTypesTestsToJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = BasicTypesTestsToJSON.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
@@ -226,7 +226,7 @@
226226
6AAC8F8119F03C2900E7A677 /* ObjectMapper-iOSTests.xctest */,
227227
CD1602FF1AC023D5000CD69A /* ObjectMapper.framework */,
228228
CD1603091AC023D6000CD69A /* ObjectMapper-MacTests.xctest */,
229-
6A2AD03D1B2C78540097E150 /* ObjectMapperWatchOS.framework */,
229+
6A2AD03D1B2C78540097E150 /* ObjectMapper.framework */,
230230
);
231231
name = Products;
232232
sourceTree = "<group>";
@@ -341,7 +341,7 @@
341341
);
342342
name = ObjectMapperWatchOS;
343343
productName = "ObjectMapper-watchOS";
344-
productReference = 6A2AD03D1B2C78540097E150 /* ObjectMapperWatchOS.framework */;
344+
productReference = 6A2AD03D1B2C78540097E150 /* ObjectMapper.framework */;
345345
productType = "com.apple.product-type.framework";
346346
};
347347
6AAC8F7519F03C2900E7A677 /* ObjectMapper-iOS */ = {
@@ -607,6 +607,7 @@
607607
6A2AD0421B2C78540097E150 /* Debug */ = {
608608
isa = XCBuildConfiguration;
609609
buildSettings = {
610+
APPLICATION_EXTENSION_API_ONLY = YES;
610611
DEBUG_INFORMATION_FORMAT = dwarf;
611612
DEFINES_MODULE = YES;
612613
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -618,7 +619,7 @@
618619
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
619620
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
620621
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.ObjectMapper-watchOS";
621-
PRODUCT_NAME = "$(TARGET_NAME)";
622+
PRODUCT_NAME = ObjectMapper;
622623
SDKROOT = watchos;
623624
SKIP_INSTALL = YES;
624625
TARGETED_DEVICE_FAMILY = 4;
@@ -629,6 +630,7 @@
629630
6A2AD0431B2C78540097E150 /* Release */ = {
630631
isa = XCBuildConfiguration;
631632
buildSettings = {
633+
APPLICATION_EXTENSION_API_ONLY = YES;
632634
COPY_PHASE_STRIP = NO;
633635
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
634636
DEFINES_MODULE = YES;
@@ -640,7 +642,7 @@
640642
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
641643
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
642644
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.ObjectMapper-watchOS";
643-
PRODUCT_NAME = "$(TARGET_NAME)";
645+
PRODUCT_NAME = ObjectMapper;
644646
SDKROOT = watchos;
645647
SKIP_INSTALL = YES;
646648
TARGETED_DEVICE_FAMILY = 4;

0 commit comments

Comments
 (0)