5.0.0-alpha4

Author: mxcl

Extensions/Alamofire

@@ -24,11 +24,13 @@
 		631751C01D59768200A9DDDC /* 2.3.2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 631751B41D59768200A9DDDC /* 2.3.2.swift */; };
 		631751C11D59768200A9DDDC /* 2.3.4.swift in Sources */ = {isa = PBXBuildFile; fileRef = 631751B51D59768200A9DDDC /* 2.3.4.swift */; };
 		631F443A1E381B640044C63C /* Sealant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 631F44391E381B640044C63C /* Sealant.swift */; };
-		635D64231D59635300BC0AF5 /* AfterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 635D640E1D59635300BC0AF5 /* AfterTests.swift */; };
-		635D64271D59635300BC0AF5 /* RaceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 635D64121D59635300BC0AF5 /* RaceTests.swift */; };
+		632714CF1E4D08C20043BBB2 /* Fundamentals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 632714CD1E4D082D0043BBB2 /* Fundamentals.swift */; };
 		635D642B1D59635300BC0AF5 /* StressTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 635D64161D59635300BC0AF5 /* StressTests.swift */; };
 		635D642C1D59635300BC0AF5 /* RegressionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 635D64171D59635300BC0AF5 /* RegressionTests.swift */; };
 		635D64301D596E8500BC0AF5 /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63B0AC571D595E1B00FA21D9 /* PromiseKit.framework */; };
+		63611ADE1E4D6CD40031BD6C /* AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 63611ADD1E4D6CD40031BD6C /* AnyPromise.m */; };
+		63611AE01E4D6E280031BD6C /* AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 63611ADF1E4D6E280031BD6C /* AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6375053F1E4E1D3100DE318B /* Features.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6375053D1E4E1C8600DE318B /* Features.swift */; };
 		639F72DD1E38160C00F08DD5 /* firstly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 639F72DC1E38160C00F08DD5 /* firstly.swift */; };
 		63B0AC801D595E6300FA21D9 /* after.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63B0AC621D595E6300FA21D9 /* after.swift */; };
 		63B0AC871D595E6300FA21D9 /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63B0AC691D595E6300FA21D9 /* Error.swift */; };
@@ -57,7 +59,7 @@
 /* Begin PBXFileReference section */
 		49A5584B1DC5172F00E4D01B /* WrapTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WrapTests.swift; path = Tests/CorePromise/WrapTests.swift; sourceTree = "<group>"; };
 		630019221D596292003B4E30 /* PMKCoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PMKCoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		630F217C1E3FE84A00F6DB1E /* Promise+deprecations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+deprecations.swift"; sourceTree = "<group>"; };
+		630F217C1E3FE84A00F6DB1E /* Promise+deprecations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Promise+deprecations.swift"; path = "Sources/Promise+deprecations.swift"; sourceTree = "<group>"; };
 		630F217E1E3FF68A00F6DB1E /* Infrastructure.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Infrastructure.swift; path = Tests/Infrastructure.swift; sourceTree = "<group>"; };
 		631751A81D59766500A9DDDC /* PMKA+Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "PMKA+Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		631751AB1D59768200A9DDDC /* 0.0.0.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = 0.0.0.swift; sourceTree = "<group>"; };
@@ -72,17 +74,19 @@
 		631751B41D59768200A9DDDC /* 2.3.2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = 2.3.2.swift; sourceTree = "<group>"; };
 		631751B51D59768200A9DDDC /* 2.3.4.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = 2.3.4.swift; sourceTree = "<group>"; };
 		631751B61D59768200A9DDDC /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
-		631F44391E381B640044C63C /* Sealant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Sealant.swift; sourceTree = "<group>"; };
+		631F44391E381B640044C63C /* Sealant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Sealant.swift; path = Sources/Sealant.swift; sourceTree = "<group>"; };
+		632714CD1E4D082D0043BBB2 /* Fundamentals.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Fundamentals.swift; path = Tests/CorePromise/Fundamentals.swift; sourceTree = "<group>"; };
 		635893921D5BE4E000F14B55 /* PromiseKit.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = PromiseKit.playground; sourceTree = "<group>"; };
 		635893931D5BE4F900F14B55 /* CHANGELOG.markdown */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.markdown; sourceTree = "<group>"; };
 		635893941D5BE4F900F14B55 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		635893951D5BE4F900F14B55 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
 		635893961D5BE4F900F14B55 /* PromiseKit.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = PromiseKit.podspec; sourceTree = "<group>"; };
 		635893971D5BE4F900F14B55 /* README.markdown */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.markdown; sourceTree = "<group>"; };
-		635D640E1D59635300BC0AF5 /* AfterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AfterTests.swift; path = Tests/CorePromise/AfterTests.swift; sourceTree = "<group>"; };
-		635D64121D59635300BC0AF5 /* RaceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RaceTests.swift; path = Tests/CorePromise/RaceTests.swift; sourceTree = "<group>"; };
 		635D64161D59635300BC0AF5 /* StressTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StressTests.swift; path = Tests/CorePromise/StressTests.swift; sourceTree = "<group>"; };
 		635D64171D59635300BC0AF5 /* RegressionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RegressionTests.swift; path = Tests/CorePromise/RegressionTests.swift; sourceTree = "<group>"; };
+		63611ADD1E4D6CD40031BD6C /* AnyPromise.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AnyPromise.m; path = Sources/AnyPromise.m; sourceTree = "<group>"; };
+		63611ADF1E4D6E280031BD6C /* AnyPromise.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnyPromise.h; path = Sources/AnyPromise.h; sourceTree = "<group>"; };
+		6375053D1E4E1C8600DE318B /* Features.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Features.swift; path = Tests/CorePromise/Features.swift; sourceTree = "<group>"; };
 		639F72DC1E38160C00F08DD5 /* firstly.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = firstly.swift; path = Sources/firstly.swift; sourceTree = "<group>"; };
 		63B0AC571D595E1B00FA21D9 /* PromiseKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PromiseKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		63B0AC621D595E6300FA21D9 /* after.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = after.swift; path = Sources/after.swift; sourceTree = "<group>"; };
@@ -123,11 +127,11 @@
 		6317518A1D59765700A9DDDC /* Core */ = {
 			isa = PBXGroup;
 			children = (
-				635D640E1D59635300BC0AF5 /* AfterTests.swift */,
-				635D64121D59635300BC0AF5 /* RaceTests.swift */,
-				49A5584B1DC5172F00E4D01B /* WrapTests.swift */,
+				6375053D1E4E1C8600DE318B /* Features.swift */,
+				632714CD1E4D082D0043BBB2 /* Fundamentals.swift */,
 				635D64161D59635300BC0AF5 /* StressTests.swift */,
 				635D64171D59635300BC0AF5 /* RegressionTests.swift */,
+				49A5584B1DC5172F00E4D01B /* WrapTests.swift */,
 			);
 			name = Core;
 			sourceTree = "<group>";
@@ -206,6 +210,7 @@
 				63B0AC721D595E6300FA21D9 /* Promise.swift */,
 				631F44391E381B640044C63C /* Sealant.swift */,
 				630F217C1E3FE84A00F6DB1E /* Promise+deprecations.swift */,
+				63611ADD1E4D6CD40031BD6C /* AnyPromise.m */,
 			);
 			name = Sources;
 			sourceTree = "<group>";
@@ -223,6 +228,7 @@
 			isa = PBXGroup;
 			children = (
 				63B0AC761D595E6300FA21D9 /* PromiseKit.h */,
+				63611ADF1E4D6E280031BD6C /* AnyPromise.h */,
 			);
 			name = Headers;
 			sourceTree = "<group>";
@@ -235,6 +241,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				63B0AC931D595E6300FA21D9 /* PromiseKit.h in Headers */,
+				63611AE01E4D6E280031BD6C /* AnyPromise.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -305,7 +312,7 @@
 					};
 					63B0AC561D595E1B00FA21D9 = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0830;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -334,10 +341,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6375053F1E4E1D3100DE318B /* Features.swift in Sources */,
+				632714CF1E4D08C20043BBB2 /* Fundamentals.swift in Sources */,
 				630F21801E3FF68A00F6DB1E /* Infrastructure.swift in Sources */,
-				635D64271D59635300BC0AF5 /* RaceTests.swift in Sources */,
 				635D642B1D59635300BC0AF5 /* StressTests.swift in Sources */,
-				635D64231D59635300BC0AF5 /* AfterTests.swift in Sources */,
 				49A5584D1DC5185900E4D01B /* WrapTests.swift in Sources */,
 				635D642C1D59635300BC0AF5 /* RegressionTests.swift in Sources */,
 			);
@@ -372,6 +379,7 @@
 				631F443A1E381B640044C63C /* Sealant.swift in Sources */,
 				63E79EA51E16F86400D363A8 /* ExecutionContext.swift in Sources */,
 				639F72DD1E38160C00F08DD5 /* firstly.swift in Sources */,
+				63611ADE1E4D6CD40031BD6C /* AnyPromise.m in Sources */,
 				63B0AC871D595E6300FA21D9 /* Error.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -455,7 +463,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = "5.0.0-alpha3";
+				CURRENT_PROJECT_VERSION = "5.0.0-alpha4";
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -504,7 +512,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = "5.0.0-alpha3";
+				CURRENT_PROJECT_VERSION = "5.0.0-alpha4";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -534,6 +542,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_ASSIGN_ENUM = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -568,6 +577,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_PACKAGE_TYPE = FMWK;
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 			};
 			name = Debug;
@@ -576,6 +587,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_ASSIGN_ENUM = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -609,6 +621,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_PACKAGE_TYPE = FMWK;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 			};
 			name = Release;

Extensions/CoreLocation

@@ -0,0 +1,187 @@
+#import <Foundation/Foundation.h>
+#import <PromiseKit/PromiseKit.h>
+
+// exists to ease porting from PMK 4.x
+
+typedef void (^PMKResolver)(id __nullable) NS_REFINED_FOR_SWIFT;
+
+
+#if __has_include("PromiseKit-Swift.h")
+
+    // we define this because PromiseKit-Swift.h imports
+    // PromiseKit.h which then expects this header already
+    // to have been fully imported… !
+    @class AnyPromise;
+
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored"-Wdocumentation"
+    #import "PromiseKit-Swift.h"
+    #pragma clang diagnostic pop
+#else
+    // this hack because `AnyPromise` is Swift, but we add
+    // our own methods via the below category. This hack is
+    // only required while building PromiseKit since, once
+    // built, the generated -Swift header exists.
+
+    __attribute__((objc_subclassing_restricted)) __attribute__((objc_runtime_name("AnyPromise")))
+    @interface AnyPromise : NSObject
+    + (instancetype __nonnull)promiseWithResolverBlock:(void (^ __nonnull)(__nonnull PMKResolver))resolveBlock;
+    @end
+#endif
+
+
+
+@interface AnyPromise (ObjC)
+
+/**
+ The provided block is executed when its receiver is resolved.
+
+ If you provide a block that takes a parameter, the value of the receiver will be passed as that parameter.
+
+    [NSURLSession GET:url].then(^(NSData *data){
+        // do something with data
+    });
+
+ @return A new promise that is resolved with the value returned from the provided block. For example:
+
+    [[NSURLSession shared] dataTaskWithURL:url].then(^(NSData *data){
+        return data.length;
+    }).then(^(NSNumber *number){
+        //…
+    });
+
+ @warning *Important* The block passed to `then` may take zero, one, two or three arguments, and return an object or return nothing. This flexibility is why the method signature for then is `id`, which means you will not get completion for the block parameter, and must type it yourself. It is safe to type any block syntax here, so to start with try just: `^{}`.
+
+ @warning *Important* If an `NSError` or `NSString` is thrown inside your block, or you return an `NSError` object the next `Promise` will be rejected. See `catch` for documentation on error handling.
+
+ @warning *Important* `then` is always executed on the main queue.
+
+ @see thenOn
+ @see thenInBackground
+*/
+- (AnyPromise * __nonnull (^ __nonnull)(id __nonnull))then NS_REFINED_FOR_SWIFT;
+
+/**
+ The provided block is executed on the dispatch queue of your choice when the receiver is fulfilled.
+
+ @see then
+ @see thenInBackground
+*/
+- (AnyPromise * __nonnull(^ __nonnull)(dispatch_queue_t __nonnull, id __nonnull))thenOn NS_REFINED_FOR_SWIFT;
+
+/**
+ The provided block is executed on the default queue when the receiver is fulfilled.
+
+ This method is provided as a convenience for `thenOn`.
+
+ @see then
+ @see thenOn
+*/
+- (AnyPromise * __nonnull(^ __nonnull)(id __nonnull))thenInBackground NS_REFINED_FOR_SWIFT;
+
+#ifndef __cplusplus
+/**
+ The provided block is executed when the receiver is rejected.
+
+ Provide a block of form `^(NSError *){}` or simply `^{}`. The parameter has type `id` to give you the freedom to choose either.
+
+ The provided block always runs on the main queue.
+ 
+ @warning *Note* Cancellation errors are not caught.
+ 
+ @warning *Note* Since catch is a c++ keyword, this method is not availble in Objective-C++ files. Instead use catchWithPolicy.
+
+ @see catchWithPolicy
+*/
+- (AnyPromise * __nonnull(^ __nonnull)(id __nonnull))catch NS_REFINED_FOR_SWIFT;
+#endif
+
+/**
+ The provided block is executed when the receiver is resolved.
+
+ The provided block always runs on the main queue.
+
+ @see alwaysOn
+*/
+- (AnyPromise * __nonnull(^ __nonnull)(dispatch_block_t __nonnull))ensure NS_REFINED_FOR_SWIFT;
+
+/**
+ The provided block is executed on the dispatch queue of your choice when the receiver is resolved.
+
+ @see always
+ */
+- (AnyPromise * __nonnull(^ __nonnull)(dispatch_queue_t __nonnull, dispatch_block_t __nonnull))ensureOn NS_REFINED_FOR_SWIFT;
+
+
+/// @see ensure
+- (AnyPromise * __nonnull(^ __nonnull)(dispatch_block_t __nonnull))finally __attribute__((unavailable("Use ensure")));
+/// @see ensureOn
+- (AnyPromise * __nonnull(^ __nonnull)(dispatch_block_t __nonnull, dispatch_block_t __nonnull))finallyOn __attribute__((unavailable("Use ensureOn")));
+/// @see ensure
+- (AnyPromise * __nonnull(^ __nonnull)(dispatch_block_t __nonnull))always __attribute__((unavailable("Use ensure")));
+/// @see ensureOn
+- (AnyPromise * __nonnull(^ __nonnull)(dispatch_block_t __nonnull, dispatch_block_t __nonnull))alwaysOn __attribute__((unavailable("Use ensureOn")));
+
+@end
+
+
+
+#define PMKJSONDeserializationOptions ((NSJSONReadingOptions)(NSJSONReadingAllowFragments | NSJSONReadingMutableContainers))
+
+
+
+/**
+ Whenever resolving a promise you may resolve with a tuple, eg.
+ returning from a `then` or `catch` handler or resolving a new promise.
+ Consumers of your Promise are not compelled to consume any arguments and
+ in fact will often only consume the first parameter. Thus ensure the
+ order of parameters is: from most-important to least-important.
+ Currently PromiseKit limits you to THREE parameters to the manifold.
+*/
+#define PMKManifold(...) __PMKManifold(__VA_ARGS__, 3, 2, 1)
+#define __PMKManifold(_1, _2, _3, N, ...) __PMKArrayWithCount(N, _1, _2, _3)
+extern id __nonnull __PMKArrayWithCount(NSUInteger, ...);
+
+
+
+extern NSString * __nonnull const PMKErrorDomain;
+
+#define PMKUnexpectedError 1l
+#define PMKInvalidUsageError 3l
+#define PMKAccessDeniedError 4l
+#define PMKOperationCancelled 5l
+#define PMKOperationFailed 8l
+#define PMKTaskError 9l
+#define PMKJoinError 10l
+
+
+
+/**
+ Really we shouldn’t assume JSON for (application|text)/(x-)javascript,
+ really we should return a String of Javascript. However in practice
+ for the apps we write it *will be* JSON. Thus if you actually want
+ a Javascript String, use the promise variant of our category functions.
+*/
+#define PMKHTTPURLResponseIsJSON(rsp) [@[@"application/json", @"text/json", @"text/javascript", @"application/x-javascript", @"application/javascript"] containsObject:[rsp MIMEType]]
+#define PMKHTTPURLResponseIsImage(rsp) [@[@"image/tiff", @"image/jpeg", @"image/gif", @"image/png", @"image/ico", @"image/x-icon", @"image/bmp", @"image/x-bmp", @"image/x-xbitmap", @"image/x-win-bitmap"] containsObject:[rsp MIMEType]]
+#define PMKHTTPURLResponseIsText(rsp) [[rsp MIMEType] hasPrefix:@"text/"]
+
+
+
+#if __cplusplus
+extern "C" {
+#endif
+
+/**
+ @return A new promise that resolves after the specified duration.
+ @parameter duration The duration in seconds to wait before this promise is resolve.
+ For example:
+    PMKAfter(1).then(^{
+        //…
+    });
+*/
+extern AnyPromise * __nonnull PMKAfter(NSTimeInterval duration) NS_REFINED_FOR_SWIFT;
+
+#if __cplusplus
+}
+#endif