Merge pull request #111 from ishkawa/feature/unified-target

Update Result.framework and set deployment target watchOS 2.0 and tvOS 9.0 explicitly.

.travis.yml

@@ -15,8 +15,9 @@ script:
   - pod repo update
   - pod spec lint APIKit.podspec
   - set -o pipefail
-  - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit-iOS -sdk iphonesimulator | xcpretty -c
-  - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit-Mac | xcpretty -c
+  - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit -sdk iphonesimulator -destination 'name=iPhone 6,OS=9.1' | xcpretty -c
+  - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit -sdk appletvsimulator -destination 'name=Apple TV 1080p,OS=9.0' | xcpretty -c
+  - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit | xcpretty -c
 
 before_deploy:
   - ./script/import-certificates

APIKit.podspec

@@ -10,6 +10,12 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.9"
+  if s.respond_to?(:watchos)
+    s.watchos.deployment_target = "2.1"
+  end
+  if s.respond_to?(:tvos)
+    s.tvos.deployment_target = "9.0"
+  end
 
   s.source_files = "APIKit/*.swift"
   s.source = {

APIKit.xcodeproj/xcshareddata/xcschemes/APIKit-iOS.xcscheme → APIKit.xcodeproj/xcshareddata/xcschemes/APIKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,9 +14,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7F45FCDC1A94D02C006863BB"
+               BlueprintIdentifier = "141F12161C1C9ABE0026D415"
                BuildableName = "APIKit.framework"
-               BlueprintName = "APIKit-iOS"
+               BlueprintName = "APIKit"
                ReferencedContainer = "container:APIKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -28,9 +28,9 @@
             buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7FEC5A131A96FE2600B1D3C0"
+               BlueprintIdentifier = "141F12281C1C9AC70026D415"
                BuildableName = "APIKitTests.xctest"
-               BlueprintName = "APIKitTests-iOS"
+               BlueprintName = "Tests"
                ReferencedContainer = "container:APIKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -40,26 +40,25 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7FEC5A131A96FE2600B1D3C0"
+               BlueprintIdentifier = "141F12281C1C9AC70026D415"
                BuildableName = "APIKitTests.xctest"
-               BlueprintName = "APIKitTests-iOS"
+               BlueprintName = "Tests"
                ReferencedContainer = "container:APIKit.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7F45FCDC1A94D02C006863BB"
+            BlueprintIdentifier = "141F12161C1C9ABE0026D415"
             BuildableName = "APIKit.framework"
-            BlueprintName = "APIKit-iOS"
+            BlueprintName = "APIKit"
             ReferencedContainer = "container:APIKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -79,9 +78,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7F45FCDC1A94D02C006863BB"
+            BlueprintIdentifier = "141F12161C1C9ABE0026D415"
             BuildableName = "APIKit.framework"
-            BlueprintName = "APIKit-iOS"
+            BlueprintName = "APIKit"
             ReferencedContainer = "container:APIKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -97,9 +96,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7F45FCDC1A94D02C006863BB"
+            BlueprintIdentifier = "141F12161C1C9ABE0026D415"
             BuildableName = "APIKit.framework"
-            BlueprintName = "APIKit-iOS"
+            BlueprintName = "APIKit"
             ReferencedContainer = "container:APIKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

Cartfile

@@ -1 +1 @@
-github "antitypical/Result" ~> 1.0.0
+github "antitypical/Result" ~> 1.0.1

Cartfile.private

@@ -1 +1 @@
-github "AliSoftware/OHHTTPStubs" ~> 4.3.0
+github "AliSoftware/OHHTTPStubs" ~> 4.6.0

Cartfile.resolved

@@ -1,2 +1,2 @@
 github "AliSoftware/OHHTTPStubs" "4.6.0"
-github "antitypical/Result" "1.0.0"
+github "antitypical/Result" "1.0.1"

Configurations/APIKit.xcconfig

@@ -0,0 +1,22 @@
+COMBINE_HIDPI_IMAGES = YES
+DEFINES_MODULE = YES
+DYLIB_COMPATIBILITY_VERSION = 1
+DYLIB_CURRENT_VERSION = 1
+DYLIB_INSTALL_NAME_BASE = @rpath
+FRAMEWORK_VERSION = A
+INFOPLIST_FILE = APIKit/Info.plist
+PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier)
+PRODUCT_NAME = $(PROJECT_NAME)
+SKIP_INSTALL = YES
+
+SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator watchos watchsimulator appletvos appletvsimulator
+TARGETED_DEVICE_FAMILY = 1,2,3,4
+
+ENABLE_BITCODE[sdk=iphone*] = YES;
+ENABLE_BITCODE[sdk=watch*] = YES;
+ENABLE_BITCODE[sdk=appletv*] = YES;
+
+LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks

Configurations/Base.xcconfig

@@ -0,0 +1,31 @@
+ALWAYS_SEARCH_USER_PATHS = NO
+CLANG_CXX_LANGUAGE_STANDARD = gnu++0x
+CLANG_CXX_LIBRARY = libc++
+CLANG_ENABLE_MODULES = YES
+CLANG_ENABLE_OBJC_ARC = YES
+CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
+CLANG_WARN_BOOL_CONVERSION = YES
+CLANG_WARN_CONSTANT_CONVERSION = YES
+CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR
+CLANG_WARN_EMPTY_BODY = YES
+CLANG_WARN_ENUM_CONVERSION = YES
+CLANG_WARN_INT_CONVERSION = YES
+CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR
+CLANG_WARN_UNREACHABLE_CODE = YES
+CURRENT_PROJECT_VERSION = 1
+ENABLE_STRICT_OBJC_MSGSEND = YES
+GCC_C_LANGUAGE_STANDARD = gnu99
+GCC_WARN_64_TO_32_BIT_CONVERSION = YES
+GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR
+GCC_WARN_UNDECLARED_SELECTOR = YES
+GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE
+GCC_WARN_UNUSED_FUNCTION = YES
+GCC_WARN_UNUSED_VARIABLE = YES
+VERSION_INFO_PREFIX = 
+VERSIONING_SYSTEM = apple-generic
+
+CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer
+MACOSX_DEPLOYMENT_TARGET = 10.9
+IPHONEOS_DEPLOYMENT_TARGET = 8.0
+WATCHOS_DEPLOYMENT_TARGET = 2.0
+TVOS_DEPLOYMENT_TARGET = 9.0

Configurations/Debug.xcconfig

@@ -0,0 +1,11 @@
+#include "Base.xcconfig"
+
+COPY_PHASE_STRIP = NO
+ENABLE_TESTABILITY = YES
+GCC_DYNAMIC_NO_PIC = NO
+GCC_OPTIMIZATION_LEVEL = 0
+GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited)
+GCC_SYMBOLS_PRIVATE_EXTERN = NO
+MTL_ENABLE_DEBUG_INFO = YES
+ONLY_ACTIVE_ARCH = YES
+SWIFT_OPTIMIZATION_LEVEL = -Onone

Configurations/Release.xcconfig

@@ -0,0 +1,7 @@
+#include "Base.xcconfig"
+
+COPY_PHASE_STRIP = YES
+ENABLE_NS_ASSERTIONS = NO
+MTL_ENABLE_DEBUG_INFO = NO
+VALIDATE_PRODUCT = YES
+DEBUG_INFORMATION_FORMAT = dwarf-with-dsym

Configurations/Tests.xcconfig

@@ -0,0 +1,10 @@
+COMBINE_HIDPI_IMAGES = YES
+INFOPLIST_FILE = APIKitTests/Info.plist
+PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier)
+PRODUCT_NAME = $(PROJECT_NAME)Tests
+
+SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator appletvos appletvsimulator
+
+LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks

README.md

@@ -28,8 +28,10 @@ Session.sendRequest(request) { result in
 ## Requirements
 
 - Swift 2.1
-- iOS 8.0 or later
 - Mac OS 10.9 or later
+- iOS 8.0 or later
+- watchOS 2.0 or later
+- tvOS 9.0 or later
 
 ## Installation