Merge pull request #209 from ishkawa/swiftpm

Support Swift Package Manager

Author: ikesyo

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "Carthage/Checkouts/Result"]
 	path = Carthage/Checkouts/Result
 	url = https://github.com/antitypical/Result.git
-[submodule "Carthage/Checkouts/OHHTTPStubs"]
-	path = Carthage/Checkouts/OHHTTPStubs
-	url = https://github.com/AliSoftware/OHHTTPStubs.git

.travis.yml

@@ -7,21 +7,19 @@ matrix:
     - os: osx
       language: objective-c
       osx_image: xcode8
-      env: JOB=Xcode8
-
-install:
-  - carthage bootstrap --use-submodules --no-build
-  - pod repo update --silent
-
-script:
-  - if [[ "$JOB" == "Xcode7.3" ]]; then pod lib lint; fi
-  - set -o pipefail
-  - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release ENABLE_TESTABILITY=YES | xcpretty -c
-  - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk iphonesimulator -destination "name=iPhone 6s" ENABLE_TESTABILITY=YES | xcpretty -c
-  - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk appletvsimulator -destination "name=Apple TV 1080p" ENABLE_TESTABILITY=YES | xcpretty -c
-
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
+      script:
+        - set -o pipefail
+        - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release ENABLE_TESTABILITY=YES | xcpretty -c
+        - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk iphonesimulator -destination "name=iPhone 6s" ENABLE_TESTABILITY=YES | xcpretty -c
+        - xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk appletvsimulator -destination "name=Apple TV 1080p" ENABLE_TESTABILITY=YES | xcpretty -c
+      after_success:
+        - bash <(curl -s https://codecov.io/bash)
+    - os: osx
+      language: generic
+      osx_image: xcode8
+      script:
+        - swift build
+        - swift test
 
 notifications:
   email: false

APIKit.xcodeproj/project.pbxproj

@@ -1,2 +1 @@
-github "AliSoftware/OHHTTPStubs" "5.2.1-swift3"
 github "antitypical/Result" "3.0.0"

APIKit.xcworkspace/contents.xcworkspacedata

@@ -4,7 +4,7 @@ DYLIB_COMPATIBILITY_VERSION = 1
 DYLIB_CURRENT_VERSION = 1
 DYLIB_INSTALL_NAME_BASE = @rpath
 FRAMEWORK_VERSION = A
-INFOPLIST_FILE = Sources/Info.plist
+INFOPLIST_FILE = Sources/APIKit/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier)
 PRODUCT_NAME = $(PROJECT_NAME)
 SKIP_INSTALL = YES

Cartfile.private

@@ -3,6 +3,7 @@ import PackageDescription
 let package = Package(
     name: "APIKit",
     dependencies: [
-        .Package(url: "https://github.com/antitypical/Result.git", majorVersion: 1),
-    ]
+        .Package(url: "https://github.com/antitypical/Result.git", majorVersion: 3),
+    ],
+    exclude: ["Sources/APIKit/BodyParameters/AbstractInputStream.m"]
 )