Skip to content

Commit

Permalink
Merge pull request #95 from BoltsFramework/nlutsenko.release_115
Browse files Browse the repository at this point in the history
Release 1.1.5
  • Loading branch information
nlutsenko committed Apr 22, 2015
2 parents 372cb99 + c1a09dd commit edea5c7
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Bolts.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Bolts"
s.version = "1.1.4"
s.version = "1.1.5"
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.
Expand Down
2 changes: 1 addition & 1 deletion Bolts/Common/BoltsVersion.h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define BOLTS_VERSION @"1.1.4"
#define BOLTS_VERSION @"1.1.5"
4 changes: 2 additions & 2 deletions Bolts/Resources/Mac-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.1.4</string>
<string>1.1.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.1.4</string>
<string>1.1.5</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
4 changes: 2 additions & 2 deletions Bolts/Resources/iOS-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.1.4</string>
<string>1.1.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
Expand All @@ -22,7 +22,7 @@
<string>iPhoneOS</string>
</array>
<key>CFBundleVersion</key>
<string>1.1.4</string>
<string>1.1.5</string>
<key>MinimumOSVersion</key>
<string>5.0</string>
</dict>
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Bolts CHANGELOG

## 1.1.5
- Better subclassing support for `BFTask`, `BFTaskCompletionSource`, `BFExecutor`.
- Improved `taskForCompletionOfAllTasks:` to check for `error`/`exception` before cancelling a task.
- Fixed and improved layout of `BFAppLinkReturnToRefererController`.
- Improve optional importing for AppLinks code in umbrella header.
- Split Tasks and AppLinks in subspecs.

## 1.1.4
- New: Bolts for iOS is easily importable from Swift code (via `import Bolts`).
- New: Added `BFTask +taskForCompletionOfAllTaskResults`.
Expand Down

0 comments on commit edea5c7

Please sign in to comment.