From cd8e83113e1e1d7e70db3e17348b411d04864e9b Mon Sep 17 00:00:00 2001
From: Nikhil Nigade <nikhil@dezinezync.com>
Date: Fri, 4 Sep 2015 22:37:26 +0530
Subject: [PATCH] latest PromiseKit & OMGHTTPURLRQ

---
 Cartfile                                         |  2 +-
 Cartfile.resolved                                |  4 ++--
 DZNetworking.xcodeproj/project.pbxproj           |  7 ++++++-
 .../xcshareddata/xcschemes/DZNetworking.xcscheme | 13 ++++++++-----
 DZNetworking/Core/DZURLSession.m                 | 16 ++++++++--------
 DZNetworking/Core/DZUploadSession.m              |  2 +-
 DZNetworking/Info.plist                          |  2 +-
 DZNetworkingTests/Info.plist                     |  2 +-
 8 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/Cartfile b/Cartfile
index 1e39756..ea1e0e7 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,2 +1,2 @@
 github "mxcl/PromiseKit" "swift-2.0-beta5"
-github "mxcl/OMGHTTPURLRQ" ~> 2.1.3
+github "mxcl/OMGHTTPURLRQ"
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 6a21978..48b56a1 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "mxcl/OMGHTTPURLRQ" "2.1.3"
-github "mxcl/PromiseKit" "2.1.1"
+github "mxcl/OMGHTTPURLRQ" "3.0.0"
+github "mxcl/PromiseKit" "0881d5c09d7c8bbdb4b3b83151032bd18d27eed9"
diff --git a/DZNetworking.xcodeproj/project.pbxproj b/DZNetworking.xcodeproj/project.pbxproj
index 5ec1601..963f460 100644
--- a/DZNetworking.xcodeproj/project.pbxproj
+++ b/DZNetworking.xcodeproj/project.pbxproj
@@ -276,7 +276,7 @@
 		F0FC8E471B4FB1D300FDA46C /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0640;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Dezine Zync Studios LLP.";
 				TargetAttributes = {
 					F0FC8E4F1B4FB1D300FDA46C = {
@@ -411,6 +411,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -501,6 +502,7 @@
 				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.dezinezync.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 			};
@@ -529,6 +531,7 @@
 					"$(SDKROOT)/usr/lib/system",
 				);
 				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.dezinezync.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 			};
@@ -551,6 +554,7 @@
 				);
 				INFOPLIST_FILE = DZNetworkingTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.dezinezync.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -568,6 +572,7 @@
 				);
 				INFOPLIST_FILE = DZNetworkingTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.dezinezync.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
diff --git a/DZNetworking.xcodeproj/xcshareddata/xcschemes/DZNetworking.xcscheme b/DZNetworking.xcodeproj/xcshareddata/xcschemes/DZNetworking.xcscheme
index fa8364f..dd0ad0f 100644
--- a/DZNetworking.xcodeproj/xcshareddata/xcschemes/DZNetworking.xcscheme
+++ b/DZNetworking.xcodeproj/xcshareddata/xcschemes/DZNetworking.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0640"
+   LastUpgradeVersion = "0700"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +62,18 @@
             ReferencedContainer = "container:DZNetworking.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -85,10 +88,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
diff --git a/DZNetworking/Core/DZURLSession.m b/DZNetworking/Core/DZURLSession.m
index a70535e..bd808d2 100644
--- a/DZNetworking/Core/DZURLSession.m
+++ b/DZNetworking/Core/DZURLSession.m
@@ -113,7 +113,7 @@ - (DZPromise *)POST:(NSString *)URI
             id queryString = OMGFormURLEncode(query);
             if (queryString) url = [url stringByAppendingFormat:@"?%@", queryString];
             
-            NSMutableURLRequest *req = [OMGHTTPURLRQ POST:url :params];
+            NSMutableURLRequest *req = [OMGHTTPURLRQ POST:url :params error:nil];
             
             if(self.requestModifier)
             {
@@ -158,7 +158,7 @@ - (DZPromise *)PUT:(NSString *)URI
             id queryString = OMGFormURLEncode(query);
             if (queryString) url = [url stringByAppendingFormat:@"?%@", queryString];
             
-            NSMutableURLRequest *req = [OMGHTTPURLRQ PUT:url :params];
+            NSMutableURLRequest *req = [OMGHTTPURLRQ PUT:url :params error:nil];
             
             if(self.requestModifier)
             {
@@ -303,7 +303,7 @@ - (DZPromise *)requestWithURI:(NSString *)URI
                        params:(NSDictionary *)params
 {
     
-    return [PMKPromise promiseWithResolverBlock:^(PMKResolver resolve) {
+    return [AnyPromise promiseWithResolverBlock:^(PMKResolver resolve) {
         
         NSString *url = [NSURL URLWithString:URI relativeToURL:self.baseURL].absoluteString;
         
@@ -311,23 +311,23 @@ - (DZPromise *)requestWithURI:(NSString *)URI
         
         if([method isEqualToString:@"GET"])
         {
-            mutableRequest = [OMGHTTPURLRQ GET:url :params];
+            mutableRequest = [OMGHTTPURLRQ GET:url :params error:nil];
         }
         else if([method isEqualToString:@"POST"])
         {
-            mutableRequest = [OMGHTTPURLRQ POST:url :params];
+            mutableRequest = [OMGHTTPURLRQ POST:url :params error:nil];
         }
         else if([method isEqualToString:@"PUT"])
         {
-            mutableRequest = [OMGHTTPURLRQ PUT:url :params];
+            mutableRequest = [OMGHTTPURLRQ PUT:url :params error:nil];
         }
         else if([method isEqualToString:@"DELETE"])
         {
-            mutableRequest = [OMGHTTPURLRQ DELETE:url :params];
+            mutableRequest = [OMGHTTPURLRQ DELETE:url :params error:nil];
         }
         else
         {
-            mutableRequest = [OMGHTTPURLRQ GET:url :params];
+            mutableRequest = [OMGHTTPURLRQ GET:url :params error:nil];
             mutableRequest.HTTPMethod = method;
         }
         
diff --git a/DZNetworking/Core/DZUploadSession.m b/DZNetworking/Core/DZUploadSession.m
index 04c0c4e..3989abc 100644
--- a/DZNetworking/Core/DZUploadSession.m
+++ b/DZNetworking/Core/DZUploadSession.m
@@ -90,7 +90,7 @@ - (DZPromise *)UPLOAD:(NSString *)path
             [processed addParameters:params];
         }
         
-        NSMutableURLRequest *request = [OMGHTTPURLRQ POST:URL :processed];
+        NSMutableURLRequest *request = [OMGHTTPURLRQ POST:URL :processed error:nil];
         
         resolve(request);
         
diff --git a/DZNetworking/Info.plist b/DZNetworking/Info.plist
index 2d9f659..11d7458 100644
--- a/DZNetworking/Info.plist
+++ b/DZNetworking/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.dezinezync.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/DZNetworkingTests/Info.plist b/DZNetworkingTests/Info.plist
index fa38ea6..ba72822 100644
--- a/DZNetworkingTests/Info.plist
+++ b/DZNetworkingTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.dezinezync.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>