Update to swift 5

yannickl · Apr 14, 2019 · 543af9e · 543af9e
1 parent e4c27ed
commit 543af9e
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 21 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+5.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10.1
+osx_image: xcode10.2
 env:
   global:
     - LC_CTYPE=en_US.UTF-8

diff --git a/Carthage/Checkouts/PromiseKit b/Carthage/Checkouts/PromiseKit
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -119,19 +119,19 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Yannick Loriot";
 				TargetAttributes = {
 					FE41FCBA1F46D7AD00CD2271 = {
 						CreatedOnToolsVersion = 8.3.3;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 				};
 			};
 			buildConfigurationList = FE41FCB61F46D7AD00CD2271 /* Build configuration list for PBXProject "Example" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -167,7 +167,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
+				"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AwaitKit/AwaitKit.framework",
 				"${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework",
 			);
@@ -178,7 +178,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		7E7B6F53BC264004F72C9ED7 /* [CP] Check Pods Manifest.lock */ = {
@@ -237,6 +237,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -297,6 +298,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -355,6 +357,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -367,6 +370,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.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?
 
 
-  private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+  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.1):
+  - AwaitKit (5.1.0):
     - PromiseKit (~> 6)
-  - 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 (6.8.4):
+    - PromiseKit/CorePromise (= 6.8.4)
+    - PromiseKit/Foundation (= 6.8.4)
+    - PromiseKit/UIKit (= 6.8.4)
+  - PromiseKit/CorePromise (6.8.4)
+  - PromiseKit/Foundation (6.8.4):
     - PromiseKit/CorePromise
-  - PromiseKit/UIKit (6.7.1):
+  - PromiseKit/UIKit (6.8.4):
     - PromiseKit/CorePromise
 
 DEPENDENCIES:
@@ -23,9 +23,9 @@ EXTERNAL SOURCES:
     :path: ".."
 
 SPEC CHECKSUMS:
-  AwaitKit: 32c213e1892f0320cdf15a72cb071eb187dcf3d0
-  PromiseKit: ef376fb8b4e92edfeb66bd403b983eaa07fbde0c
+  AwaitKit: 09832596d92824d36261a86157c6dd06819bcaab
+  PromiseKit: 51794a832647e7b819336dc2279039ce9f1cc49b
 
 PODFILE CHECKSUM: 78e564670b78aa7f30da04815ee08a7f80131817
 
-COCOAPODS: 1.6.0.beta.1
+COCOAPODS: 1.5.3
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Have you ever dream to write asynchronous code like its synchronous counterpart?
 
 _AwaitKit_ is a powerful Swift library inspired by the [Async/Await specification in ES8 (ECMAScript 2017)](https://github.com/tc39/ecmascript-asyncawait) which provides a powerful way to write asynchronous code in a sequential manner.
 
-Internally it uses [PromiseKit](https://github.com/mxcl/PromiseKit) v6.7 to create and manage promises.
+Internally it uses [PromiseKit](https://github.com/mxcl/PromiseKit) v6.8 to create and manage promises.
 
 <p align="center">
     <a href="#requirements">Requirements</a> • <a href="#getting-started">Getting Started</a> • <a href="#usage">Usage</a> • <a href="#installation">Installation</a> • <a href="#contribution">Contribution</a> • <a href="#contact">Contact</a> • <a href="#license-mit">License</a>
+1 −1		.github/PromiseKit.podspec
+75 −99		.travis.yml
+21 −0		Documentation/Installation.md
+1 −1		Extensions/AddressBook
+1 −1		Extensions/Alamofire
+1 −1		Extensions/CloudKit
+1 −1		Extensions/CoreLocation
+1 −1		Extensions/Foundation
+1 −1		Extensions/MapKit
+1 −1		Extensions/MessagesUI
+1 −1		Extensions/StoreKit
+1 −1		Extensions/UIKit
+3 −0		PromiseKit.xcodeproj/project.pbxproj
+1 −1		PromiseKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+17 −12		README.md
+1 −1		Sources/hang.swift
+51 −21		Tests/A+/XCTestManifests.swift
+91 −37		Tests/CorePromise/XCTestManifests.swift
+2 −2		Tests/LinuxMain.swift