Updating the exxample project to Swift v4.2 and upgrade the PromiseKi…

…t version
yannickl · Jan 17, 2019 · 50bbdb4 · 50bbdb4
1 parent 55e4bf8
commit 50bbdb4
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0
+4.0
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "mxcl/PromiseKit" ~> 6.4
+github "mxcl/PromiseKit" ~> 6.7
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "mxcl/PromiseKit" "6.4.0"
+github "mxcl/PromiseKit" "6.7.1"
diff --git a/Carthage/Checkouts/PromiseKit b/Carthage/Checkouts/PromiseKit
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -288,6 +288,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -339,6 +340,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -353,7 +355,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -366,7 +367,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/Example/Example/AppDelegate.swift b/Example/Example/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
   var window: UIWindow?
 
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+  private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
     // Override point for customization after application launch.
     return true
   }

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,14 +1,14 @@
 PODS:
-  - AwaitKit (5.0.0):
+  - AwaitKit (5.0.1):
     - PromiseKit (~> 6)
-  - PromiseKit (6.4.0):
-    - PromiseKit/CorePromise (= 6.4.0)
-    - PromiseKit/Foundation (= 6.4.0)
-    - PromiseKit/UIKit (= 6.4.0)
-  - PromiseKit/CorePromise (6.4.0)
-  - PromiseKit/Foundation (6.4.0):
+  - PromiseKit (6.7.1):
+    - PromiseKit/CorePromise (= 6.7.1)
+    - PromiseKit/Foundation (= 6.7.1)
+    - PromiseKit/UIKit (= 6.7.1)
+  - PromiseKit/CorePromise (6.7.1)
+  - PromiseKit/Foundation (6.7.1):
     - PromiseKit/CorePromise
-  - PromiseKit/UIKit (6.4.0):
+  - PromiseKit/UIKit (6.7.1):
     - PromiseKit/CorePromise
 
 DEPENDENCIES:
@@ -23,8 +23,8 @@ EXTERNAL SOURCES:
     :path: ".."
 
 SPEC CHECKSUMS:
-  AwaitKit: 28fbbc5e72cad6e1ddb4eb4ec738af81e03ddeb7
-  PromiseKit: ae3616f45d7bb9bf4ff1e91abc9b7a8c48a340e0
+  AwaitKit: 32c213e1892f0320cdf15a72cb071eb187dcf3d0
+  PromiseKit: ef376fb8b4e92edfeb66bd403b983eaa07fbde0c
 
 PODFILE CHECKSUM: 78e564670b78aa7f30da04815ee08a7f80131817
 

diff --git a/Package.swift b/Package.swift
@@ -36,7 +36,7 @@ let package = Package(
       targets: ["AwaitKit"]),
   ],
   dependencies: [
-    .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.4.0")
+    .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6")
   ],
   targets: [
     .target(
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "mxcl/PromiseKit" ~> 6.4
		github "mxcl/PromiseKit" ~> 6.7
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "mxcl/PromiseKit" "6.4.0"
		github "mxcl/PromiseKit" "6.7.1"
+12 −1		.github/PromiseKit.podspec
+5 −5		.github/codecov.yml
+1 −1		.gitignore
+3 −0		.gitmodules
+171 −79		.travis.yml
+15 −3		Documentation/CommonPatterns.md
+2 −2		Documentation/Examples/ImageCache.md
+13 −0		Documentation/FAQ.md
+34 −2		Documentation/GettingStarted.md
+18 −7		Documentation/Installation.md
+51 −33		Documentation/ObjectiveC.md
+41 −2		Documentation/Troubleshooting.md
+1 −1		Extensions/AVFoundation
+1 −1		Extensions/Accounts
+1 −1		Extensions/AddressBook
+1 −1		Extensions/Alamofire
+1 −1		Extensions/CloudKit
+1 −1		Extensions/CoreLocation
+1 −1		Extensions/Foundation
+1 −0		Extensions/HealthKit
+1 −1		Extensions/HomeKit
+1 −1		Extensions/MapKit
+1 −1		Extensions/QuartzCore
+1 −1		Extensions/StoreKit
+1 −1		Extensions/SystemConfiguration
+1 −1		Extensions/UIKit
+30 −0		Package@swift-4.2.swift
+10 −6		PromiseKit.xcodeproj/project.pbxproj
+9 −1		README.md
+3 −3		Sources/Box.swift
+1 −1		Sources/Catchable.swift
+21 −1		Sources/Configuration.swift
+5 −0		Sources/Error.swift
+2 −2		Sources/Guarantee.swift
+27 −0		Sources/LogEvent.swift
+2 −2		Sources/Promise.swift
+8 −3		Sources/Resolver.swift
+4 −5		Sources/when.swift
+1 −1		Tests/A+/0.0.0.swift
+11 −2		Tests/CoreObjC/AnyPromiseTests.m
+179 −0		Tests/CorePromise/LoggingTests.swift
+3 −3		Tests/CorePromise/WhenResolvedTests.swift
+7 −3		Tests/JS-A+/AllTests.swift
+12 −0		Tests/JS-A+/MockNodeEnvironment.swift
+0 −1,848		Tests/JS-A+/build/build.js
+3,174 −448		Tests/JS-A+/package-lock.json
+3 −0		Tests/JS-A+/webpack.config.js