Skip to content

Commit

Permalink
Updating the PromiseKit dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
yannickl committed Jan 23, 2018
1 parent 5c8fa7f commit f8b776e
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 24 deletions.
2 changes: 1 addition & 1 deletion AwaitKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions AwaitKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@
FE41FCD51F46D9A700CD2271 /* DispatchQueue+Await.swift */,
FE41FCD61F46D9A700CD2271 /* Info.plist */,
);
path = Sources;
name = Sources;
path = Sources/AwaitKit;
sourceTree = "<group>";
};
FE41FCD71F46D9A700CD2271 /* Tests */ = {
Expand All @@ -125,7 +126,8 @@
FE41FCF31F46D9DB00CD2271 /* AwaitKitTests.swift */,
FE41FCDC1F46D9A700CD2271 /* Info.plist */,
);
path = Tests;
name = Tests;
path = Tests/AwaitKitTests;
sourceTree = "<group>";
};
FE41FCFE1F46DA7800CD2271 /* Products */ = {
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "mxcl/PromiseKit" ~> 4.3
github "mxcl/PromiseKit" ~> 4.5
19 changes: 16 additions & 3 deletions Example/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
};
Expand Down Expand Up @@ -258,15 +259,21 @@
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;
CLANG_WARN_EMPTY_BODY = YES;
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;
Expand Down Expand Up @@ -309,15 +316,21 @@
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;
CLANG_WARN_EMPTY_BODY = YES;
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;
Expand Down Expand Up @@ -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;
};
Expand All @@ -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;
};
Expand Down
4 changes: 2 additions & 2 deletions Example/Example/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class ViewController: UIViewController {
let queue = DispatchQueue(label: "com.yannickloriot.queue", attributes: .concurrent)

queue.asyncAfter(deadline: deadlineTime, execute: {
resolve()
resolve(())
})
}
}
Expand All @@ -56,7 +56,7 @@ class ViewController: UIViewController {
let queue = DispatchQueue(label: "com.yannickloriot.queue", attributes: .concurrent)

queue.asyncAfter(deadline: deadlineTime, execute: {
resolve()
resolve(())
})
}
}
Expand Down
2 changes: 1 addition & 1 deletion Example/Podfile
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
28 changes: 14 additions & 14 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit f8b776e

Please sign in to comment.