Skip to content

Commit

Permalink
Merge pull request #269 from Polidea/5.1.2
Browse files Browse the repository at this point in the history
Version 5.1.2
  • Loading branch information
pouljohn1 authored Jun 21, 2018
2 parents 7c79ba3 + 1cf3d16 commit 3113c36
Show file tree
Hide file tree
Showing 73 changed files with 969 additions and 1,201 deletions.
Binary file removed .DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 5.1.2
- Updated RxSwift to 4.2 with support for XCode 9.4 (#268)

# 5.1.1
- Fixed `PeripheralManager` not public (#264)

Expand Down
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" "4.1.2"
github "ReactiveX/RxSwift" "4.2.0"
5 changes: 2 additions & 3 deletions HOW_TO_RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
- add new change log to `Changelog.md`
- change `RxBluetoothKit.podspec` with new library version
- generate new doc by running script `./scripts/generate-docs.sh x.x.x`
- create new Pull Request with that changes and merge it
- create new release on github
- create archive by running `carthage build --no-skip-current && carthage archive RxBluetoothKit`
- add those archive to github release that was created before
- create new Pull Request with that changes and merge it
- create new release on github abd add archive previously created
- add library to cocoapods trunk by running: `pod trunk push RxBluetoothKit.podspec`
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ RxBluetoothKit is an Bluetooth library that makes interaction with BLE devices m
Provides nice API to work with, and makes your code more readable, reliable and easier to maintain.

* 3.0 version supports Swift 3.0 and 3.1
* 5.0 version of the library supports Swift 3.2 and 4.0
* 5.0 version supports Swift 3.2 and 4.0
* 5.1.2 version supports Swift 4.1

#### Migrating to 5.x

Expand Down
2 changes: 1 addition & 1 deletion RxBluetoothKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxBluetoothKit"
s.version = "5.1.1"
s.version = "5.1.2"
s.summary = "Bluetooth library for RxSwift"

s.description = <<-DESC
Expand Down
1 change: 1 addition & 0 deletions Source/CentralManager+RestoredState.swift
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ extension CentralManager {
listenOnWillRestoreState(onWillRestoreCentralManagerState)
}

@available(*, deprecated: 5.1.0, message: "listenOnWillRestoreState(:OnWillRestoreCentralManagerState) instead")
func listenOnWillRestoreState(_ handler: @escaping OnWillRestoreState) {
_ = restoreStateObservable
.map { RestoredState(centralManagerRestoredState: $0) }
Expand Down
2 changes: 1 addition & 1 deletion Source/PeripheralManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ public class PeripheralManager: ManagerType {
// MARK: Internal functions

func ensureValidStateAndCallIfSucceeded<T>(for observable: Observable<T>,
postSubscriptionCall call: @escaping () -> Void
postSubscriptionCall call: @escaping () -> Void
) -> Observable<T> {
let operation = Observable<T>.deferred {
call()
Expand Down
2 changes: 1 addition & 1 deletion Tests/Autogenerated/Mock.generated.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated using Sourcery 0.12.0 — https://github.com/krzysztofzablocki/Sourcery
// Generated using Sourcery 0.13.1 — https://github.com/krzysztofzablocki/Sourcery
// DO NOT EDIT

import CoreBluetooth
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ extension _CentralManager {
listenOnWillRestoreState(onWillRestoreCentralManagerState)
}

@available(*, deprecated: 5.1.0, message: "listenOnWillRestoreState(:OnWillRestoreCentralManagerState) instead")
func listenOnWillRestoreState(_ handler: @escaping OnWillRestoreState) {
_ = restoreStateObservable
.map { _RestoredState(centralManagerRestoredState: $0) }
Expand Down
2 changes: 1 addition & 1 deletion Tests/Autogenerated/_PeripheralManager.generated.swift
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ class _PeripheralManager: _ManagerType {
// MARK: Internal functions

func ensureValidStateAndCallIfSucceeded<T>(for observable: Observable<T>,
postSubscriptionCall call: @escaping () -> Void
postSubscriptionCall call: @escaping () -> Void
) -> Observable<T> {
let operation = Observable<T>.deferred {
call()
Expand Down
27 changes: 14 additions & 13 deletions docs/Classes.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

</head>
<body>
<a name="//apple_ref/swift/Section/Classes" class="dashAnchor"></a>
<a title="Classes Reference"></a>
<header>
<div class="content-wrapper">
Expand Down Expand Up @@ -209,12 +210,12 @@ <h1>Classes</h1>
<h4>Declaration</h4>
<div class="language">
<p class="aside-title">Swift</p>
<pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">class</span> <span class="kt">CentralManager</span><span class="p">:</span> <span class="kt"><a href="Protocols/ManagerType.html">ManagerType</a></span></code></pre>
<pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">class</span> <span class="kt">CentralManager</span> <span class="p">:</span> <span class="kt"><a href="Protocols/ManagerType.html">ManagerType</a></span></code></pre>

</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.1/Source/CentralManager.swift#L27-L307">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.2/Source/CentralManager.swift#L27-L307">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -249,7 +250,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.1/Source/Characteristic.swift#L6-L180">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.2/Source/Characteristic.swift#L6-L180">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -286,7 +287,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.1/Source/Descriptor.swift#L8-L104">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.2/Source/Descriptor.swift#L8-L104">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -316,12 +317,12 @@ <h4>Declaration</h4>
<h4>Declaration</h4>
<div class="language">
<p class="aside-title">Swift</p>
<pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">class</span> <span class="kt">RxBluetoothKitLog</span><span class="p">:</span> <span class="kt">ReactiveCompatible</span></code></pre>
<pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">class</span> <span class="kt">RxBluetoothKitLog</span> <span class="p">:</span> <span class="kt">ReactiveCompatible</span></code></pre>

</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.1/Source/Logging.swift#L6-L95">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.2/Source/Logging.swift#L6-L95">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -357,7 +358,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.1/Source/Peripheral.swift#L10-L856">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.2/Source/Peripheral.swift#L10-L856">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -402,12 +403,12 @@ <h4>Declaration</h4>
<h4>Declaration</h4>
<div class="language">
<p class="aside-title">Swift</p>
<pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">class</span> <span class="kt">PeripheralManager</span><span class="p">:</span> <span class="kt"><a href="Protocols/ManagerType.html">ManagerType</a></span></code></pre>
<pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">class</span> <span class="kt">PeripheralManager</span> <span class="p">:</span> <span class="kt"><a href="Protocols/ManagerType.html">ManagerType</a></span></code></pre>

</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.1/Source/PeripheralManager.swift#L22-L376">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.2/Source/PeripheralManager.swift#L22-L376">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -443,7 +444,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.1/Source/ScannedPeripheral.swift#L6-L22">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.2/Source/ScannedPeripheral.swift#L6-L22">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -478,7 +479,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.1/Source/Service.swift#L6-L81">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.1.2/Source/Service.swift#L6-L81">Show on GitHub</a>
</div>
</section>
</div>
Expand All @@ -488,8 +489,8 @@ <h4>Declaration</h4>
</section>
</section>
<section id="footer">
<p>&copy; 2018 <a class="link" href="https://polidea.com" target="_blank" rel="external">Polidea</a>. All rights reserved. (Last updated: 2018-06-08)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
<p>&copy; 2018 <a class="link" href="https://polidea.com" target="_blank" rel="external">Polidea</a>. All rights reserved. (Last updated: 2018-06-21)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</article>
</div>
Expand Down
Loading

0 comments on commit 3113c36

Please sign in to comment.