Merge branch 'arnopoulos-master'

Thomvis · Apr 1, 2017 · f18744a · f18744a
2 parents acde809 + 8d8ee75
commit f18744a
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git 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
+  email: true
diff --git 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' => '[email protected]' }
   s.source = { :git => 'https://github.com/Thomvis/BrightFutures.git', :tag => "#{s.version}" }
 
@@ -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/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
 

diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "antitypical/Result" ~> 3.0.0
+github "antitypical/Result" ~> 3.2
diff --git 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
diff --git 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 {

diff --git a/Tests/BrightFuturesTests/BrightFuturesTests.swift b/Tests/BrightFuturesTests/BrightFuturesTests.swift
@@ -863,7 +863,7 @@ extension BrightFuturesTests {
 
     func testUtilsFirstCompleted() {
         let futures: [Future<Int, NoError>] = [
-            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),
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "antitypical/Result" ~> 3.0.0
		github "antitypical/Result" ~> 3.2
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "antitypical/Result" "3.1.0"
		github "antitypical/Result" "3.2.1"
+11 −0		.travis.yml
+1 −2		Result.podspec
+0 −109		Result.xcodeproj/project.pbxproj
+1 −1		Result/Info.plist
+36 −2		Result/Result.swift
+19 −1		Result/ResultProtocol.swift
+1 −1		Tests/ResultTests/Info.plist
+84 −23		Tests/ResultTests/ResultTests.swift