Merge pull request #244 from BoltsFramework/nlutsenko.170

Bolts 1.7.0 🔩
BoltsFramework · Mar 31, 2016 · 7567e79 · 7567e79
2 parents f8db004 + 6fdf714
commit 7567e79
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 12 deletions.
diff --git a/Bolts.podspec b/Bolts.podspec
@@ -1,13 +1,11 @@
 Pod::Spec.new do |s|
   s.name         = 'Bolts'
-  s.version      = '1.6.0'
+  s.version      = '1.7.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.
 
                     The first component in Bolts is "tasks", which make organization of complex asynchronous code more manageable. A task is kind of like a JavaScript Promise, but available for iOS and Android.
-
-                    For more information, see the [Bolts iOS API Reference](http://boltsframework.github.io/docs/ios/).
                    DESC
   s.homepage     = 'https://github.com/BoltsFramework'
   s.license      = 'BSD'

diff --git a/Bolts/Common/Bolts.m b/Bolts/Common/Bolts.m
@@ -12,6 +12,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-NSString *const BoltsFrameworkVersionString = @"1.6.0";
+NSString *const BoltsFrameworkVersionString = @"1.7.0";
 
 NS_ASSUME_NONNULL_END
diff --git a/Bolts/Resources/Mac-Info.plist b/Bolts/Resources/Mac-Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.0</string>
+	<string>1.7.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.6.0</string>
+	<string>1.7.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/Bolts/Resources/iOS-Info.plist b/Bolts/Resources/iOS-Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.0</string>
+	<string>1.7.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -22,7 +22,7 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.6.0</string>
+	<string>1.7.0</string>
 	<key>MinimumOSVersion</key>
 	<string>6.0</string>
 </dict>

diff --git a/Bolts/Resources/tvOS-Info.plist b/Bolts/Resources/tvOS-Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.0</string>
+	<string>1.7.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.6.0</string>
+	<string>1.7.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/Bolts/Resources/watchOS-Info.plist b/Bolts/Resources/watchOS-Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.0</string>
+	<string>1.7.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.6.0</string>
+	<string>1.7.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Bolts CHANGELOG
 
+## 1.7.0
+
+**New**
+- Added `BFTask.+taskForCompletionOfAnyTask:`.  
+  This method creates a task that will be completed when first of the provided task completes.  
+  [#229](https://github.com/BoltsFramework/Bolts-ObjC/pull/229)
+  by [Florent Vilmart](https://github.com/flovilmart)  
+- New constants defined for userInfo keys of multi-error/multi-exception.  
+  [#238](https://github.com/BoltsFramework/Bolts-ObjC/pull/238)
+  by [Takeru Chuganji](https://github.com/hoppenichu)
+- Replaced `Bolts` class, `BoltsVersion` macro with a constant string.  
+  [#239](https://github.com/BoltsFramework/Bolts-ObjC/pull/239)
+  by [Nikita Lutsenko](https://github.com/nlutsenko)
+
+**Improved**
+- Reduced stack frame from continuation stack trace if task is completed.  
+  [#237](https://github.com/BoltsFramework/Bolts-ObjC/pull/237)
+  by [Nikita Lutsenko](https://github.com/nlutsenko)  
+
+**Fixed**
+- Fixed disposing of `BFCancellationToken` when it has registrations.  
+  [#226](https://github.com/BoltsFramework/Bolts-ObjC/pull/226)
+  by [Nikita Lutsenko](https://github.com/nlutsenko)
+- Fixed and improved documentation.  
+  [#230](https://github.com/BoltsFramework/Bolts-ObjC/pull/230)
+  by [Paweł Wrzosek](https://github.com/wzs)
+- Fix warnings that surfaced in the release version of Xcode 7.3.  
+  [#231](https://github.com/BoltsFramework/Bolts-ObjC/pull/231)
+  by [Nikita Lutsenko](https://github.com/nlutsenko)
+- Fixed edge case scenario of `BFTask.+taskForCompletionOfAllTasks:` wouldn't finish or wouldn't be cancelled.  
+  [#235](https://github.com/BoltsFramework/Bolts-ObjC/pull/235)
+  by [Nikita Lutsenko](https://github.com/nlutsenko)
+
 ## 1.6.0
 
 **New**