Skip to content

Commit 3113c36

Browse files
authored
Merge pull request #269 from Polidea/5.1.2
Version 5.1.2
2 parents 7c79ba3 + 1cf3d16 commit 3113c36

File tree

73 files changed

+969
-1201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+969
-1201
lines changed

.DS_Store

-6 KB
Binary file not shown.

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 5.1.2
2+
- Updated RxSwift to 4.2 with support for XCode 9.4 (#268)
3+
14
# 5.1.1
25
- Fixed `PeripheralManager` not public (#264)
36

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "4.1.2"
1+
github "ReactiveX/RxSwift" "4.2.0"

HOW_TO_RELEASE.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
- add new change log to `Changelog.md`
55
- change `RxBluetoothKit.podspec` with new library version
66
- generate new doc by running script `./scripts/generate-docs.sh x.x.x`
7-
- create new Pull Request with that changes and merge it
8-
- create new release on github
97
- create archive by running `carthage build --no-skip-current && carthage archive RxBluetoothKit`
10-
- add those archive to github release that was created before
8+
- create new Pull Request with that changes and merge it
9+
- create new release on github abd add archive previously created
1110
- add library to cocoapods trunk by running: `pod trunk push RxBluetoothKit.podspec`

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ RxBluetoothKit is an Bluetooth library that makes interaction with BLE devices m
88
Provides nice API to work with, and makes your code more readable, reliable and easier to maintain.
99

1010
* 3.0 version supports Swift 3.0 and 3.1
11-
* 5.0 version of the library supports Swift 3.2 and 4.0
11+
* 5.0 version supports Swift 3.2 and 4.0
12+
* 5.1.2 version supports Swift 4.1
1213

1314
#### Migrating to 5.x
1415

RxBluetoothKit.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "RxBluetoothKit"
3-
s.version = "5.1.1"
3+
s.version = "5.1.2"
44
s.summary = "Bluetooth library for RxSwift"
55

66
s.description = <<-DESC

Source/CentralManager+RestoredState.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ extension CentralManager {
6363
listenOnWillRestoreState(onWillRestoreCentralManagerState)
6464
}
6565

66+
@available(*, deprecated: 5.1.0, message: "listenOnWillRestoreState(:OnWillRestoreCentralManagerState) instead")
6667
func listenOnWillRestoreState(_ handler: @escaping OnWillRestoreState) {
6768
_ = restoreStateObservable
6869
.map { RestoredState(centralManagerRestoredState: $0) }

Source/PeripheralManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ public class PeripheralManager: ManagerType {
365365
// MARK: Internal functions
366366

367367
func ensureValidStateAndCallIfSucceeded<T>(for observable: Observable<T>,
368-
postSubscriptionCall call: @escaping () -> Void
368+
postSubscriptionCall call: @escaping () -> Void
369369
) -> Observable<T> {
370370
let operation = Observable<T>.deferred {
371371
call()

Tests/Autogenerated/Mock.generated.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated using Sourcery 0.12.0 — https://github.com/krzysztofzablocki/Sourcery
1+
// Generated using Sourcery 0.13.1 — https://github.com/krzysztofzablocki/Sourcery
22
// DO NOT EDIT
33

44
import CoreBluetooth

Tests/Autogenerated/_CentralManager+RestoredState.generated.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ extension _CentralManager {
6464
listenOnWillRestoreState(onWillRestoreCentralManagerState)
6565
}
6666

67+
@available(*, deprecated: 5.1.0, message: "listenOnWillRestoreState(:OnWillRestoreCentralManagerState) instead")
6768
func listenOnWillRestoreState(_ handler: @escaping OnWillRestoreState) {
6869
_ = restoreStateObservable
6970
.map { _RestoredState(centralManagerRestoredState: $0) }

0 commit comments

Comments
 (0)