Merge branch 'master' into carthage-support

Author: darkcl

Carthage/Checkouts/PromiseKit/Categories/Foundation/NSURLConnection+AnyPromise.m

@@ -10,6 +10,7 @@
 #import <Foundation/NSURLResponse.h>
 #import "NSURLConnection+AnyPromise.h"
 #import <PromiseKit/PromiseKit.h>
+// When using Carthage add `github "mxcl/OMGHTTPURLRQ"` to your Cartfile.
 #import <OMGHTTPURLRQ/OMGHTTPURLRQ.h>
 #import <OMGHTTPURLRQ/OMGUserAgent.h>
 

Carthage/Checkouts/PromiseKit/Categories/UIKit/UIViewController+AnyPromise.m

@@ -13,9 +13,8 @@ + (instancetype)delegateWithPromise:(AnyPromise **)promise;
 
 @implementation UIViewController (PromiseKit)
 
-- (AnyPromise *)promiseViewController:(UIViewController *)vc animated:(BOOL)animated completion:(void (^)(void))block
-{
-    id vc2present = vc;
+- (AnyPromise *)promiseViewController:(UIViewController *)vc animated:(BOOL)animated completion:(void (^)(void))block {
+    __kindof UIViewController *vc2present = vc;
     AnyPromise *promise = nil;
 
     if ([vc isKindOfClass:NSClassFromString(@"MFMailComposeViewController")]) {
@@ -72,8 +71,7 @@ - (AnyPromise *)promiseViewController:(UIViewController *)vc animated:(BOOL)anim
     [self presentViewController:vc2present animated:animated completion:block];
 
     promise.finally(^{
-        //TODO can we be more specific?
-        [self dismissViewControllerAnimated:animated completion:nil];
+        [vc2present.presentingViewController dismissViewControllerAnimated:animated completion:nil];
     });
 
     return promise;

Carthage/Checkouts/PromiseKit/README.markdown

@@ -18,13 +18,36 @@ when(fetchImage(), getLocation()).then { image, location in
 PromiseKit is a thoughtful and complete implementation of promises for iOS and OS X with first-class support for **both** Objective-C *and* Swift.
 
 [![Join the chat at https://gitter.im/mxcl/PromiseKit](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mxcl/PromiseKit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ![](https://img.shields.io/cocoapods/v/PromiseKit.svg?label=Current%20Release)  [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg)](https://github.com/Carthage/Carthage)
-
+[![codebeat](https://codebeat.co/badges/6a2fc7b4-cc8f-4865-a81d-644edd38c662)](https://codebeat.co/projects/github-com-mxcl-promisekit)
 
 # Swift 2
 
+
 The `swift-2.0-beta` branch has a working Swift 2 implementation. Please be aware that both `catch` and `defer` are Swift 2 keywords so we have had to rename these functions and our new choices are not yet final.
 
 
+If you are writing a library, [**use PromiseKit 1.x**](https://github.com/mxcl/PromiseKit/tree/legacy-1.x). This is because PromiseKit > 2 breaks everytime Swift changes. While Swift is in flux it is not feasible to depend on a library that will break every time Xcode updates.
+
+If you are making an app then PromiseKit 3 is the best PromiseKit, you may have to make some fixes when Xcode updates, but probably you will be OK as long as you update PromiseKit when Xcode updates.
+
+PromiseKit 1 and 3 can be installed in parallel if necessary, but CocoaPods will not support this.
+
+Once Swift becomes ABI or API stable we can all just move to the latest PromiseKit.
+
+Thus we intend to support PromiseKit 1.x for longer than expected.
+
+
+# PromiseKit 3
+
+In Swift 2.0 `catch` and `defer` became reserved keywords mandating we rename our functions with these names. This forced a major semantic version change on PromiseKit and thus we took the opportunity to make other minor (source compatability breaking) improvements.
+
+Thus if you cannot afford to adapt to PromiseKit 3 but still want to use Xcode-7.0/Swift-2.0 we provide a [minimal changes branch] \(Swift 2.2 version [here](https://github.com/mxcl/PromiseKit/tree/swift-2.2-minimal-changes)\) where `catch` and `defer` are renamed `catch_` and `defer_` and all other changes are the bare minimum to make PromiseKit 2 compile against Swift 2.
+
+If you still are using Xcode 6 and Swift 1.2 then use PromiseKit 2.
+
+[minimal changes branch]: https://github.com/mxcl/PromiseKit/tree/swift-2.0-minimal-changes
+>>>>>>> master:Example/Pods/PromiseKit/README.markdown
+
 # PromiseKit 2
 
 PromiseKit 2 contains many interesting and important additions. Check out our our [release announcement](http://promisekit.org/PromiseKit-2.0-Released/) for full details.
@@ -61,13 +84,18 @@ github "mxcl/PromiseKit" ~> 2.0
 
 Neither CocoaPods or Carthage will install PromiseKit 2 for an iOS 7 target. Your options are:
 
- 1. `pod "PromiseKit", "~> 1.5"` †‡
+ 1. `pod "PromiseKit", "~> 1.7"` †‡
  2. Use our [iOS 7 EZ-Bake](https://github.com/PromiseKit/EZiOS7)
  3. Download our pre-built static framework (coming soon!)
 
 † There is no Swift support with PromiseKit 1.x installed via CocoaPods.<br>‡ PromiseKit 1.x will work as far back as iOS 5 if required.
 
 
+# Support
+
+PromiseKit is lucky enough to have a large community behind it which is reflected in our [Gitter chat](https://gitter.im/mxcl/PromiseKit). If you're new to PromiseKit and are stumped or otherwise have a question that doesn't feel like an issue (and isn't answered in our [documentation](http://promisekit.org/introduction)) then our Gitter is a great place to go for help. Of course if you're onto something that you believe is broken or could be improved then opening a new issue is still the way to go 👍.
+
+
 # Donations
 
 PromiseKit is hundreds of hours of work almost completely by just me: [Max Howell](https://twitter.com/mxcl). I thoroughly enjoyed making PromiseKit, but nevertheless if you have found it useful then your bitcoin will give me a warm fuzzy feeling from my head right down to my toes: 1JDbV5zuym3jFw4kBCc5Z758maUD8e4dKR.

Carthage/Checkouts/PromiseKit/Sources/AnyPromise.h

@@ -10,6 +10,12 @@ typedef NS_ENUM(NSInteger, PMKCatchPolicy) {
     PMKCatchPolicyAllErrorsExceptCancellation
 };
 
+/**
+ This block lets you override the default dispatch queue for Promises.
+ 
+ By default this returns dispatch_get_main_queue()
+ */
+extern __nonnull dispatch_queue_t (^__nonnull PMKDefaultDispatchQueue)();
 
 /**
  @see AnyPromise.swift

Carthage/Checkouts/PromiseKit/Sources/PromiseKit.h

@@ -1,4 +1,8 @@
-#import <dispatch/queue.h>
+#if defined(__cplusplus)
+  #import <dispatch/dispatch.h>
+#else
+  #import <dispatch/queue.h>
+#endif
 #import <Foundation/NSDate.h>
 #import <Foundation/NSObject.h>
 #import <PromiseKit/AnyPromise.h>

README.md

@@ -29,6 +29,9 @@ PokemonKit.fetchBerry("1")
 - [x] Wrap all API end points
 - [x] Fully [Documented](http://continuouslearning.github.io/PokemonKit/)
 - [ ] Fully tested
+- [ ] Carthage Support
+- [ ] Unit test don't call server
+- [ ] Remove PromiseKit (So many build errors, not worth it)
 
 ## Installation