Merge pull request #130 from ishkawa/feature/spm-support

Swift Package Manager support

.gitignore

@@ -1,8 +1,12 @@
-### https://raw.github.com/github/gitignore/557c62cd54524fe6f7559cab042d91553bb0755e/Swift.gitignore
-
 # Xcode
 #
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
 build/
+DerivedData/
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -11,20 +15,32 @@ build/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
-*.xccheckout
+xcuserdata/
+
+## Other
 *.moved-aside
-DerivedData
-*.hmap
-*.ipa
 *.xcuserstate
 *.xcscmblueprint
 
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+Packages/
+.build/
+
 # CocoaPods
 #
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
-# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 # Pods/
 
@@ -35,4 +51,12 @@ DerivedData
 
 Carthage/Build
 
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
 
+fastlane/report.xml
+fastlane/screenshots

.swift-version

@@ -0,0 +1 @@
+DEVELOPMENT-SNAPSHOT-2016-03-01-a

.travis.yml

@@ -16,9 +16,9 @@ install:
 script:
   - pod lib lint
   - set -o pipefail
-  - 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.1' | xcpretty -c
   - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit | xcpretty -c
+  - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit -sdk iphonesimulator -destination 'name=iPhone 6,OS=9.1' | xcpretty -c
+  - xcodebuild build -workspace APIKit.xcworkspace -scheme APIKit -sdk appletvsimulator -destination 'name=Apple TV 1080p,OS=9.1' | xcpretty -c
 
 before_deploy:
   - ./script/import-certificates

APIKit.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
     s.tvos.deployment_target = "9.0"
   end
 
-  s.source_files = "APIKit/*.swift"
+  s.source_files = "Sources/*.swift"
   s.source = {
       :git => "https://github.com/ishkawa/APIKit.git",
       :tag => "#{s.version}",

Configurations/APIKit.xcconfig

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

Configurations/Tests.xcconfig

@@ -1,5 +1,5 @@
 COMBINE_HIDPI_IMAGES = YES
-INFOPLIST_FILE = APIKitTests/Info.plist
+INFOPLIST_FILE = Tests/APIKit/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = org.ishkawa.$(PRODUCT_NAME:rfc1034identifier)
 PRODUCT_NAME = $(PROJECT_NAME)Tests
 

Package.swift

@@ -0,0 +1,8 @@
+import PackageDescription
+
+let package = Package(
+    name: "APIKit",
+    dependencies: [
+        .Package(url: "https://github.com/antitypical/Result.git", majorVersion: 1),
+    ]
+)

APIKit/MultipartFormDataSerialization.swift → Sources/MultipartFormDataSerialization.swift

@@ -18,7 +18,7 @@ public final class MultipartFormDataSerialization {
     }
 
     public final class Parameter {
-        private enum Type {
+        private enum `Type` {
             case DataWithMimeType(data: NSData, mimeType: String)
             case DataWithFileNameMimeType(data: NSData, fileName: String, mimeType: String)
             case FileURLWithFileNameMimeType(fileURL: NSURL, fileName: String, mimeType: String)