Merge pull request #104 from BoltsFramework/nlutsenko.release.010200

Release 1.2.0

Author: nlutsenko

Bolts.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Bolts"
-  s.version      = "1.1.5"
+  s.version      = "1.2.0"
   s.summary      = "Bolts is a collection of low-level libraries designed to make developing mobile apps easier."
   s.description  = <<-DESC
                     Bolts was designed by Parse and Facebook for our own internal use, and we have decided to open source these libraries to make them available to others. Using these libraries does not require using any Parse services. Nor do they require having a Parse or Facebook developer account.

Bolts/Common/BoltsVersion.h

@@ -1 +1 @@
-#define BOLTS_VERSION @"1.1.5"
+#define BOLTS_VERSION @"1.2.0"

Bolts/Resources/Mac-Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.5</string>
+	<string>1.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.5</string>
+	<string>1.2.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

Bolts/Resources/iOS-Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.5</string>
+	<string>1.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -22,7 +22,7 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.5</string>
+	<string>1.2.0</string>
 	<key>MinimumOSVersion</key>
 	<string>5.0</string>
 </dict>

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Bolts CHANGELOG
 
+## 1.2.0
+- Added: `BFCancellationToken`, `BFCancellationTokenSource`, `BFCancellationTokenRegistration`
+- Updated: `BFTask` APIs to have methods that accept `BFCancellationToken` as an argument.
+- Documentation updates and small bug fixes.
+
 ## 1.1.5
 - Better subclassing support for `BFTask`, `BFTaskCompletionSource`, `BFExecutor`.
 - Improved `taskForCompletionOfAllTasks:` to check for `error`/`exception` before cancelling a task.