Merge pull request #91 from ikesyo/osx-target

Add OS X target
tristanhimmelman · Mar 23, 2015 · d058e09 · d058e09
2 parents b436a04 + fe52294
commit d058e09
Show file tree

Hide file tree

Showing 10 changed files with 399 additions and 38 deletions.
diff --git 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
diff --git a/ObjectMapper.xcodeproj/project.pbxproj b/ObjectMapper.xcodeproj/project.pbxproj
diff --git a/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac.xcscheme b/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac.xcscheme
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0620"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CD1602FE1AC023D5000CD69A"
+               BuildableName = "ObjectMapper.framework"
+               BlueprintName = "ObjectMapper-Mac"
+               ReferencedContainer = "container:ObjectMapper.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CD1603081AC023D6000CD69A"
+               BuildableName = "ObjectMapper-MacTests.xctest"
+               BlueprintName = "ObjectMapper-MacTests"
+               ReferencedContainer = "container:ObjectMapper.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CD1603081AC023D6000CD69A"
+               BuildableName = "ObjectMapper-MacTests.xctest"
+               BlueprintName = "ObjectMapper-MacTests"
+               ReferencedContainer = "container:ObjectMapper.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CD1602FE1AC023D5000CD69A"
+            BuildableName = "ObjectMapper.framework"
+            BlueprintName = "ObjectMapper-Mac"
+            ReferencedContainer = "container:ObjectMapper.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CD1602FE1AC023D5000CD69A"
+            BuildableName = "ObjectMapper.framework"
+            BlueprintName = "ObjectMapper-Mac"
+            ReferencedContainer = "container:ObjectMapper.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CD1602FE1AC023D5000CD69A"
+            BuildableName = "ObjectMapper.framework"
+            BlueprintName = "ObjectMapper-Mac"
+            ReferencedContainer = "container:ObjectMapper.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/...hareddata/xcschemes/ObjectMapper.xcscheme → ...ddata/xcschemes/ObjectMapper-iOS.xcscheme b/...hareddata/xcschemes/ObjectMapper.xcscheme → ...ddata/xcschemes/ObjectMapper-iOS.xcscheme
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "6AAC8F7519F03C2900E7A677"
                BuildableName = "ObjectMapper.framework"
-               BlueprintName = "ObjectMapper"
+               BlueprintName = "ObjectMapper-iOS"
                ReferencedContainer = "container:ObjectMapper.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -29,8 +29,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "6AAC8F8019F03C2900E7A677"
-               BuildableName = "ObjectMapperTests.xctest"
-               BlueprintName = "ObjectMapperTests"
+               BuildableName = "ObjectMapper-iOSTests.xctest"
+               BlueprintName = "ObjectMapper-iOSTests"
                ReferencedContainer = "container:ObjectMapper.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -47,8 +47,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "6AAC8F8019F03C2900E7A677"
-               BuildableName = "ObjectMapperTests.xctest"
-               BlueprintName = "ObjectMapperTests"
+               BuildableName = "ObjectMapper-iOSTests.xctest"
+               BlueprintName = "ObjectMapper-iOSTests"
                ReferencedContainer = "container:ObjectMapper.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -58,7 +58,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "6AAC8F7519F03C2900E7A677"
             BuildableName = "ObjectMapper.framework"
-            BlueprintName = "ObjectMapper"
+            BlueprintName = "ObjectMapper-iOS"
             ReferencedContainer = "container:ObjectMapper.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -77,7 +77,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "6AAC8F7519F03C2900E7A677"
             BuildableName = "ObjectMapper.framework"
-            BlueprintName = "ObjectMapper"
+            BlueprintName = "ObjectMapper-iOS"
             ReferencedContainer = "container:ObjectMapper.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -95,7 +95,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "6AAC8F7519F03C2900E7A677"
             BuildableName = "ObjectMapper.framework"
-            BlueprintName = "ObjectMapper"
+            BlueprintName = "ObjectMapper-iOS"
             ReferencedContainer = "container:ObjectMapper.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/ObjectMapper/ObjectMapper.h b/ObjectMapper/ObjectMapper.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 hearst. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
 
 //! Project version number for ObjectMapper.
 FOUNDATION_EXPORT double ObjectMapperVersionNumber;

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 hearst. All rights reserved.
 //
 
-import UIKit
+import Foundation
 import XCTest
 import ObjectMapper