Skip to content

Commit

Permalink
Merge pull request #347 from Polidea/Version-5.3.0
Browse files Browse the repository at this point in the history
Version 5.3.0
  • Loading branch information
minixT authored Jul 26, 2019
2 parents ff6308d + afc212e commit 3684eeb
Show file tree
Hide file tree
Showing 76 changed files with 2,832 additions and 781 deletions.
1 change: 0 additions & 1 deletion .jazzy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ github_url: https://github.com/Polidea/RxBluetoothKit
module: RxBluetoothKit
author_url: https://polidea.com
author: Polidea
swift_version: 5.0.0
clean: true
output: ./docs
root-url: https://polidea.github.io/RxBluetoothKit/
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 5.3.0
- Always connect to retrieved peripherals first (#337)
- Addded a customisation point for injecting a logger (#341)
- Fixed L2CAP API to support OSX 10.14 (#345)

# 5.2.1
- Updated RxSwift to version 5.0 (#335)

Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@ With just 9 lines it started scanning, connecting to the peripheral, discovering

# Recent Changes

**5.2.1**
**5.3.0**

* Updated RxSwift to version 5.0 (#335)
* Always connect to retrieved peripherals first (#337)
* Addded a customisation point for injecting a logger (#341)
* Fixed L2CAP API to support OSX 10.14 (#345)

[All previous changes](CHANGELOG.md)

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.2.1"
s.version = "5.3.0"
s.summary = "Bluetooth library for RxSwift"

s.description = <<-DESC
Expand Down
4 changes: 1 addition & 3 deletions Tests/Autogenerated/_Peripheral.generated.swift
Original file line number Diff line number Diff line change
Expand Up @@ -830,8 +830,7 @@ class _Peripheral {
/// * `_BluetoothError.bluetoothPoweredOff`
/// * `_BluetoothError.bluetoothInUnknownState`
/// * `_BluetoothError.bluetoothResetting`
#if os(iOS) || os(tvOS) || os(watchOS)
@available(iOS 11, tvOS 11, watchOS 4, *)
@available(iOS 11, macOS 10.14, tvOS 11, watchOS 4, *)
func openL2CAPChannel(PSM: CBL2CAPPSM) -> Single<CBL2CAPChannelMock> {
let observable = delegateWrapper
.peripheralDidOpenL2CAPChannel
Expand All @@ -850,7 +849,6 @@ class _Peripheral {
self?.peripheral.openL2CAPChannel(PSM)
}).asSingle()
}
#endif

// MARK: Internal functions

Expand Down
28 changes: 17 additions & 11 deletions docs/Classes.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<a title="Classes Reference"></a>
<header>
<div class="content-wrapper">
<p><a href="index.html">RxBluetoothKit Docs</a> (80% documented)</p>
<p><a href="index.html">RxBluetoothKit 5.3.0 Docs</a> (80% documented)</p>
<p class="header-right"><a href="https://github.com/Polidea/RxBluetoothKit"><img src="img/gh.png"/>View on GitHub</a></p>
</div>
</header>
Expand Down Expand Up @@ -69,6 +69,9 @@
<li class="nav-group-task">
<a href="Enums/BluetoothState.html">BluetoothState</a>
</li>
<li class="nav-group-task">
<a href="Enums/RxBluetoothKitLogger.html">RxBluetoothKitLogger</a>
</li>
<li class="nav-group-task">
<a href="Enums/StartAdvertisingResult.html">StartAdvertisingResult</a>
</li>
Expand Down Expand Up @@ -111,6 +114,9 @@
<li class="nav-group-task">
<a href="Protocols/DescriptorIdentifier.html">DescriptorIdentifier</a>
</li>
<li class="nav-group-task">
<a href="Protocols/Logger.html">Logger</a>
</li>
<li class="nav-group-task">
<a href="Protocols/ManagerType.html">ManagerType</a>
</li>
Expand Down Expand Up @@ -215,7 +221,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L27-L309">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L27-L309">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -250,7 +256,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/Characteristic.swift#L6-L180">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/Characteristic.swift#L6-L180">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -287,7 +293,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/Descriptor.swift#L8-L104">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/Descriptor.swift#L8-L104">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -322,7 +328,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/Logging.swift#L6-L95">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/Logging.swift#L6-L105">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -358,7 +364,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/Peripheral.swift#L10-L875">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/Peripheral.swift#L10-L873">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -408,7 +414,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/PeripheralManager.swift#L22-L376">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/PeripheralManager.swift#L22-L376">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -444,7 +450,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/ScannedPeripheral.swift#L6-L22">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/ScannedPeripheral.swift#L6-L22">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -479,7 +485,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/Service.swift#L6-L81">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/Service.swift#L6-L81">Show on GitHub</a>
</div>
</section>
</div>
Expand All @@ -489,8 +495,8 @@ <h4>Declaration</h4>
</section>
</section>
<section id="footer">
<p>&copy; 2019 <a class="link" href="https://polidea.com" target="_blank" rel="external">Polidea</a>. All rights reserved. (Last updated: 2019-05-17)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
<p>&copy; 2019 <a class="link" href="https://polidea.com" target="_blank" rel="external">Polidea</a>. All rights reserved. (Last updated: 2019-07-26)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.10.0</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</article>
</div>
Expand Down
40 changes: 23 additions & 17 deletions docs/Classes/CentralManager.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<a title="CentralManager Class Reference"></a>
<header>
<div class="content-wrapper">
<p><a href="../index.html">RxBluetoothKit Docs</a> (80% documented)</p>
<p><a href="../index.html">RxBluetoothKit 5.3.0 Docs</a> (80% documented)</p>
<p class="header-right"><a href="https://github.com/Polidea/RxBluetoothKit"><img src="../img/gh.png"/>View on GitHub</a></p>
</div>
</header>
Expand Down Expand Up @@ -69,6 +69,9 @@
<li class="nav-group-task">
<a href="../Enums/BluetoothState.html">BluetoothState</a>
</li>
<li class="nav-group-task">
<a href="../Enums/RxBluetoothKitLogger.html">RxBluetoothKitLogger</a>
</li>
<li class="nav-group-task">
<a href="../Enums/StartAdvertisingResult.html">StartAdvertisingResult</a>
</li>
Expand Down Expand Up @@ -111,6 +114,9 @@
<li class="nav-group-task">
<a href="../Protocols/DescriptorIdentifier.html">DescriptorIdentifier</a>
</li>
<li class="nav-group-task">
<a href="../Protocols/Logger.html">Logger</a>
</li>
<li class="nav-group-task">
<a href="../Protocols/ManagerType.html">ManagerType</a>
</li>
Expand Down Expand Up @@ -220,7 +226,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L30">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L30">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -250,7 +256,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -329,7 +335,7 @@ <h4>Parameters</h4>
</table>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L73-L83">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L73-L83">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -361,7 +367,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L88-L90">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L88-L90">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -401,7 +407,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L94-L96">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L94-L96">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -430,7 +436,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L98-L100">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L98-L100">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -540,7 +546,7 @@ <h4>Return Value</h4>
<p>Infinite stream of scanned peripherals.</p>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L137-L177">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L137-L177">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -635,7 +641,7 @@ <h4>Return Value</h4>
<p><code>Observable</code> which emits next event after connection is established.</p>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L202-L205">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L202-L205">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -701,7 +707,7 @@ <h4>Return Value</h4>
<code><a href="../Classes/Service.html">Service</a></code>s with UUIDs specified in the <code>serviceUUIDs</code> parameter.</p>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L215-L218">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L215-L218">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -754,7 +760,7 @@ <h4>Return Value</h4>
<p>Retrieved <code><a href="../Classes/Peripheral.html">Peripheral</a></code>s.</p>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L224-L227">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L224-L227">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -831,7 +837,7 @@ <h4>Return Value</h4>
<p>Observable which emits next events when <code>peripheral</code> was connected.</p>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L245-L253">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L245-L253">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -899,7 +905,7 @@ <h4>Return Value</h4>
if it wasn&rsquo;t the <code>cancelPeripheralConnection</code> call.</p>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L270-L286">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L270-L286">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -943,7 +949,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager+RestoredState.swift#L16-L23">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager+RestoredState.swift#L16-L23">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -1031,7 +1037,7 @@ <h4>Parameters</h4>
</table>
</div>
<div class="slightly-smaller">
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager+RestoredState.swift#L35-L42">Show on GitHub</a>
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager+RestoredState.swift#L35-L42">Show on GitHub</a>
</div>
</section>
</div>
Expand All @@ -1041,8 +1047,8 @@ <h4>Parameters</h4>
</section>
</section>
<section id="footer">
<p>&copy; 2019 <a class="link" href="https://polidea.com" target="_blank" rel="external">Polidea</a>. All rights reserved. (Last updated: 2019-05-17)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
<p>&copy; 2019 <a class="link" href="https://polidea.com" target="_blank" rel="external">Polidea</a>. All rights reserved. (Last updated: 2019-07-26)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.10.0</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 3684eeb

Please sign in to comment.