Merge pull request #47 from rursache/master

Fixes for Swift 5.3, Alamofire 5.2.2 - SPM + Carthage

Cartfile

@@ -1,2 +1,2 @@
-github "mxcl/PromiseKit" ~> 6.8.4
-github "Alamofire/Alamofire" ~> 4.0
+github "mxcl/PromiseKit" ~> 6.13.0
+github "Alamofire/Alamofire" ~> 5.2.1

Cartfile.private

@@ -1 +1 @@
-github "AliSoftware/OHHTTPStubs" ~> 7.0
+github "AliSoftware/OHHTTPStubs" ~> 8.0.0

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Alamofire/Alamofire" "4.8.2"
-github "AliSoftware/OHHTTPStubs" "7.0.0"
-github "mxcl/PromiseKit" "6.8.4"
+github "Alamofire/Alamofire" "5.2.1"
+github "AliSoftware/OHHTTPStubs" "8.0.0"
+github "mxcl/PromiseKit" "6.13.1"

PMKAlamofire.xcodeproj/project.pbxproj

@@ -279,15 +279,15 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.promisekit.Foundation;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchsimulator watchos macosx appletvsimulator appletvos";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -342,13 +342,13 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = org.promisekit.Foundation;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchsimulator watchos macosx appletvsimulator appletvos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
@@ -364,6 +364,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
+				CURRENT_PROJECT_VERSION = 1.0.7;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -373,6 +374,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -382,6 +384,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
+				CURRENT_PROJECT_VERSION = 1.0.7;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -390,6 +393,7 @@
 				PRODUCT_MODULE_NAME = "${TARGET_NAME}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

Package.swift

@@ -1,10 +1,24 @@
+// swift-tools-version:5.1
+
 import PackageDescription
 
 let package = Package(
-    name: "PMKAlamofire",
-    dependencies: [
-        .Package(url: "https://github.com/mxcl/PromiseKit.git", majorVersion: 6),
-        .Package(url: "https://github.com/Alamofire/Alamofire.git", majorVersion: 4)
-    ],
-    exclude: ["Tests"]
-)
+        name: "PMKAlamofire",
+        platforms: [.macOS(.v10_12),
+                    .iOS(.v10),
+                    .tvOS(.v10),
+                    .watchOS(.v3)],
+        products: [
+            .library(name: "PMKAlamofire", targets: ["PMKAlamofire"])
+        ],
+        dependencies: [
+            .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.13.2"),
+            .package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.2.2")
+        ],
+        targets: [
+            .target(name: "PMKAlamofire", dependencies: [
+                 .product(name: "PromiseKit"),
+                 .product(name: "Alamofire"),
+            ], path: "Sources")
+        ],
+        swiftLanguageVersions: [.v5])

README.markdown

@@ -2,8 +2,6 @@
 
 This project adds promises to [Alamofire](https://github.com/Alamofire/Alamofire).
 
-This project supports Swift 3.1, 3.2, 4.0 and 4.1.
-
 ## Usage
 
 ```swift