Merge branch 'master' into development

buildc0de · Apr 18, 2016 · 1f241f6 · 1f241f6
2 parents e202af7 + 1a2302f
commit 1f241f6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,25 @@
+# 2.9.1
+
+1. [[OPR-282](https://github.com/danthorpe/Operations/pull/282)]: Fixes a bug accessing `PHPhotoLibrary` through `Capability.Photos`.
+2. [[OPR-285](https://github.com/danthorpe/Operations/pull/285)]: Removes CloudKit files from the watchOS target.
+
+This is a patch release to get these fixes released.
+
 # 2.9.0
+
 1. [[OPR-241](https://github.com/danthorpe/Operations/pull/241)]: Makes change for Xcode 7.3 and Swift 2.2.
 2. [[OPR-251](https://github.com/danthorpe/Operations/pull/252)]: Refactors how Capabilities work with their generic registrars.
 
 Got there in the end! Thanks everyone for helping out during the change to Swift 2.2 - by the time Swift 3.0 comes around, I’ll hopefully have a fully automated CI system in place for switching up toolchains/build.
 
 # 2.8.2
+
 1. [[OPR-250](https://github.com/danthorpe/Operations/pull/250)]: Thanks to [@felix-dumit](https://github.com/felix-dumit) for making the cancellation of `GroupOperation` more sensible and consistent. Essentially now the group will cancel after all of its children have cancelled.
 
 This should be the last bug release before v2.9.0 and Swift 2.2 is released.
 
+Also, before v2.10 is released, if you happen to use Operations framework in your app or team, and would agree to having a logo displayed in the README - please [get in touch](https://github.com/danthorpe/Operations/issues/new)!
+
 # 2.8.1
 
 1. [[OPR-245](https://github.com/danthorpe/Operations/pull/247)]: Thanks to [@difujia](https://github.com/difujia) for spotting and fixing a really clear retain cycle in `ComposedOperation`. Good tip - is to remember that an operation will retain its observers, meaning that if an operation owns another operation, *and* acts as its observer, then it will create a retain cycle. The easy fix is to use block based observers, with a capture list of `[unowned self]`.

diff --git a/Operations.podspec b/Operations.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = "Operations"
-  s.version           = "2.9.0"
+  s.version           = "2.9.1"
   s.summary           = "Powerful NSOperation subclasses in Swift."
   s.description       = <<-DESC
   

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ A Swift framework inspired by WWDC 2015 Advanced NSOperations session.
 Resource | Where to find it
 ---------|-----------------
 Session video | [developer.apple.com](https://developer.apple.com/videos/wwdc/2015/?id=226)
-Reference documentation | [docs.danthorpe.me/operations](http://docs.danthorpe.me/operations/2.8.0/index.html)
+Reference documentation | [docs.danthorpe.me/operations](http://docs.danthorpe.me/operations/2.9.0/index.html)
 Programming guide | [operations.readme.io](https://operations.readme.io)
 Example projects | [danthorpe/Examples](https://github.com/danthorpe/Examples)
 

diff --git a/Supporting Files/Operations.xcconfig b/Supporting Files/Operations.xcconfig
@@ -7,7 +7,7 @@
 //
 
 
-OPERATIONS_VERSION = 2.9.0
+OPERATIONS_VERSION = 2.9.1
 
 DEFINES_MODULE = YES
 INFOPLIST_FILE = $(SRCROOT)/Supporting Files/Info.plist