Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Swift 5, remove warnings, Xcode 10.2, update PromiseKit, and bump version #43

Merged
merged 1 commit into from
Apr 14, 2019
Merged

Upgrade to Swift 5, remove warnings, Xcode 10.2, update PromiseKit, and bump version #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions AwaitKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,24 +226,24 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0830;
LastUpgradeCheck = 0920;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = "Yannick Loriot";
TargetAttributes = {
FE41FD5C1F46F19F00CD2271 = {
CreatedOnToolsVersion = 8.3.3;
LastSwiftMigration = 0920;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
FEF0141D1E39E12200C4A60B = {
CreatedOnToolsVersion = 8.2.1;
LastSwiftMigration = 0920;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = FEF014181E39E12200C4A60B /* Build configuration list for PBXProject "AwaitKit" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -367,7 +367,7 @@
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
INFOPLIST_FILE = "$(SRCROOT)/Tests/AwaitKitTests/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -378,28 +378,31 @@
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
INFOPLIST_FILE = "$(SRCROOT)/Tests/AwaitKitTests/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
FEF014241E39E12200C4A60B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
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_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -448,20 +451,23 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
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_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -510,7 +516,7 @@
LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -525,7 +531,7 @@
LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
4 changes: 1 addition & 3 deletions AwaitKit.xcodeproj/xcshareddata/xcschemes/AwaitKit.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0920"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,7 +26,6 @@
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
Expand Down Expand Up @@ -56,7 +55,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "mxcl/PromiseKit" ~> 6.7
github "mxcl/PromiseKit" ~> 6.8
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "mxcl/PromiseKit" "6.7.1"
github "mxcl/PromiseKit" "6.8.4"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/PromiseKit
Open in desktop
Submodule PromiseKit updated 40 files
+0 −8 .github/.jazzy.yaml
+3 −0 .github/ISSUE_TEMPLATE.md
+4 −8 .github/PromiseKit.podspec
+18 −0 .github/jazzy.yml
+2 −0 .github/ranger.yml
+17 −0 .github/release
+84 −40 .travis.yml
+2 −2 Documentation/CommonPatterns.md
+102 −0 Documentation/Examples/detweet.swift
+6 −6 Documentation/FAQ.md
+1 −1 Documentation/GettingStarted.md
+20 −16 Documentation/Installation.md
+3 −3 Documentation/ObjectiveC.md
+3 −2 Documentation/README.md
+2 −2 Documentation/Troubleshooting.md
+1 −1 Extensions/Alamofire
+1 −1 Extensions/CloudKit
+1 −1 Extensions/EventKit
+1 −1 Extensions/Foundation
+1 −1 Extensions/StoreKit
+33 −0 Package@swift-5.0.swift
+5 −14 PromiseKit.xcodeproj/project.pbxproj
+35 −12 README.md
+3 −3 Sources/AnyPromise.h
+1 −1 Sources/Box.swift
+5 −5 Sources/Catchable.swift
+2 −0 Sources/Configuration.swift
+2 −2 Sources/Deprecations.swift
+16 −5 Sources/Guarantee.swift
+6 −3 Sources/LogEvent.swift
+14 −5 Sources/Resolver.swift
+2 −2 Sources/after.swift
+4 −0 Sources/hang.swift
+1 −1 Tests/A+/0.0.0.swift
+78 −0 Tests/A+/XCTestManifests.swift
+26 −6 Tests/CorePromise/LoggingTests.swift
+23 −0 Tests/CorePromise/ResolverTests.swift
+3 −3 Tests/CorePromise/WhenResolvedTests.swift
+227 −0 Tests/CorePromise/XCTestManifests.swift
+6 −284 Tests/LinuxMain.swift
4 changes: 2 additions & 2 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/mxcl/PromiseKit.git",
"state": {
"branch": null,
"revision": "61f796319b16f0d4f3a8cd939d8e7f9a74963038",
"version": "4.3.2"
"revision": "d6b3b93bbdb9e6668fdcc3e0b0029e635e7915c9",
"version": "6.8.4"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ let package = Package(
targets: ["AwaitKit"]),
],
dependencies: [
.package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.7.0")
.package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.8.4")
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion Sources/AwaitKit/AwaitKitExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public protocol AwaitKitCompatible {

public extension AwaitKitCompatible {
/// By default the `ak` category returns an Extension object which contains itself.
public var ak: Extension<Self> {
var ak: Extension<Self> {
get { return Extension(self) }
}
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/AwaitKit/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>5.0.1</string>
<string>5.2.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down