From 8659746df02d8f62a112eda288f4f2f3bab368f1 Mon Sep 17 00:00:00 2001 From: Thomas Visser Date: Sat, 30 Sep 2017 17:56:24 +0200 Subject: [PATCH] Update Result dependency, set version to 6.0.0 --- BrightFutures.podspec | 4 ++-- CHANGELOG.md | 3 +++ Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/Result | 2 +- README.md | 4 +--- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/BrightFutures.podspec b/BrightFutures.podspec index e32a7fb..668da88 100644 --- a/BrightFutures.podspec +++ b/BrightFutures.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'BrightFutures' - s.version = '6.0.0-beta.1' + s.version = '6.0.0' s.license = 'MIT' s.summary = 'Write great asynchronous code in Swift using futures and promises' s.homepage = 'https://github.com/Thomvis/BrightFutures' @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.source_files = 'Sources/BrightFutures/*.swift' - s.dependency 'Result', '~> 3.2' + s.dependency 'Result', '~> 3.2.4' s.requires_arc = true diff --git a/CHANGELOG.md b/CHANGELOG.md index 0095651..68226ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 6.0.0 +Adds support for Swift 4 and Xcode 9 + # 5.2.0 Adds support for Swift 3.1 and Xcode 8.3 diff --git a/Cartfile b/Cartfile index 343e772..945f51b 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "antitypical/Result" ~> 3.2 +github "antitypical/Result" ~> 3.2.4 diff --git a/Cartfile.resolved b/Cartfile.resolved index f543a6f..0b1b3f1 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "antitypical/Result" "3.2.3" +github "antitypical/Result" "3.2.4" diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result index c844618..7477584 160000 --- a/Carthage/Checkouts/Result +++ b/Carthage/Checkouts/Result @@ -1 +1 @@ -Subproject commit c8446185238659a2b27c0261f64ff1254291d07d +Subproject commit 7477584259bfce2560a19e06ad9f71db441fff11 diff --git a/README.md b/README.md index 67fb84b..ca82764 100755 --- a/README.md +++ b/README.md @@ -13,9 +13,7 @@ The stability of BrightFutures has been proven through extensive use in producti ## Latest news [![Join the chat at https://gitter.im/Thomvis/BrightFutures](https://badges.gitter.im/Thomvis/BrightFutures.svg)](https://gitter.im/Thomvis/BrightFutures?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Travis CI build status badge](https://travis-ci.org/Thomvis/BrightFutures.svg?branch=master)](https://travis-ci.org/Thomvis/BrightFutures) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![CocoaPods version](https://img.shields.io/cocoapods/v/BrightFutures.svg)](https://cocoapods.org/pods/BrightFutures) [![CocoaPods](https://img.shields.io/cocoapods/metrics/doc-percent/BrightFutures.svg?maxAge=2592000)](http://cocoadocs.org/docsets/BrightFutures) -BrightFutures 5.0 is now available! This update adds Swift 3 compatibility and contains breaking changes that are in line with the syntax changes between Swift 2 and 3. Please check the [Migration guide](Documentation/Migration_5.0.md) for help on how to migrate your project to BrightFutures 5.0. - -There are plans beyond 5.0 to do a more thorough rewrite in which the approach on error handling will be reevaluated and the Swift 3 API naming guidelines are better applied. +BrightFutures 6.0 is now available! This update adds Swift 4 compatibility and contains breaking changes that are in line with the syntax changes between Swift 3 and 4. ## Installation ### [CocoaPods](http://cocoapods.org/)