From 4801708d511ee46372111089fe2db154c4d5463d Mon Sep 17 00:00:00 2001 From: Syo Ikeda Date: Mon, 23 Mar 2015 19:27:02 +0900 Subject: [PATCH 1/5] Rename existing target to iOS-specific one --- ObjectMapper.xcodeproj/project.pbxproj | 32 +++++++++---------- .../xcschemes/ObjectMapper.xcscheme | 16 +++++----- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ObjectMapper.xcodeproj/project.pbxproj b/ObjectMapper.xcodeproj/project.pbxproj index 065bda61..dff03ecf 100644 --- a/ObjectMapper.xcodeproj/project.pbxproj +++ b/ObjectMapper.xcodeproj/project.pbxproj @@ -65,7 +65,7 @@ 6AAC8F7619F03C2900E7A677 /* ObjectMapper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjectMapper.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 6AAC8F7A19F03C2900E7A677 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 6AAC8F7B19F03C2900E7A677 /* ObjectMapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ObjectMapper.h; sourceTree = ""; }; - 6AAC8F8119F03C2900E7A677 /* ObjectMapperTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ObjectMapperTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 6AAC8F8119F03C2900E7A677 /* ObjectMapper-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ObjectMapper-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 6AAC8F8419F03C2900E7A677 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 6AAC8F8519F03C2900E7A677 /* ObjectMapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = ObjectMapperTests.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 6AAC8FC319F048FE00E7A677 /* FromJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = FromJSON.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; @@ -124,7 +124,7 @@ isa = PBXGroup; children = ( 6AAC8F7619F03C2900E7A677 /* ObjectMapper.framework */, - 6AAC8F8119F03C2900E7A677 /* ObjectMapperTests.xctest */, + 6AAC8F8119F03C2900E7A677 /* ObjectMapper-iOSTests.xctest */, ); name = Products; sourceTree = ""; @@ -207,9 +207,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 6AAC8F7519F03C2900E7A677 /* ObjectMapper */ = { + 6AAC8F7519F03C2900E7A677 /* ObjectMapper-iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 6AAC8F8919F03C2900E7A677 /* Build configuration list for PBXNativeTarget "ObjectMapper" */; + buildConfigurationList = 6AAC8F8919F03C2900E7A677 /* Build configuration list for PBXNativeTarget "ObjectMapper-iOS" */; buildPhases = ( 6AAC8F7119F03C2900E7A677 /* Sources */, 6AAC8F7219F03C2900E7A677 /* Frameworks */, @@ -220,14 +220,14 @@ ); dependencies = ( ); - name = ObjectMapper; + name = "ObjectMapper-iOS"; productName = ObjectMapper; productReference = 6AAC8F7619F03C2900E7A677 /* ObjectMapper.framework */; productType = "com.apple.product-type.framework"; }; - 6AAC8F8019F03C2900E7A677 /* ObjectMapperTests */ = { + 6AAC8F8019F03C2900E7A677 /* ObjectMapper-iOSTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 6AAC8F8C19F03C2900E7A677 /* Build configuration list for PBXNativeTarget "ObjectMapperTests" */; + buildConfigurationList = 6AAC8F8C19F03C2900E7A677 /* Build configuration list for PBXNativeTarget "ObjectMapper-iOSTests" */; buildPhases = ( 6AAC8F7D19F03C2900E7A677 /* Sources */, 6AAC8F7E19F03C2900E7A677 /* Frameworks */, @@ -239,9 +239,9 @@ dependencies = ( 6AAC8FD619F04A5600E7A677 /* PBXTargetDependency */, ); - name = ObjectMapperTests; + name = "ObjectMapper-iOSTests"; productName = ObjectMapperTests; - productReference = 6AAC8F8119F03C2900E7A677 /* ObjectMapperTests.xctest */; + productReference = 6AAC8F8119F03C2900E7A677 /* ObjectMapper-iOSTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -273,8 +273,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 6AAC8F7519F03C2900E7A677 /* ObjectMapper */, - 6AAC8F8019F03C2900E7A677 /* ObjectMapperTests */, + 6AAC8F7519F03C2900E7A677 /* ObjectMapper-iOS */, + 6AAC8F8019F03C2900E7A677 /* ObjectMapper-iOSTests */, ); }; /* End PBXProject section */ @@ -334,7 +334,7 @@ /* Begin PBXTargetDependency section */ 6AAC8FD619F04A5600E7A677 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 6AAC8F7519F03C2900E7A677 /* ObjectMapper */; + target = 6AAC8F7519F03C2900E7A677 /* ObjectMapper-iOS */; targetProxy = 6AAC8FD519F04A5600E7A677 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -436,7 +436,7 @@ INFOPLIST_FILE = ObjectMapper/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "$(PROJECT_NAME)"; SKIP_INSTALL = YES; }; name = Debug; @@ -452,7 +452,7 @@ INFOPLIST_FILE = ObjectMapper/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "$(PROJECT_NAME)"; SKIP_INSTALL = YES; }; name = Release; @@ -499,7 +499,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 6AAC8F8919F03C2900E7A677 /* Build configuration list for PBXNativeTarget "ObjectMapper" */ = { + 6AAC8F8919F03C2900E7A677 /* Build configuration list for PBXNativeTarget "ObjectMapper-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 6AAC8F8A19F03C2900E7A677 /* Debug */, @@ -508,7 +508,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 6AAC8F8C19F03C2900E7A677 /* Build configuration list for PBXNativeTarget "ObjectMapperTests" */ = { + 6AAC8F8C19F03C2900E7A677 /* Build configuration list for PBXNativeTarget "ObjectMapper-iOSTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 6AAC8F8D19F03C2900E7A677 /* Debug */, diff --git a/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper.xcscheme b/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper.xcscheme index a102fb75..8d2ed513 100644 --- a/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper.xcscheme +++ b/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "6AAC8F7519F03C2900E7A677" BuildableName = "ObjectMapper.framework" - BlueprintName = "ObjectMapper" + BlueprintName = "ObjectMapper-iOS" ReferencedContainer = "container:ObjectMapper.xcodeproj"> @@ -29,8 +29,8 @@ @@ -47,8 +47,8 @@ @@ -58,7 +58,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "6AAC8F7519F03C2900E7A677" BuildableName = "ObjectMapper.framework" - BlueprintName = "ObjectMapper" + BlueprintName = "ObjectMapper-iOS" ReferencedContainer = "container:ObjectMapper.xcodeproj"> @@ -77,7 +77,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "6AAC8F7519F03C2900E7A677" BuildableName = "ObjectMapper.framework" - BlueprintName = "ObjectMapper" + BlueprintName = "ObjectMapper-iOS" ReferencedContainer = "container:ObjectMapper.xcodeproj"> @@ -95,7 +95,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "6AAC8F7519F03C2900E7A677" BuildableName = "ObjectMapper.framework" - BlueprintName = "ObjectMapper" + BlueprintName = "ObjectMapper-iOS" ReferencedContainer = "container:ObjectMapper.xcodeproj"> From dbc149cd94670fce3f61f1a9329acfd3cd121bb0 Mon Sep 17 00:00:00 2001 From: Syo Ikeda Date: Mon, 23 Mar 2015 19:45:41 +0900 Subject: [PATCH 2/5] Add OS X target --- ObjectMapper.xcodeproj/project.pbxproj | 247 ++++++++++++++++++ .../xcschemes/ObjectMapper-Mac.xcscheme | 110 ++++++++ ...per.xcscheme => ObjectMapper-iOS.xcscheme} | 0 ObjectMapper/ObjectMapper.h | 2 +- ObjectMapperTests/BasicTypes.swift | 2 +- .../BasicTypesTestsFromJSON.swift | 2 +- ObjectMapperTests/BasicTypesTestsToJSON.swift | 2 +- ObjectMapperTests/CustomTransformTests.swift | 2 +- ObjectMapperTests/ObjectMapperTests.swift | 2 +- 9 files changed, 363 insertions(+), 6 deletions(-) create mode 100644 ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac.xcscheme rename ObjectMapper.xcodeproj/xcshareddata/xcschemes/{ObjectMapper.xcscheme => ObjectMapper-iOS.xcscheme} (100%) diff --git a/ObjectMapper.xcodeproj/project.pbxproj b/ObjectMapper.xcodeproj/project.pbxproj index dff03ecf..9baf3142 100644 --- a/ObjectMapper.xcodeproj/project.pbxproj +++ b/ObjectMapper.xcodeproj/project.pbxproj @@ -22,6 +22,26 @@ 6AAC8FD119F048FE00E7A677 /* ToJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AAC8FC719F048FE00E7A677 /* ToJSON.swift */; }; 6AAC8FD319F048FE00E7A677 /* DateTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AAC8FCB19F048FE00E7A677 /* DateTransform.swift */; }; BC1E7F371ABC44C000F9B1CF /* EnumTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC1E7F361ABC44C000F9B1CF /* EnumTransform.swift */; }; + CD16030A1AC023D6000CD69A /* ObjectMapper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD1602FF1AC023D5000CD69A /* ObjectMapper.framework */; }; + CD1603181AC02437000CD69A /* ObjectMapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 6AAC8F7B19F03C2900E7A677 /* ObjectMapper.h */; settings = {ATTRIBUTES = (Public, ); }; }; + CD1603191AC02451000CD69A /* Mapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AAC8FC419F048FE00E7A677 /* Mapper.swift */; }; + CD16031A1AC02451000CD69A /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AAC8FC519F048FE00E7A677 /* Operators.swift */; }; + CD16031B1AC02451000CD69A /* FromJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AAC8FC319F048FE00E7A677 /* FromJSON.swift */; }; + CD16031C1AC02451000CD69A /* ToJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AAC8FC719F048FE00E7A677 /* ToJSON.swift */; }; + CD16031D1AC02461000CD69A /* DateTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AAC8FCB19F048FE00E7A677 /* DateTransform.swift */; }; + CD16031E1AC02461000CD69A /* DateFormaterTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A51372B1AADDE2700B82516 /* DateFormaterTransform.swift */; }; + CD16031F1AC02461000CD69A /* ISO8601DateTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = D86BDEA31A51E5AC00120819 /* ISO8601DateTransform.swift */; }; + CD1603201AC02461000CD69A /* CustomDateFormatTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AFD9B81AAD191C00AB59B5 /* CustomDateFormatTransform.swift */; }; + CD1603211AC02472000CD69A /* TransformOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD71C8C01A7218AD009D4161 /* TransformOf.swift */; }; + CD1603221AC02472000CD69A /* TransformType.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD50B6FC1A82518300744312 /* TransformType.swift */; }; + CD1603231AC02472000CD69A /* URLTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A6C54CF19FE8DB600239454 /* URLTransform.swift */; }; + CD1603241AC02472000CD69A /* EnumTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC1E7F361ABC44C000F9B1CF /* EnumTransform.swift */; }; + CD1603251AC02480000CD69A /* BasicTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A6AEB971A9387D0002573D3 /* BasicTypes.swift */; }; + CD1603261AC02480000CD69A /* BasicTypesTestsFromJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A6AEB951A93874F002573D3 /* BasicTypesTestsFromJSON.swift */; }; + CD1603271AC02480000CD69A /* BasicTypesTestsToJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A3774331A31427F00CC0AB5 /* BasicTypesTestsToJSON.swift */; }; + CD1603281AC02480000CD69A /* CustomTransformTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A51372E1AADE12C00B82516 /* CustomTransformTests.swift */; }; + CD1603291AC02480000CD69A /* NestedKeysTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD44374C1AAE9C1100A271BA /* NestedKeysTests.swift */; }; + CD16032A1AC02480000CD69A /* ObjectMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AAC8F8519F03C2900E7A677 /* ObjectMapperTests.swift */; }; CD4437491AAD692B00A271BA /* ObjectMapper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6AAC8F7619F03C2900E7A677 /* ObjectMapper.framework */; }; CD44374B1AAD698400A271BA /* ObjectMapper.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 6AAC8F7619F03C2900E7A677 /* ObjectMapper.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; CD44374D1AAE9C1100A271BA /* NestedKeysTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD44374C1AAE9C1100A271BA /* NestedKeysTests.swift */; }; @@ -38,6 +58,13 @@ remoteGlobalIDString = 6AAC8F7519F03C2900E7A677; remoteInfo = ObjectMapper; }; + CD16030B1AC023D6000CD69A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6AAC8F6D19F03C2900E7A677 /* Project object */; + proxyType = 1; + remoteGlobalIDString = CD1602FE1AC023D5000CD69A; + remoteInfo = "ObjectMapper-Mac"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -74,6 +101,8 @@ 6AAC8FC719F048FE00E7A677 /* ToJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ToJSON.swift; sourceTree = ""; }; 6AAC8FCB19F048FE00E7A677 /* DateTransform.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DateTransform.swift; sourceTree = ""; }; BC1E7F361ABC44C000F9B1CF /* EnumTransform.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnumTransform.swift; sourceTree = ""; }; + CD1602FF1AC023D5000CD69A /* ObjectMapper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjectMapper.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + CD1603091AC023D6000CD69A /* ObjectMapper-MacTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ObjectMapper-MacTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; CD44374C1AAE9C1100A271BA /* NestedKeysTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NestedKeysTests.swift; sourceTree = ""; }; CD50B6FC1A82518300744312 /* TransformType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransformType.swift; sourceTree = ""; }; CD71C8C01A7218AD009D4161 /* TransformOf.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransformOf.swift; sourceTree = ""; }; @@ -96,6 +125,21 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CD1602FB1AC023D5000CD69A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CD1603061AC023D6000CD69A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + CD16030A1AC023D6000CD69A /* ObjectMapper.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -125,6 +169,8 @@ children = ( 6AAC8F7619F03C2900E7A677 /* ObjectMapper.framework */, 6AAC8F8119F03C2900E7A677 /* ObjectMapper-iOSTests.xctest */, + CD1602FF1AC023D5000CD69A /* ObjectMapper.framework */, + CD1603091AC023D6000CD69A /* ObjectMapper-MacTests.xctest */, ); name = Products; sourceTree = ""; @@ -204,6 +250,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CD1602FC1AC023D5000CD69A /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + CD1603181AC02437000CD69A /* ObjectMapper.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -244,6 +298,42 @@ productReference = 6AAC8F8119F03C2900E7A677 /* ObjectMapper-iOSTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; + CD1602FE1AC023D5000CD69A /* ObjectMapper-Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = CD1603161AC023D6000CD69A /* Build configuration list for PBXNativeTarget "ObjectMapper-Mac" */; + buildPhases = ( + CD1602FA1AC023D5000CD69A /* Sources */, + CD1602FB1AC023D5000CD69A /* Frameworks */, + CD1602FC1AC023D5000CD69A /* Headers */, + CD1602FD1AC023D5000CD69A /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "ObjectMapper-Mac"; + productName = "ObjectMapper-Mac"; + productReference = CD1602FF1AC023D5000CD69A /* ObjectMapper.framework */; + productType = "com.apple.product-type.framework"; + }; + CD1603081AC023D6000CD69A /* ObjectMapper-MacTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = CD1603171AC023D6000CD69A /* Build configuration list for PBXNativeTarget "ObjectMapper-MacTests" */; + buildPhases = ( + CD1603051AC023D6000CD69A /* Sources */, + CD1603061AC023D6000CD69A /* Frameworks */, + CD1603071AC023D6000CD69A /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + CD16030C1AC023D6000CD69A /* PBXTargetDependency */, + ); + name = "ObjectMapper-MacTests"; + productName = "ObjectMapper-MacTests"; + productReference = CD1603091AC023D6000CD69A /* ObjectMapper-MacTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -259,6 +349,12 @@ 6AAC8F8019F03C2900E7A677 = { CreatedOnToolsVersion = 6.0.1; }; + CD1602FE1AC023D5000CD69A = { + CreatedOnToolsVersion = 6.2; + }; + CD1603081AC023D6000CD69A = { + CreatedOnToolsVersion = 6.2; + }; }; }; buildConfigurationList = 6AAC8F7019F03C2900E7A677 /* Build configuration list for PBXProject "ObjectMapper" */; @@ -275,6 +371,8 @@ targets = ( 6AAC8F7519F03C2900E7A677 /* ObjectMapper-iOS */, 6AAC8F8019F03C2900E7A677 /* ObjectMapper-iOSTests */, + CD1602FE1AC023D5000CD69A /* ObjectMapper-Mac */, + CD1603081AC023D6000CD69A /* ObjectMapper-MacTests */, ); }; /* End PBXProject section */ @@ -294,6 +392,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CD1602FD1AC023D5000CD69A /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CD1603071AC023D6000CD69A /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -329,6 +441,38 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CD1602FA1AC023D5000CD69A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + CD1603221AC02472000CD69A /* TransformType.swift in Sources */, + CD1603201AC02461000CD69A /* CustomDateFormatTransform.swift in Sources */, + CD16031E1AC02461000CD69A /* DateFormaterTransform.swift in Sources */, + CD1603241AC02472000CD69A /* EnumTransform.swift in Sources */, + CD16031F1AC02461000CD69A /* ISO8601DateTransform.swift in Sources */, + CD1603211AC02472000CD69A /* TransformOf.swift in Sources */, + CD1603231AC02472000CD69A /* URLTransform.swift in Sources */, + CD16031C1AC02451000CD69A /* ToJSON.swift in Sources */, + CD16031D1AC02461000CD69A /* DateTransform.swift in Sources */, + CD1603191AC02451000CD69A /* Mapper.swift in Sources */, + CD16031A1AC02451000CD69A /* Operators.swift in Sources */, + CD16031B1AC02451000CD69A /* FromJSON.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CD1603051AC023D6000CD69A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + CD1603261AC02480000CD69A /* BasicTypesTestsFromJSON.swift in Sources */, + CD1603291AC02480000CD69A /* NestedKeysTests.swift in Sources */, + CD1603251AC02480000CD69A /* BasicTypes.swift in Sources */, + CD16032A1AC02480000CD69A /* ObjectMapperTests.swift in Sources */, + CD1603271AC02480000CD69A /* BasicTypesTestsToJSON.swift in Sources */, + CD1603281AC02480000CD69A /* CustomTransformTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -337,6 +481,11 @@ target = 6AAC8F7519F03C2900E7A677 /* ObjectMapper-iOS */; targetProxy = 6AAC8FD519F04A5600E7A677 /* PBXContainerItemProxy */; }; + CD16030C1AC023D6000CD69A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = CD1602FE1AC023D5000CD69A /* ObjectMapper-Mac */; + targetProxy = CD16030B1AC023D6000CD69A /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -487,6 +636,88 @@ }; name = Release; }; + CD1603121AC023D6000CD69A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + INFOPLIST_FILE = ObjectMapper/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.10; + PRODUCT_NAME = "$(PROJECT_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + CD1603131AC023D6000CD69A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = ObjectMapper/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.10; + PRODUCT_NAME = "$(PROJECT_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + }; + name = Release; + }; + CD1603141AC023D6000CD69A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(DEVELOPER_FRAMEWORKS_DIR)", + "$(inherited)", + ); + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + INFOPLIST_FILE = ObjectMapperTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.10; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + }; + name = Debug; + }; + CD1603151AC023D6000CD69A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = ( + "$(DEVELOPER_FRAMEWORKS_DIR)", + "$(inherited)", + ); + INFOPLIST_FILE = ObjectMapperTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.10; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -517,6 +748,22 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + CD1603161AC023D6000CD69A /* Build configuration list for PBXNativeTarget "ObjectMapper-Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CD1603121AC023D6000CD69A /* Debug */, + CD1603131AC023D6000CD69A /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + CD1603171AC023D6000CD69A /* Build configuration list for PBXNativeTarget "ObjectMapper-MacTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CD1603141AC023D6000CD69A /* Debug */, + CD1603151AC023D6000CD69A /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; /* End XCConfigurationList section */ }; rootObject = 6AAC8F6D19F03C2900E7A677 /* Project object */; diff --git a/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac.xcscheme b/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac.xcscheme new file mode 100644 index 00000000..ac1f606d --- /dev/null +++ b/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac.xcscheme @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper.xcscheme b/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-iOS.xcscheme similarity index 100% rename from ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper.xcscheme rename to ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-iOS.xcscheme diff --git a/ObjectMapper/ObjectMapper.h b/ObjectMapper/ObjectMapper.h index 2f3ecefb..c795d443 100644 --- a/ObjectMapper/ObjectMapper.h +++ b/ObjectMapper/ObjectMapper.h @@ -6,7 +6,7 @@ // Copyright (c) 2014 hearst. All rights reserved. // -#import +#import //! Project version number for ObjectMapper. FOUNDATION_EXPORT double ObjectMapperVersionNumber; diff --git a/ObjectMapperTests/BasicTypes.swift b/ObjectMapperTests/BasicTypes.swift index 3efcef50..ba5914c9 100644 --- a/ObjectMapperTests/BasicTypes.swift +++ b/ObjectMapperTests/BasicTypes.swift @@ -6,7 +6,7 @@ // Copyright (c) 2015 hearst. All rights reserved. // -import UIKit +import Foundation import ObjectMapper class BasicTypes: Mappable { diff --git a/ObjectMapperTests/BasicTypesTestsFromJSON.swift b/ObjectMapperTests/BasicTypesTestsFromJSON.swift index 174e49b8..fa72b111 100644 --- a/ObjectMapperTests/BasicTypesTestsFromJSON.swift +++ b/ObjectMapperTests/BasicTypesTestsFromJSON.swift @@ -6,7 +6,7 @@ // Copyright (c) 2015 hearst. All rights reserved. // -import UIKit +import Foundation import XCTest import ObjectMapper diff --git a/ObjectMapperTests/BasicTypesTestsToJSON.swift b/ObjectMapperTests/BasicTypesTestsToJSON.swift index 8f6a99bd..fba21d27 100644 --- a/ObjectMapperTests/BasicTypesTestsToJSON.swift +++ b/ObjectMapperTests/BasicTypesTestsToJSON.swift @@ -6,7 +6,7 @@ // Copyright (c) 2014 hearst. All rights reserved. // -import UIKit +import Foundation import XCTest import ObjectMapper diff --git a/ObjectMapperTests/CustomTransformTests.swift b/ObjectMapperTests/CustomTransformTests.swift index 15445371..74dfd8d9 100644 --- a/ObjectMapperTests/CustomTransformTests.swift +++ b/ObjectMapperTests/CustomTransformTests.swift @@ -6,7 +6,7 @@ // Copyright (c) 2015 hearst. All rights reserved. // -import UIKit +import Foundation import XCTest import ObjectMapper diff --git a/ObjectMapperTests/ObjectMapperTests.swift b/ObjectMapperTests/ObjectMapperTests.swift index ae339e18..7489687d 100644 --- a/ObjectMapperTests/ObjectMapperTests.swift +++ b/ObjectMapperTests/ObjectMapperTests.swift @@ -6,7 +6,7 @@ // Copyright (c) 2014 hearst. All rights reserved. // -import UIKit +import Foundation import XCTest import ObjectMapper From b0efede240b9e0a359072e107c8c27bd6967b2ff Mon Sep 17 00:00:00 2001 From: Syo Ikeda Date: Mon, 23 Mar 2015 19:50:35 +0900 Subject: [PATCH 3/5] Set OS X deployment target to 10.9 --- ObjectMapper.xcodeproj/project.pbxproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ObjectMapper.xcodeproj/project.pbxproj b/ObjectMapper.xcodeproj/project.pbxproj index 9baf3142..1a1e94d5 100644 --- a/ObjectMapper.xcodeproj/project.pbxproj +++ b/ObjectMapper.xcodeproj/project.pbxproj @@ -525,6 +525,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -565,6 +566,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -652,7 +654,6 @@ INFOPLIST_FILE = ObjectMapper/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(PROJECT_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -673,7 +674,6 @@ INFOPLIST_FILE = ObjectMapper/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(PROJECT_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -755,6 +755,7 @@ CD1603131AC023D6000CD69A /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; CD1603171AC023D6000CD69A /* Build configuration list for PBXNativeTarget "ObjectMapper-MacTests" */ = { isa = XCConfigurationList; @@ -763,6 +764,7 @@ CD1603151AC023D6000CD69A /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; From 02309b169784d833c93ae8fe3370ebae079ec75f Mon Sep 17 00:00:00 2001 From: Syo Ikeda Date: Mon, 23 Mar 2015 19:54:00 +0900 Subject: [PATCH 4/5] Set APPLICATION_EXTENSION_API_ONLY to YES for OS X target --- ObjectMapper.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ObjectMapper.xcodeproj/project.pbxproj b/ObjectMapper.xcodeproj/project.pbxproj index 1a1e94d5..92979344 100644 --- a/ObjectMapper.xcodeproj/project.pbxproj +++ b/ObjectMapper.xcodeproj/project.pbxproj @@ -641,6 +641,7 @@ CD1603121AC023D6000CD69A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -663,6 +664,7 @@ CD1603131AC023D6000CD69A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; From fe5229449285a59996347fd1074badc54b81be5c Mon Sep 17 00:00:00 2001 From: Syo Ikeda Date: Mon, 23 Mar 2015 20:00:21 +0900 Subject: [PATCH 5/5] Update .travis.yml --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad5154fa..64aeaa7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,19 @@ language: objective-c osx_image: xcode611 -xcode_project: ObjectMapper.xcodeproj -xcode_scheme: ObjectMapper -xcode_sdk: - - iphonesimulator8.1 +env: + global: + - LANG=en_US.UTF-8 + - LC_ALL=en_US.UTF-8 + matrix: + - XCODE_SCHEME=ObjectMapper-iOS XCODE_SDK=iphonesimulator8.1 + - XCODE_SCHEME=ObjectMapper-Mac XCODE_SDK=macosx10.10 before_install: - brew update - brew outdated xctool || brew upgrade xctool -env: - global: - - LANG=en_US.UTF-8 - - LC_ALL=en_US.UTF-8 +script: xctool -project ObjectMapper.xcodeproj -scheme $XCODE_SCHEME -sdk $XCODE_SDK test notifications: email: false