From 308a97d0abfdb949c9f8315881dc20d645da961f Mon Sep 17 00:00:00 2001 From: Andrew Arnopoulos Date: Tue, 28 Mar 2017 11:34:11 -0600 Subject: [PATCH 1/5] Fixes swift 3.1 compile errors/warnings --- BrightFutures.podspec | 2 +- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/Result | 2 +- Sources/BrightFutures/Async.swift | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BrightFutures.podspec b/BrightFutures.podspec index 2cd9b9e..f330cda 100644 --- a/BrightFutures.podspec +++ b/BrightFutures.podspec @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.source_files = 'Sources/BrightFutures/*.swift' - s.dependency 'Result', '~> 3.0' + s.dependency 'Result', '~> 3.2' s.requires_arc = true diff --git a/Cartfile b/Cartfile index 1313102..3081345 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "antitypical/Result" ~> 3.0.0 +github "antitypical/Result" ~> 3.2.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index 0b44374..de71f93 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "antitypical/Result" "3.1.0" +github "antitypical/Result" "3.2.1" diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result index 2dd1a0c..2af7c14 160000 --- a/Carthage/Checkouts/Result +++ b/Carthage/Checkouts/Result @@ -1 +1 @@ -Subproject commit 2dd1a0c7bca4cc44082f72020fe8b14491056f88 +Subproject commit 2af7c146071c8d8fb3953f19924ecebf15c88ea7 diff --git a/Sources/BrightFutures/Async.swift b/Sources/BrightFutures/Async.swift index 5d9c2ef..a3cd862 100644 --- a/Sources/BrightFutures/Async.swift +++ b/Sources/BrightFutures/Async.swift @@ -143,7 +143,7 @@ extension Async: MutableAsyncType { extension Async: CustomStringConvertible, CustomDebugStringConvertible { public var description: String { - return "Async<\(Value.self)>(\(self.result))" + return "Async<\(Value.self)>(\(String(describing: self.result)))" } public var debugDescription: String { From 6fa6b81aa7afa994c2f1ffc2b7485bb27afd0b9b Mon Sep 17 00:00:00 2001 From: Andrew Arnopoulos Date: Fri, 31 Mar 2017 23:52:10 -0600 Subject: [PATCH 2/5] Fixes xcodebuild errors --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d48167..86e2233 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ osx_image: xcode8 script: - xcodebuild test -workspace BrightFutures.xcworkspace -scheme BrightFutures-Mac - - xcodebuild test -workspace BrightFutures.xcworkspace -scheme BrightFutures-iOS -sdk iphonesimulator - - xcodebuild test -workspace BrightFutures.xcworkspace -scheme BrightFutures-tvOS -sdk appletvsimulator + - xcodebuild test -workspace BrightFutures.xcworkspace -scheme BrightFutures-iOS -sdk iphonesimulator -destination "platform=iOS Simulator,OS=9.0,name=iPhone 6s" + - xcodebuild test -workspace BrightFutures.xcworkspace -scheme BrightFutures-tvOS -sdk appletvsimulator -destination "OS=9.0,name=Apple TV 1080p" - xcodebuild build -workspace BrightFutures.xcworkspace -scheme BrightFutures-watchOS -sdk watchsimulator notifications: - email: true \ No newline at end of file + email: true From a7f24ce4501a7a8bc7e18778db303c69a1f6a7bf Mon Sep 17 00:00:00 2001 From: Andrew Arnopoulos Date: Sat, 1 Apr 2017 01:07:13 -0600 Subject: [PATCH 3/5] Updated testUtilsFirstCompleted to reduce chance of race condition --- Tests/BrightFuturesTests/BrightFuturesTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/BrightFuturesTests/BrightFuturesTests.swift b/Tests/BrightFuturesTests/BrightFuturesTests.swift index 029654b..52f0e35 100644 --- a/Tests/BrightFuturesTests/BrightFuturesTests.swift +++ b/Tests/BrightFuturesTests/BrightFuturesTests.swift @@ -863,7 +863,7 @@ extension BrightFuturesTests { func testUtilsFirstCompleted() { let futures: [Future] = [ - Future(value: 3, delay: 200.milliseconds), + Future(value: 3, delay: 500.milliseconds), Future(value: 13, delay: 300.milliseconds), Future(value: 23, delay: 400.milliseconds), Future(value: 4, delay: 300.milliseconds), From 0953c670266bec6c1dc99f37ceec9a6e563131e7 Mon Sep 17 00:00:00 2001 From: Thomas Visser Date: Sat, 1 Apr 2017 17:44:39 +0200 Subject: [PATCH 4/5] Update Cartfile to require Result ~> 3.2 (consistent with podspec) --- Cartfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile b/Cartfile index 3081345..343e772 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "antitypical/Result" ~> 3.2.1 +github "antitypical/Result" ~> 3.2 From 8d8ee756ddfa6f0a9072b7526979e7d96bff17f6 Mon Sep 17 00:00:00 2001 From: Thomas Visser Date: Sat, 1 Apr 2017 17:44:52 +0200 Subject: [PATCH 5/5] Update changelog & podspec --- BrightFutures.podspec | 4 ++-- CHANGELOG.md | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/BrightFutures.podspec b/BrightFutures.podspec index f330cda..c1ea6c6 100644 --- a/BrightFutures.podspec +++ b/BrightFutures.podspec @@ -1,10 +1,10 @@ Pod::Spec.new do |s| s.name = 'BrightFutures' - s.version = '5.1.0' + s.version = '5.2.0' s.license = 'MIT' s.summary = 'Write great asynchronous code in Swift using futures and promises' s.homepage = 'https://github.com/Thomvis/BrightFutures' - s.social_media_url = 'https://twitter.com/thomvis88' + s.social_media_url = 'https://twitter.com/thomvis' s.authors = { 'Thomas Visser' => 'thomas.visser@gmail.com' } s.source = { :git => 'https://github.com/Thomvis/BrightFutures.git', :tag => "#{s.version}" } diff --git a/CHANGELOG.md b/CHANGELOG.md index e9a1685..0095651 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 5.2.0 +Adds support for Swift 3.1 and Xcode 8.3 + # 5.0.0 Adds support for Swift 3 and Xcode 8