Merge branch 'merge/custom-requestBodyBuilder-for-individual-request'

ishkawa · May 5, 2015 · 4bc001a · 4bc001a
2 parents 4ae948b + c8f1cb6
commit 4bc001a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/APIKit/API.swift b/APIKit/API.swift
@@ -35,7 +35,7 @@ public class API {
     )
 
     // build NSURLRequest
-    public class func URLRequest(method: Method, _ path: String, _ parameters: [String: AnyObject] = [:]) -> NSURLRequest? {
+    public class func URLRequest(method: Method, _ path: String, _ parameters: [String: AnyObject] = [:], requestBodyBuilder: RequestBodyBuilder = requestBodyBuilder) -> NSURLRequest? {
         if let components = NSURLComponents(URL: baseURL, resolvingAgainstBaseURL: true) {
             let request = NSMutableURLRequest()
 

diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "antitypical/Assertions" "19bac03828dcb2f9b9ecb7f829e09bb3900886e5"
 github "LlamaKit/LlamaKit" "v0.6.0"
-github "AliSoftware/OHHTTPStubs" "4.0.0"
+github "AliSoftware/OHHTTPStubs" "4.0.1"
diff --git a/Carthage/Checkouts/OHHTTPStubs b/Carthage/Checkouts/OHHTTPStubs
+4 −0		CHANGELOG.md
+3 −3		Examples/ObjC/Podfile.lock
+4 −4		Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+3 −3		Examples/ObjC/Pods/Manifest.lock
+216 −216		Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj
+1 −1		Examples/ObjC/Pods/Target Support Files/Pods/Pods-environment.h
+3 −3		Examples/Swift/Podfile.lock
+4 −4		Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+3 −3		Examples/Swift/Pods/Manifest.lock
+234 −234		Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj
+1 −1		Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Info.plist
+1 −1		Examples/Swift/Pods/Target Support Files/Pods/Pods-environment.h
+2 −2		Examples/Swift/Pods/Target Support Files/Pods/Pods-frameworks.sh
+1 −1		Examples/Swift/Pods/Target Support Files/Pods/Pods.debug.xcconfig
+1 −1		Examples/Swift/Pods/Target Support Files/Pods/Pods.release.xcconfig
+7 −2		OHHTTPStubs.podspec
+1 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs Mac Framework.xcscheme
+1 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Framework.xcscheme
+1 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS StaticLib.xcscheme
+1 −0		OHHTTPStubs/Podfile
+1 −1		OHHTTPStubs/Podfile.lock
+1 −1		OHHTTPStubs/Pods/Manifest.lock
+498 −498		OHHTTPStubs/Pods/Pods.xcodeproj/project.pbxproj
+18 −12		OHHTTPStubs/Sources/OHHTTPStubs.m
+2 −0		OHHTTPStubs/UnitTests/Test Suites/TimingTests.m