From f8b776e301f8a1c7967b246e93f3a18492396f64 Mon Sep 17 00:00:00 2001 From: Yannick Loriot Date: Tue, 23 Jan 2018 21:45:03 +0100 Subject: [PATCH] Updating the PromiseKit dependency --- AwaitKit.podspec | 2 +- AwaitKit.xcodeproj/project.pbxproj | 6 +++-- Cartfile | 2 +- Example/Example.xcodeproj/project.pbxproj | 19 ++++++++++++--- Example/Example/ViewController.swift | 4 ++-- Example/Podfile | 2 +- Example/Podfile.lock | 28 +++++++++++------------ 7 files changed, 39 insertions(+), 24 deletions(-) diff --git a/AwaitKit.podspec b/AwaitKit.podspec index 9f724a3..31f5ac9 100644 --- a/AwaitKit.podspec +++ b/AwaitKit.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| s.ios.framework = 'Foundation' - s.dependency 'PromiseKit', '~> 4.3' + s.dependency 'PromiseKit', '~> 4.5' s.source_files = 'Sources/**/*.swift' s.requires_arc = true diff --git a/AwaitKit.xcodeproj/project.pbxproj b/AwaitKit.xcodeproj/project.pbxproj index aaac33d..01b9bd2 100644 --- a/AwaitKit.xcodeproj/project.pbxproj +++ b/AwaitKit.xcodeproj/project.pbxproj @@ -114,7 +114,8 @@ FE41FCD51F46D9A700CD2271 /* DispatchQueue+Await.swift */, FE41FCD61F46D9A700CD2271 /* Info.plist */, ); - path = Sources; + name = Sources; + path = Sources/AwaitKit; sourceTree = ""; }; FE41FCD71F46D9A700CD2271 /* Tests */ = { @@ -125,7 +126,8 @@ FE41FCF31F46D9DB00CD2271 /* AwaitKitTests.swift */, FE41FCDC1F46D9A700CD2271 /* Info.plist */, ); - path = Tests; + name = Tests; + path = Tests/AwaitKitTests; sourceTree = ""; }; FE41FCFE1F46DA7800CD2271 /* Products */ = { diff --git a/Cartfile b/Cartfile index aa67f29..425c59c 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "mxcl/PromiseKit" ~> 4.3 +github "mxcl/PromiseKit" ~> 4.5 diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index f015f8d..434c957 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -120,11 +120,12 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0830; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = "Yannick Loriot"; TargetAttributes = { FE41FCBA1F46D7AD00CD2271 = { CreatedOnToolsVersion = 8.3.3; + LastSwiftMigration = 0920; ProvisioningStyle = Automatic; }; }; @@ -258,7 +259,9 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -266,7 +269,11 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -309,7 +316,9 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -317,7 +326,11 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -352,7 +365,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.Example; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -365,7 +378,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.Example; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/Example/Example/ViewController.swift b/Example/Example/ViewController.swift index d6dec0a..d4b4dc3 100644 --- a/Example/Example/ViewController.swift +++ b/Example/Example/ViewController.swift @@ -44,7 +44,7 @@ class ViewController: UIViewController { let queue = DispatchQueue(label: "com.yannickloriot.queue", attributes: .concurrent) queue.asyncAfter(deadline: deadlineTime, execute: { - resolve() + resolve(()) }) } } @@ -56,7 +56,7 @@ class ViewController: UIViewController { let queue = DispatchQueue(label: "com.yannickloriot.queue", attributes: .concurrent) queue.asyncAfter(deadline: deadlineTime, execute: { - resolve() + resolve(()) }) } } diff --git a/Example/Podfile b/Example/Podfile index 210fd05..c310c52 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,7 +1,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! -pod 'PromiseKit', '~> 4.3' +pod 'PromiseKit', '~> 4.5' target 'Example' do platform :ios, '8.0' diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 4c12dd2..5d0c7d3 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,30 +1,30 @@ PODS: - AwaitKit (3.0.2): - - PromiseKit (~> 4.3) - - PromiseKit (4.3.1): - - PromiseKit/Foundation (= 4.3.1) - - PromiseKit/QuartzCore (= 4.3.1) - - PromiseKit/UIKit (= 4.3.1) - - PromiseKit/CorePromise (4.3.1) - - PromiseKit/Foundation (4.3.1): + - PromiseKit (~> 4.5) + - PromiseKit (4.5.1): + - PromiseKit/Foundation (= 4.5.1) + - PromiseKit/QuartzCore (= 4.5.1) + - PromiseKit/UIKit (= 4.5.1) + - PromiseKit/CorePromise (4.5.1) + - PromiseKit/Foundation (4.5.1): - PromiseKit/CorePromise - - PromiseKit/QuartzCore (4.3.1): + - PromiseKit/QuartzCore (4.5.1): - PromiseKit/CorePromise - - PromiseKit/UIKit (4.3.1): + - PromiseKit/UIKit (4.5.1): - PromiseKit/CorePromise DEPENDENCIES: - AwaitKit (from `..`) - - PromiseKit (~> 4.3) + - PromiseKit (~> 4.5) EXTERNAL SOURCES: AwaitKit: :path: .. SPEC CHECKSUMS: - AwaitKit: c32fb03648506f7e6fab6821d3047d24f5fd9c2b - PromiseKit: 25a114b90b932ec8169b5736bd0881fe0efa93b5 + AwaitKit: 9a35748cf3ee8838050109458f06cba1b3b39e64 + PromiseKit: 445dac9b2c3c3b4b31b5f842bc325700b848a8bd -PODFILE CHECKSUM: a5695b2da59c87bd8845c9b62df9f17cf88ca868 +PODFILE CHECKSUM: 3e652443f3aabcc9f24b5b1c0595a710742e6603 -COCOAPODS: 1.3.1 +COCOAPODS: 1.4.0