From 5cc16f37acef02126796a0d3a46ad2004835371f Mon Sep 17 00:00:00 2001 From: Fabian Canas Date: Fri, 13 Feb 2015 13:36:00 -0500 Subject: [PATCH 1/3] Create Frameworks for Carthage support --- ObjectMapping/OHMKit-OSX/Info.plist | 28 ++ ObjectMapping/OHMKit-OSX/OHMKit-OSX.h | 14 + ObjectMapping/OHMKit-iOS/Info.plist | 26 ++ ObjectMapping/OHMKit-iOS/OHMKit-iOS.h | 15 + .../OHMKit.xcodeproj/project.pbxproj | 308 ++++++++++++++++++ .../xcschemes/OHMKit-OSX.xcscheme | 110 +++++++ .../xcschemes/OHMKit-iOS.xcscheme | 110 +++++++ 7 files changed, 611 insertions(+) create mode 100644 ObjectMapping/OHMKit-OSX/Info.plist create mode 100644 ObjectMapping/OHMKit-OSX/OHMKit-OSX.h create mode 100644 ObjectMapping/OHMKit-iOS/Info.plist create mode 100644 ObjectMapping/OHMKit-iOS/OHMKit-iOS.h create mode 100644 ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-OSX.xcscheme create mode 100644 ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-iOS.xcscheme diff --git a/ObjectMapping/OHMKit-OSX/Info.plist b/ObjectMapping/OHMKit-OSX/Info.plist new file mode 100644 index 0000000..2173e50 --- /dev/null +++ b/ObjectMapping/OHMKit-OSX/Info.plist @@ -0,0 +1,28 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + com.fabiancanas.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 0.2.1 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSHumanReadableCopyright + Copyright © 2015 Fabian Canas. All rights reserved. + NSPrincipalClass + + + diff --git a/ObjectMapping/OHMKit-OSX/OHMKit-OSX.h b/ObjectMapping/OHMKit-OSX/OHMKit-OSX.h new file mode 100644 index 0000000..84b8f02 --- /dev/null +++ b/ObjectMapping/OHMKit-OSX/OHMKit-OSX.h @@ -0,0 +1,14 @@ +// +// OHMKit-OSX.h +// OHMKit-OSX +// +// Created by Fabian Canas on 2/13/15. +// Copyright (c) 2015 Fabian Canas. All rights reserved. +// + +#import + +FOUNDATION_EXPORT double OHMKit_OSXVersionNumber; +FOUNDATION_EXPORT const unsigned char OHMKit_OSXVersionString[]; + +#import diff --git a/ObjectMapping/OHMKit-iOS/Info.plist b/ObjectMapping/OHMKit-iOS/Info.plist new file mode 100644 index 0000000..db1ffc2 --- /dev/null +++ b/ObjectMapping/OHMKit-iOS/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + com.fabiancanas.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 0.2.1 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/ObjectMapping/OHMKit-iOS/OHMKit-iOS.h b/ObjectMapping/OHMKit-iOS/OHMKit-iOS.h new file mode 100644 index 0000000..9e9f725 --- /dev/null +++ b/ObjectMapping/OHMKit-iOS/OHMKit-iOS.h @@ -0,0 +1,15 @@ +// +// OHMKit-iOS.h +// OHMKit-iOS +// +// Created by Fabian Canas on 2/13/15. +// Copyright (c) 2015 Fabian Canas. All rights reserved. +// + +#import + +FOUNDATION_EXPORT double OHMKit_iOSVersionNumber; +FOUNDATION_EXPORT const unsigned char OHMKit_iOSVersionString[]; + +#import + diff --git a/ObjectMapping/OHMKit.xcodeproj/project.pbxproj b/ObjectMapping/OHMKit.xcodeproj/project.pbxproj index a4e12e1..be34782 100644 --- a/ObjectMapping/OHMKit.xcodeproj/project.pbxproj +++ b/ObjectMapping/OHMKit.xcodeproj/project.pbxproj @@ -17,6 +17,20 @@ E7AF667817938AD0000EE96C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E7AF667617938AD0000EE96C /* InfoPlist.strings */; }; E7AF667A17938AD0000EE96C /* ObjectMappingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7AF667917938AD0000EE96C /* ObjectMappingTests.m */; }; E7AF668917938B31000EE96C /* OMTBasicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E7AF668817938B31000EE96C /* OMTBasicModel.m */; }; + E7C1C3841A8E7A4500ABF294 /* OHMKit-iOS.h in Headers */ = {isa = PBXBuildFile; fileRef = E7C1C3831A8E7A4500ABF294 /* OHMKit-iOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E7C1C3A21A8E7A6D00ABF294 /* OHMKit-OSX.h in Headers */ = {isa = PBXBuildFile; fileRef = E7C1C3A11A8E7A6D00ABF294 /* OHMKit-OSX.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E7C1C3B61A8E7A9E00ABF294 /* ObjectMapping.m in Sources */ = {isa = PBXBuildFile; fileRef = E7AF668517938AEE000EE96C /* ObjectMapping.m */; }; + E7C1C3B71A8E7A9E00ABF294 /* ObjectMapping.m in Sources */ = {isa = PBXBuildFile; fileRef = E7AF668517938AEE000EE96C /* ObjectMapping.m */; }; + E7C1C3B81A8E7AC100ABF294 /* ObjectMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = E7AF668417938AEE000EE96C /* ObjectMapping.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E7C1C3B91A8E7AC100ABF294 /* OHMKit.h in Headers */ = {isa = PBXBuildFile; fileRef = E7541CAE197EDFCB0051FFB9 /* OHMKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E7C1C3BA1A8E7AC100ABF294 /* OHMArrayMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = E7F0D4AD198C6C76004632FD /* OHMArrayMapping.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E7C1C3BB1A8E7AC100ABF294 /* OHMDictionaryMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = E7F0D4AE198C6CCA004632FD /* OHMDictionaryMapping.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E7C1C3BC1A8E7AC100ABF294 /* OHMAdapters.h in Headers */ = {isa = PBXBuildFile; fileRef = E711F9FF198C718E00973D5F /* OHMAdapters.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E7C1C3BD1A8E7AC800ABF294 /* ObjectMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = E7AF668417938AEE000EE96C /* ObjectMapping.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E7C1C3BE1A8E7AC800ABF294 /* OHMKit.h in Headers */ = {isa = PBXBuildFile; fileRef = E7541CAE197EDFCB0051FFB9 /* OHMKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E7C1C3BF1A8E7AC800ABF294 /* OHMArrayMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = E7F0D4AD198C6C76004632FD /* OHMArrayMapping.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E7C1C3C01A8E7AC800ABF294 /* OHMDictionaryMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = E7F0D4AE198C6CCA004632FD /* OHMDictionaryMapping.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E7C1C3C11A8E7AC800ABF294 /* OHMAdapters.h in Headers */ = {isa = PBXBuildFile; fileRef = E711F9FF198C718E00973D5F /* OHMAdapters.h */; settings = {ATTRIBUTES = (Public, ); }; }; E7CB24F81839E706003A0375 /* OMTCollectionClass.m in Sources */ = {isa = PBXBuildFile; fileRef = E7CB24F71839E706003A0375 /* OMTCollectionClass.m */; }; /* End PBXBuildFile section */ @@ -59,6 +73,12 @@ E7AF668517938AEE000EE96C /* ObjectMapping.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjectMapping.m; sourceTree = ""; }; E7AF668717938B31000EE96C /* OMTBasicModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OMTBasicModel.h; sourceTree = ""; }; E7AF668817938B31000EE96C /* OMTBasicModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OMTBasicModel.m; sourceTree = ""; }; + E7C1C37F1A8E7A4500ABF294 /* OHMKit-iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "OHMKit-iOS.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + E7C1C3821A8E7A4500ABF294 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + E7C1C3831A8E7A4500ABF294 /* OHMKit-iOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OHMKit-iOS.h"; sourceTree = ""; }; + E7C1C39D1A8E7A6D00ABF294 /* OHMKit-OSX.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "OHMKit-OSX.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + E7C1C3A01A8E7A6D00ABF294 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + E7C1C3A11A8E7A6D00ABF294 /* OHMKit-OSX.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OHMKit-OSX.h"; sourceTree = ""; }; E7CB24F71839E706003A0375 /* OMTCollectionClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OMTCollectionClass.m; sourceTree = ""; }; E7F0D4AD198C6C76004632FD /* OHMArrayMapping.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMArrayMapping.h; sourceTree = ""; }; E7F0D4AE198C6CCA004632FD /* OHMDictionaryMapping.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMDictionaryMapping.h; sourceTree = ""; }; @@ -84,6 +104,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + E7C1C37B1A8E7A4500ABF294 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + E7C1C3991A8E7A6D00ABF294 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -92,6 +126,8 @@ children = ( E7AF665F17938AD0000EE96C /* ObjectMapping */, E7AF667317938AD0000EE96C /* ObjectMappingTests */, + E7C1C3801A8E7A4500ABF294 /* OHMKit-iOS */, + E7C1C39E1A8E7A6D00ABF294 /* OHMKit-OSX */, E7AF665C17938AD0000EE96C /* Frameworks */, E7AF665B17938AD0000EE96C /* Products */, ); @@ -102,6 +138,8 @@ children = ( E7AF665A17938AD0000EE96C /* libOHMKit.a */, E7AF666A17938AD0000EE96C /* OHMKitTests.xctest */, + E7C1C37F1A8E7A4500ABF294 /* OHMKit-iOS.framework */, + E7C1C39D1A8E7A6D00ABF294 /* OHMKit-OSX.framework */, ); name = Products; sourceTree = ""; @@ -169,8 +207,71 @@ path = ../../Core; sourceTree = ""; }; + E7C1C3801A8E7A4500ABF294 /* OHMKit-iOS */ = { + isa = PBXGroup; + children = ( + E7C1C3831A8E7A4500ABF294 /* OHMKit-iOS.h */, + E7C1C3811A8E7A4500ABF294 /* Supporting Files */, + ); + path = "OHMKit-iOS"; + sourceTree = ""; + }; + E7C1C3811A8E7A4500ABF294 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + E7C1C3821A8E7A4500ABF294 /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + E7C1C39E1A8E7A6D00ABF294 /* OHMKit-OSX */ = { + isa = PBXGroup; + children = ( + E7C1C3A11A8E7A6D00ABF294 /* OHMKit-OSX.h */, + E7C1C39F1A8E7A6D00ABF294 /* Supporting Files */, + ); + path = "OHMKit-OSX"; + sourceTree = ""; + }; + E7C1C39F1A8E7A6D00ABF294 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + E7C1C3A01A8E7A6D00ABF294 /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; /* End PBXGroup section */ +/* Begin PBXHeadersBuildPhase section */ + E7C1C37C1A8E7A4500ABF294 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + E7C1C3841A8E7A4500ABF294 /* OHMKit-iOS.h in Headers */, + E7C1C3B81A8E7AC100ABF294 /* ObjectMapping.h in Headers */, + E7C1C3B91A8E7AC100ABF294 /* OHMKit.h in Headers */, + E7C1C3BA1A8E7AC100ABF294 /* OHMArrayMapping.h in Headers */, + E7C1C3BB1A8E7AC100ABF294 /* OHMDictionaryMapping.h in Headers */, + E7C1C3BC1A8E7AC100ABF294 /* OHMAdapters.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + E7C1C39A1A8E7A6D00ABF294 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + E7C1C3A21A8E7A6D00ABF294 /* OHMKit-OSX.h in Headers */, + E7C1C3BD1A8E7AC800ABF294 /* ObjectMapping.h in Headers */, + E7C1C3BE1A8E7AC800ABF294 /* OHMKit.h in Headers */, + E7C1C3BF1A8E7AC800ABF294 /* OHMArrayMapping.h in Headers */, + E7C1C3C01A8E7AC800ABF294 /* OHMDictionaryMapping.h in Headers */, + E7C1C3C11A8E7AC800ABF294 /* OHMAdapters.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + /* Begin PBXNativeTarget section */ E7AF665917938AD0000EE96C /* OHMKit */ = { isa = PBXNativeTarget; @@ -207,6 +308,42 @@ productReference = E7AF666A17938AD0000EE96C /* OHMKitTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; + E7C1C37E1A8E7A4500ABF294 /* OHMKit-iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = E7C1C3961A8E7A4500ABF294 /* Build configuration list for PBXNativeTarget "OHMKit-iOS" */; + buildPhases = ( + E7C1C37A1A8E7A4500ABF294 /* Sources */, + E7C1C37B1A8E7A4500ABF294 /* Frameworks */, + E7C1C37C1A8E7A4500ABF294 /* Headers */, + E7C1C37D1A8E7A4500ABF294 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "OHMKit-iOS"; + productName = "OHMKit-iOS"; + productReference = E7C1C37F1A8E7A4500ABF294 /* OHMKit-iOS.framework */; + productType = "com.apple.product-type.framework"; + }; + E7C1C39C1A8E7A6D00ABF294 /* OHMKit-OSX */ = { + isa = PBXNativeTarget; + buildConfigurationList = E7C1C3B01A8E7A6E00ABF294 /* Build configuration list for PBXNativeTarget "OHMKit-OSX" */; + buildPhases = ( + E7C1C3981A8E7A6D00ABF294 /* Sources */, + E7C1C3991A8E7A6D00ABF294 /* Frameworks */, + E7C1C39A1A8E7A6D00ABF294 /* Headers */, + E7C1C39B1A8E7A6D00ABF294 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "OHMKit-OSX"; + productName = "OHMKit-OSX"; + productReference = E7C1C39D1A8E7A6D00ABF294 /* OHMKit-OSX.framework */; + productType = "com.apple.product-type.framework"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -216,6 +353,14 @@ CLASSPREFIX = OHM; LastUpgradeCheck = 0510; ORGANIZATIONNAME = "Fabian Canas"; + TargetAttributes = { + E7C1C37E1A8E7A4500ABF294 = { + CreatedOnToolsVersion = 6.1.1; + }; + E7C1C39C1A8E7A6D00ABF294 = { + CreatedOnToolsVersion = 6.1.1; + }; + }; }; buildConfigurationList = E7AF665517938AD0000EE96C /* Build configuration list for PBXProject "OHMKit" */; compatibilityVersion = "Xcode 3.2"; @@ -231,6 +376,8 @@ targets = ( E7AF665917938AD0000EE96C /* OHMKit */, E7AF666917938AD0000EE96C /* OHMKitTests */, + E7C1C37E1A8E7A4500ABF294 /* OHMKit-iOS */, + E7C1C39C1A8E7A6D00ABF294 /* OHMKit-OSX */, ); }; /* End PBXProject section */ @@ -244,6 +391,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + E7C1C37D1A8E7A4500ABF294 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + E7C1C39B1A8E7A6D00ABF294 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -266,6 +427,22 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + E7C1C37A1A8E7A4500ABF294 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + E7C1C3B61A8E7A9E00ABF294 /* ObjectMapping.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + E7C1C3981A8E7A6D00ABF294 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + E7C1C3B71A8E7A9E00ABF294 /* ObjectMapping.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -412,6 +589,121 @@ }; name = Release; }; + E7C1C3921A8E7A4500ABF294 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_UNREACHABLE_CODE = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = "OHMKit-iOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + E7C1C3931A8E7A4500ABF294 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_UNREACHABLE_CODE = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = "OHMKit-iOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + E7C1C3B11A8E7A6E00ABF294 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_UNREACHABLE_CODE = YES; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_VERSION = A; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = "OHMKit-OSX/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + E7C1C3B21A8E7A6E00ABF294 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_UNREACHABLE_CODE = YES; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_VERSION = A; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = "OHMKit-OSX/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -442,6 +734,22 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + E7C1C3961A8E7A4500ABF294 /* Build configuration list for PBXNativeTarget "OHMKit-iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E7C1C3921A8E7A4500ABF294 /* Debug */, + E7C1C3931A8E7A4500ABF294 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + E7C1C3B01A8E7A6E00ABF294 /* Build configuration list for PBXNativeTarget "OHMKit-OSX" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E7C1C3B11A8E7A6E00ABF294 /* Debug */, + E7C1C3B21A8E7A6E00ABF294 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; /* End XCConfigurationList section */ }; rootObject = E7AF665217938AD0000EE96C /* Project object */; diff --git a/ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-OSX.xcscheme b/ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-OSX.xcscheme new file mode 100644 index 0000000..99f1f49 --- /dev/null +++ b/ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-OSX.xcscheme @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-iOS.xcscheme b/ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-iOS.xcscheme new file mode 100644 index 0000000..f32ecc3 --- /dev/null +++ b/ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-iOS.xcscheme @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From fb06dc96e4e55ffa024f2ec82b62f2810b8f8f27 Mon Sep 17 00:00:00 2001 From: Fabian Canas Date: Fri, 13 Feb 2015 14:34:49 -0500 Subject: [PATCH 2/3] Restructure directories --- .travis.yml | 2 +- {ObjectMapping/OHMKit-OSX => OHMKit-OSX}/Info.plist | 0 {ObjectMapping/OHMKit-OSX => OHMKit-OSX}/OHMKit-OSX.h | 0 {ObjectMapping/OHMKit-iOS => OHMKit-iOS}/Info.plist | 0 {ObjectMapping/OHMKit-iOS => OHMKit-iOS}/OHMKit-iOS.h | 0 .../OHMKit.xcodeproj => OHMKit.xcodeproj}/project.pbxproj | 4 +++- .../project.xcworkspace/contents.xcworkspacedata | 0 .../xcshareddata/xcschemes/OHMKit-OSX.xcscheme | 0 .../xcshareddata/xcschemes/OHMKit-iOS.xcscheme | 0 .../xcshareddata/xcschemes/ObjectMapping.xcscheme | 0 .../xcshareddata/xcschemes/ObjectMappingTests.xcscheme | 0 ObjectMapping/{ObjectMapping => }/OHMKit-Prefix.pch | 0 .../HierarchicalModelsTests.m | 0 .../OHMKitTests-Info.plist | 0 .../ObjectMappingTests => ObjectMappingTests}/OMTBasicModel.h | 0 .../ObjectMappingTests => ObjectMappingTests}/OMTBasicModel.m | 0 .../OMTCollectionClass.m | 0 .../ObjectMappingTests.m | 0 .../en.lproj/InfoPlist.strings | 0 19 files changed, 4 insertions(+), 2 deletions(-) rename {ObjectMapping/OHMKit-OSX => OHMKit-OSX}/Info.plist (100%) rename {ObjectMapping/OHMKit-OSX => OHMKit-OSX}/OHMKit-OSX.h (100%) rename {ObjectMapping/OHMKit-iOS => OHMKit-iOS}/Info.plist (100%) rename {ObjectMapping/OHMKit-iOS => OHMKit-iOS}/OHMKit-iOS.h (100%) rename {ObjectMapping/OHMKit.xcodeproj => OHMKit.xcodeproj}/project.pbxproj (99%) rename {ObjectMapping/OHMKit.xcodeproj => OHMKit.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (100%) rename {ObjectMapping/OHMKit.xcodeproj => OHMKit.xcodeproj}/xcshareddata/xcschemes/OHMKit-OSX.xcscheme (100%) rename {ObjectMapping/OHMKit.xcodeproj => OHMKit.xcodeproj}/xcshareddata/xcschemes/OHMKit-iOS.xcscheme (100%) rename {ObjectMapping/OHMKit.xcodeproj => OHMKit.xcodeproj}/xcshareddata/xcschemes/ObjectMapping.xcscheme (100%) rename {ObjectMapping/OHMKit.xcodeproj => OHMKit.xcodeproj}/xcshareddata/xcschemes/ObjectMappingTests.xcscheme (100%) rename ObjectMapping/{ObjectMapping => }/OHMKit-Prefix.pch (100%) rename {ObjectMapping/ObjectMappingTests => ObjectMappingTests}/HierarchicalModelsTests.m (100%) rename {ObjectMapping/ObjectMappingTests => ObjectMappingTests}/OHMKitTests-Info.plist (100%) rename {ObjectMapping/ObjectMappingTests => ObjectMappingTests}/OMTBasicModel.h (100%) rename {ObjectMapping/ObjectMappingTests => ObjectMappingTests}/OMTBasicModel.m (100%) rename {ObjectMapping/ObjectMappingTests => ObjectMappingTests}/OMTCollectionClass.m (100%) rename {ObjectMapping/ObjectMappingTests => ObjectMappingTests}/ObjectMappingTests.m (100%) rename {ObjectMapping/ObjectMappingTests => ObjectMappingTests}/en.lproj/InfoPlist.strings (100%) diff --git a/.travis.yml b/.travis.yml index 3da6058..ce8e68e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -xcode_project: ObjectMapping/OHMKit.xcodeproj +xcode_project: OHMKit.xcodeproj xcode_scheme: ObjectMapping xcode_sdk: - iphonesimulator7.0 diff --git a/ObjectMapping/OHMKit-OSX/Info.plist b/OHMKit-OSX/Info.plist similarity index 100% rename from ObjectMapping/OHMKit-OSX/Info.plist rename to OHMKit-OSX/Info.plist diff --git a/ObjectMapping/OHMKit-OSX/OHMKit-OSX.h b/OHMKit-OSX/OHMKit-OSX.h similarity index 100% rename from ObjectMapping/OHMKit-OSX/OHMKit-OSX.h rename to OHMKit-OSX/OHMKit-OSX.h diff --git a/ObjectMapping/OHMKit-iOS/Info.plist b/OHMKit-iOS/Info.plist similarity index 100% rename from ObjectMapping/OHMKit-iOS/Info.plist rename to OHMKit-iOS/Info.plist diff --git a/ObjectMapping/OHMKit-iOS/OHMKit-iOS.h b/OHMKit-iOS/OHMKit-iOS.h similarity index 100% rename from ObjectMapping/OHMKit-iOS/OHMKit-iOS.h rename to OHMKit-iOS/OHMKit-iOS.h diff --git a/ObjectMapping/OHMKit.xcodeproj/project.pbxproj b/OHMKit.xcodeproj/project.pbxproj similarity index 99% rename from ObjectMapping/OHMKit.xcodeproj/project.pbxproj rename to OHMKit.xcodeproj/project.pbxproj index be34782..02968e2 100644 --- a/ObjectMapping/OHMKit.xcodeproj/project.pbxproj +++ b/OHMKit.xcodeproj/project.pbxproj @@ -204,7 +204,7 @@ E711F9FF198C718E00973D5F /* OHMAdapters.h */, ); name = Core; - path = ../../Core; + path = ../Core; sourceTree = ""; }; E7C1C3801A8E7A4500ABF294 /* OHMKit-iOS */ = { @@ -741,6 +741,7 @@ E7C1C3931A8E7A4500ABF294 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; E7C1C3B01A8E7A6E00ABF294 /* Build configuration list for PBXNativeTarget "OHMKit-OSX" */ = { isa = XCConfigurationList; @@ -749,6 +750,7 @@ E7C1C3B21A8E7A6E00ABF294 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/ObjectMapping/OHMKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/OHMKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from ObjectMapping/OHMKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to OHMKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-OSX.xcscheme b/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-OSX.xcscheme similarity index 100% rename from ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-OSX.xcscheme rename to OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-OSX.xcscheme diff --git a/ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-iOS.xcscheme b/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-iOS.xcscheme similarity index 100% rename from ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-iOS.xcscheme rename to OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-iOS.xcscheme diff --git a/ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/ObjectMapping.xcscheme b/OHMKit.xcodeproj/xcshareddata/xcschemes/ObjectMapping.xcscheme similarity index 100% rename from ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/ObjectMapping.xcscheme rename to OHMKit.xcodeproj/xcshareddata/xcschemes/ObjectMapping.xcscheme diff --git a/ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/ObjectMappingTests.xcscheme b/OHMKit.xcodeproj/xcshareddata/xcschemes/ObjectMappingTests.xcscheme similarity index 100% rename from ObjectMapping/OHMKit.xcodeproj/xcshareddata/xcschemes/ObjectMappingTests.xcscheme rename to OHMKit.xcodeproj/xcshareddata/xcschemes/ObjectMappingTests.xcscheme diff --git a/ObjectMapping/ObjectMapping/OHMKit-Prefix.pch b/ObjectMapping/OHMKit-Prefix.pch similarity index 100% rename from ObjectMapping/ObjectMapping/OHMKit-Prefix.pch rename to ObjectMapping/OHMKit-Prefix.pch diff --git a/ObjectMapping/ObjectMappingTests/HierarchicalModelsTests.m b/ObjectMappingTests/HierarchicalModelsTests.m similarity index 100% rename from ObjectMapping/ObjectMappingTests/HierarchicalModelsTests.m rename to ObjectMappingTests/HierarchicalModelsTests.m diff --git a/ObjectMapping/ObjectMappingTests/OHMKitTests-Info.plist b/ObjectMappingTests/OHMKitTests-Info.plist similarity index 100% rename from ObjectMapping/ObjectMappingTests/OHMKitTests-Info.plist rename to ObjectMappingTests/OHMKitTests-Info.plist diff --git a/ObjectMapping/ObjectMappingTests/OMTBasicModel.h b/ObjectMappingTests/OMTBasicModel.h similarity index 100% rename from ObjectMapping/ObjectMappingTests/OMTBasicModel.h rename to ObjectMappingTests/OMTBasicModel.h diff --git a/ObjectMapping/ObjectMappingTests/OMTBasicModel.m b/ObjectMappingTests/OMTBasicModel.m similarity index 100% rename from ObjectMapping/ObjectMappingTests/OMTBasicModel.m rename to ObjectMappingTests/OMTBasicModel.m diff --git a/ObjectMapping/ObjectMappingTests/OMTCollectionClass.m b/ObjectMappingTests/OMTCollectionClass.m similarity index 100% rename from ObjectMapping/ObjectMappingTests/OMTCollectionClass.m rename to ObjectMappingTests/OMTCollectionClass.m diff --git a/ObjectMapping/ObjectMappingTests/ObjectMappingTests.m b/ObjectMappingTests/ObjectMappingTests.m similarity index 100% rename from ObjectMapping/ObjectMappingTests/ObjectMappingTests.m rename to ObjectMappingTests/ObjectMappingTests.m diff --git a/ObjectMapping/ObjectMappingTests/en.lproj/InfoPlist.strings b/ObjectMappingTests/en.lproj/InfoPlist.strings similarity index 100% rename from ObjectMapping/ObjectMappingTests/en.lproj/InfoPlist.strings rename to ObjectMappingTests/en.lproj/InfoPlist.strings From be049f518a947016ba1d7201a1b7922e70ff821a Mon Sep 17 00:00:00 2001 From: Fabian Canas Date: Fri, 13 Feb 2015 14:53:52 -0500 Subject: [PATCH 3/3] Rename frameworks --- OHMKit.xcodeproj/project.pbxproj | 20 +++++++++---------- .../xcschemes/OHMKit-OSX.xcscheme | 16 +++++++-------- .../xcschemes/OHMKit-iOS.xcscheme | 16 +++++++-------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/OHMKit.xcodeproj/project.pbxproj b/OHMKit.xcodeproj/project.pbxproj index 02968e2..b907787 100644 --- a/OHMKit.xcodeproj/project.pbxproj +++ b/OHMKit.xcodeproj/project.pbxproj @@ -308,9 +308,9 @@ productReference = E7AF666A17938AD0000EE96C /* OHMKitTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - E7C1C37E1A8E7A4500ABF294 /* OHMKit-iOS */ = { + E7C1C37E1A8E7A4500ABF294 /* OHMKitiOS */ = { isa = PBXNativeTarget; - buildConfigurationList = E7C1C3961A8E7A4500ABF294 /* Build configuration list for PBXNativeTarget "OHMKit-iOS" */; + buildConfigurationList = E7C1C3961A8E7A4500ABF294 /* Build configuration list for PBXNativeTarget "OHMKitiOS" */; buildPhases = ( E7C1C37A1A8E7A4500ABF294 /* Sources */, E7C1C37B1A8E7A4500ABF294 /* Frameworks */, @@ -321,14 +321,14 @@ ); dependencies = ( ); - name = "OHMKit-iOS"; + name = OHMKitiOS; productName = "OHMKit-iOS"; productReference = E7C1C37F1A8E7A4500ABF294 /* OHMKit-iOS.framework */; productType = "com.apple.product-type.framework"; }; - E7C1C39C1A8E7A6D00ABF294 /* OHMKit-OSX */ = { + E7C1C39C1A8E7A6D00ABF294 /* OHMKitOSX */ = { isa = PBXNativeTarget; - buildConfigurationList = E7C1C3B01A8E7A6E00ABF294 /* Build configuration list for PBXNativeTarget "OHMKit-OSX" */; + buildConfigurationList = E7C1C3B01A8E7A6E00ABF294 /* Build configuration list for PBXNativeTarget "OHMKitOSX" */; buildPhases = ( E7C1C3981A8E7A6D00ABF294 /* Sources */, E7C1C3991A8E7A6D00ABF294 /* Frameworks */, @@ -339,7 +339,7 @@ ); dependencies = ( ); - name = "OHMKit-OSX"; + name = OHMKitOSX; productName = "OHMKit-OSX"; productReference = E7C1C39D1A8E7A6D00ABF294 /* OHMKit-OSX.framework */; productType = "com.apple.product-type.framework"; @@ -376,8 +376,8 @@ targets = ( E7AF665917938AD0000EE96C /* OHMKit */, E7AF666917938AD0000EE96C /* OHMKitTests */, - E7C1C37E1A8E7A4500ABF294 /* OHMKit-iOS */, - E7C1C39C1A8E7A6D00ABF294 /* OHMKit-OSX */, + E7C1C37E1A8E7A4500ABF294 /* OHMKitiOS */, + E7C1C39C1A8E7A6D00ABF294 /* OHMKitOSX */, ); }; /* End PBXProject section */ @@ -734,7 +734,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E7C1C3961A8E7A4500ABF294 /* Build configuration list for PBXNativeTarget "OHMKit-iOS" */ = { + E7C1C3961A8E7A4500ABF294 /* Build configuration list for PBXNativeTarget "OHMKitiOS" */ = { isa = XCConfigurationList; buildConfigurations = ( E7C1C3921A8E7A4500ABF294 /* Debug */, @@ -743,7 +743,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E7C1C3B01A8E7A6E00ABF294 /* Build configuration list for PBXNativeTarget "OHMKit-OSX" */ = { + E7C1C3B01A8E7A6E00ABF294 /* Build configuration list for PBXNativeTarget "OHMKitOSX" */ = { isa = XCConfigurationList; buildConfigurations = ( E7C1C3B11A8E7A6E00ABF294 /* Debug */, diff --git a/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-OSX.xcscheme b/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-OSX.xcscheme index 99f1f49..87de99b 100644 --- a/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-OSX.xcscheme +++ b/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-OSX.xcscheme @@ -15,8 +15,8 @@ @@ -57,8 +57,8 @@ @@ -76,8 +76,8 @@ @@ -94,8 +94,8 @@ diff --git a/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-iOS.xcscheme b/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-iOS.xcscheme index f32ecc3..7b85dbf 100644 --- a/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-iOS.xcscheme +++ b/OHMKit.xcodeproj/xcshareddata/xcschemes/OHMKit-iOS.xcscheme @@ -15,8 +15,8 @@ @@ -57,8 +57,8 @@ @@ -76,8 +76,8 @@ @@ -94,8 +94,8 @@