diff --git a/Bolts-Swift.podspec b/Bolts-Swift.podspec index 082df8c..9998ba8 100644 --- a/Bolts-Swift.podspec +++ b/Bolts-Swift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Bolts-Swift' - s.version = '1.1.0' + s.version = '1.2.0' s.license = { :type => 'BSD' } s.summary = 'Bolts is a collection of low-level libraries designed to make developing mobile apps easier.' s.homepage = 'https://github.com/BoltsFramework' diff --git a/BoltsSwift.xcodeproj/project.pbxproj b/BoltsSwift.xcodeproj/project.pbxproj index 2934e1c..4ea1df8 100644 --- a/BoltsSwift.xcodeproj/project.pbxproj +++ b/BoltsSwift.xcodeproj/project.pbxproj @@ -104,6 +104,7 @@ 812DB53B1D3597BF00552C9F /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; 812DB53C1D3597BF00552C9F /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; 812DB53D1D3597BF00552C9F /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 81951A901D46BA2F00958108 /* Version.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = ""; }; 81CC14EC1A9BE0A100B28F86 /* BoltsSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 81CC14F61A9BE0A100B28F86 /* BoltsSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BoltsSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 81D300631C93AF7300E1A1ED /* Errors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = ""; }; @@ -189,6 +190,7 @@ 812DB52B1D3597BF00552C9F /* BoltsSwiftTests-iOS.xcconfig */, 812DB52C1D3597BF00552C9F /* BoltsSwiftTests-macOS.xcconfig */, 812DB52D1D3597BF00552C9F /* BoltsSwiftTests-tvOS.xcconfig */, + 81951A901D46BA2F00958108 /* Version.xcconfig */, 812DB52E1D3597BF00552C9F /* Shared */, ); path = Configurations; diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c32e6c..7b5b06b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,29 @@ # Change Log -## [1.1.0](https://github.com/BoltsFramework/Bolts-Swift/tree/1.1.0) (2016-05-03) +## [1.2.0](https://github.com/BoltsFramework/Bolts-Swift/tree/1.2.0) (2016-07-25) +[Full Changelog](https://github.com/BoltsFramework/Bolts-Swift/compare/1.1.0...1.2.0) + +**Implemented enhancements:** + +- Implement new set of continuations for error-only use case. [\#17](https://github.com/BoltsFramework/Bolts-Swift/issues/17) +- Make all 'trySet', 'set' functions to use explicit argument labels. [\#30](https://github.com/BoltsFramework/Bolts-Swift/pull/30) ([nlutsenko](https://github.com/nlutsenko)) +- Update project/tests for Xcode 8 and Swift 2.3. [\#27](https://github.com/BoltsFramework/Bolts-Swift/pull/27) ([nlutsenko](https://github.com/nlutsenko)) +- Make CompletedCondtion optional, should improve memory usage slightly. [\#25](https://github.com/BoltsFramework/Bolts-Swift/pull/25) ([richardjrossiii](https://github.com/richardjrossiii)) +- Add continueOnErrorWith, continueOnErrorWithTask. [\#18](https://github.com/BoltsFramework/Bolts-Swift/pull/18) ([nlutsenko](https://github.com/nlutsenko)) + +**Fixed bugs:** + +- Resolve retain cycle in Task [\#19](https://github.com/BoltsFramework/Bolts-Swift/pull/19) ([mmtootmm](https://github.com/mmtootmm)) + +**Merged pull requests:** + +- Migrate all targets to shared configurations from xctoolchain. [\#32](https://github.com/BoltsFramework/Bolts-Swift/pull/32) ([nlutsenko](https://github.com/nlutsenko)) +- Add swiftlint to Travis-CI. [\#29](https://github.com/BoltsFramework/Bolts-Swift/pull/29) ([nlutsenko](https://github.com/nlutsenko)) +- Split Task into multiple files. [\#24](https://github.com/BoltsFramework/Bolts-Swift/pull/24) ([richardjrossiii](https://github.com/richardjrossiii)) +- Update installation instructions in README. [\#22](https://github.com/BoltsFramework/Bolts-Swift/pull/22) ([nlutsenko](https://github.com/nlutsenko)) +- Refactor continuation to be better, faster, stronger. [\#20](https://github.com/BoltsFramework/Bolts-Swift/pull/20) ([richardjrossiii](https://github.com/richardjrossiii)) + +## [1.1.0](https://github.com/BoltsFramework/Bolts-Swift/tree/1.1.0) (2016-05-04) [Full Changelog](https://github.com/BoltsFramework/Bolts-Swift/compare/1.0.1...1.1.0) **Implemented enhancements:** @@ -14,6 +37,7 @@ **Merged pull requests:** +- Bolts 1.1.0 🔩 [\#16](https://github.com/BoltsFramework/Bolts-Swift/pull/16) ([nlutsenko](https://github.com/nlutsenko)) - Add more tests and fix documentation. [\#12](https://github.com/BoltsFramework/Bolts-Swift/pull/12) ([nlutsenko](https://github.com/nlutsenko)) - Use Xcode 7.3 for Travis-CI. [\#11](https://github.com/BoltsFramework/Bolts-Swift/pull/11) ([nlutsenko](https://github.com/nlutsenko)) diff --git a/Configurations/BoltsSwift-iOS.xcconfig b/Configurations/BoltsSwift-iOS.xcconfig index 6d60a7e..e35ec00 100644 --- a/Configurations/BoltsSwift-iOS.xcconfig +++ b/Configurations/BoltsSwift-iOS.xcconfig @@ -9,6 +9,7 @@ #include "Shared/Platform/iOS.xcconfig" #include "Shared/Product/DynamicFramework.xcconfig" +#include "Version.xcconfig" PRODUCT_NAME = BoltsSwift PRODUCT_BUNDLE_IDENTIFIER = com.bolts.swift.ios diff --git a/Configurations/BoltsSwift-macOS.xcconfig b/Configurations/BoltsSwift-macOS.xcconfig index 640a292..9d87270 100644 --- a/Configurations/BoltsSwift-macOS.xcconfig +++ b/Configurations/BoltsSwift-macOS.xcconfig @@ -9,6 +9,7 @@ #include "Shared/Platform/macOS.xcconfig" #include "Shared/Product/DynamicFramework.xcconfig" +#include "Version.xcconfig" PRODUCT_NAME = BoltsSwift PRODUCT_BUNDLE_IDENTIFIER = com.bolts.swift.macos diff --git a/Configurations/BoltsSwift-tvOS.xcconfig b/Configurations/BoltsSwift-tvOS.xcconfig index 655d51d..0e429f4 100644 --- a/Configurations/BoltsSwift-tvOS.xcconfig +++ b/Configurations/BoltsSwift-tvOS.xcconfig @@ -9,6 +9,7 @@ #include "Shared/Platform/tvOS.xcconfig" #include "Shared/Product/DynamicFramework.xcconfig" +#include "Version.xcconfig" PRODUCT_NAME = BoltsSwift PRODUCT_BUNDLE_IDENTIFIER = com.bolts.swift.tvos diff --git a/Configurations/BoltsSwift-watchOS.xcconfig b/Configurations/BoltsSwift-watchOS.xcconfig index 6e76427..b0a6dc1 100644 --- a/Configurations/BoltsSwift-watchOS.xcconfig +++ b/Configurations/BoltsSwift-watchOS.xcconfig @@ -9,6 +9,7 @@ #include "Shared/Platform/watchOS.xcconfig" #include "Shared/Product/DynamicFramework.xcconfig" +#include "Version.xcconfig" PRODUCT_NAME = BoltsSwift PRODUCT_BUNDLE_IDENTIFIER = com.bolts.swift.watchos diff --git a/Configurations/Version.xcconfig b/Configurations/Version.xcconfig new file mode 100644 index 0000000..c4409cc --- /dev/null +++ b/Configurations/Version.xcconfig @@ -0,0 +1,10 @@ +// +// Copyright (c) 2016, Facebook, Inc. +// All rights reserved. +// +// This source code is licensed under the BSD-style license found in the +// LICENSE file in the root directory of this source tree. An additional grant +// of patent rights can be found in the PATENTS file in the same directory. +// + +BOLTS_SWIFT_VERSION = 1.2.0 diff --git a/Sources/Info.plist b/Sources/Info.plist index dc640d4..529ced7 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.1.0 + $(BOLTS_SWIFT_VERSION) CFBundleSignature ???? CFBundleVersion - 1.1.0 + $(BOLTS_SWIFT_VERSION) NSPrincipalClass diff --git a/Vendor/xctoolchain b/Vendor/xctoolchain index a381a3f..af8d7f6 160000 --- a/Vendor/xctoolchain +++ b/Vendor/xctoolchain @@ -1 +1 @@ -Subproject commit a381a3f1b30fd7ff9180f3627ab241916b711b7d +Subproject commit af8d7f69bf7a5b8e8edd94a139f83fc465b7b64a