Skip to content

Commit 3684eeb

Browse files
minixTminixT
authored
Merge pull request #347 from Polidea/Version-5.3.0
Version 5.3.0
2 parents ff6308d + afc212e commit 3684eeb

File tree

76 files changed

+2832
-781
lines changed

Some content is hidden

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

76 files changed

+2832
-781
lines changed

‎.jazzy.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ github_url: https://github.com/Polidea/RxBluetoothKit
22
module: RxBluetoothKit
33
author_url: https://polidea.com
44
author: Polidea
5-
swift_version: 5.0.0
65
clean: true
76
output: ./docs
87
root-url: https://polidea.github.io/RxBluetoothKit/

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 5.3.0
2+
- Always connect to retrieved peripherals first (#337)
3+
- Addded a customisation point for injecting a logger (#341)
4+
- Fixed L2CAP API to support OSX 10.14 (#345)
5+
16
# 5.2.1
27
- Updated RxSwift to version 5.0 (#335)
38

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,11 @@ With just 9 lines it started scanning, connecting to the peripheral, discovering
5151

5252
# Recent Changes
5353

54-
**5.2.1**
54+
**5.3.0**
5555

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

5860
[All previous changes](CHANGELOG.md)
5961

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

66
s.description = <<-DESC

‎Tests/Autogenerated/_Peripheral.generated.swift‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -830,8 +830,7 @@ class _Peripheral {
830830
/// * `_BluetoothError.bluetoothPoweredOff`
831831
/// * `_BluetoothError.bluetoothInUnknownState`
832832
/// * `_BluetoothError.bluetoothResetting`
833-
#if os(iOS) || os(tvOS) || os(watchOS)
834-
@available(iOS 11, tvOS 11, watchOS 4, *)
833+
@available(iOS 11, macOS 10.14, tvOS 11, watchOS 4, *)
835834
func openL2CAPChannel(PSM: CBL2CAPPSM) -> Single<CBL2CAPChannelMock> {
836835
let observable = delegateWrapper
837836
.peripheralDidOpenL2CAPChannel
@@ -850,7 +849,6 @@ class _Peripheral {
850849
self?.peripheral.openL2CAPChannel(PSM)
851850
}).asSingle()
852851
}
853-
#endif
854852

855853
// MARK: Internal functions
856854

‎docs/Classes.html‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<a title="Classes Reference"></a>
1515
<header>
1616
<div class="content-wrapper">
17-
<p><a href="index.html">RxBluetoothKit Docs</a> (80% documented)</p>
17+
<p><a href="index.html">RxBluetoothKit 5.3.0 Docs</a> (80% documented)</p>
1818
<p class="header-right"><a href="https://github.com/Polidea/RxBluetoothKit"><img src="img/gh.png"/>View on GitHub</a></p>
1919
</div>
2020
</header>
@@ -69,6 +69,9 @@
6969
<li class="nav-group-task">
7070
<a href="Enums/BluetoothState.html">BluetoothState</a>
7171
</li>
72+
<li class="nav-group-task">
73+
<a href="Enums/RxBluetoothKitLogger.html">RxBluetoothKitLogger</a>
74+
</li>
7275
<li class="nav-group-task">
7376
<a href="Enums/StartAdvertisingResult.html">StartAdvertisingResult</a>
7477
</li>
@@ -111,6 +114,9 @@
111114
<li class="nav-group-task">
112115
<a href="Protocols/DescriptorIdentifier.html">DescriptorIdentifier</a>
113116
</li>
117+
<li class="nav-group-task">
118+
<a href="Protocols/Logger.html">Logger</a>
119+
</li>
114120
<li class="nav-group-task">
115121
<a href="Protocols/ManagerType.html">ManagerType</a>
116122
</li>
@@ -215,7 +221,7 @@ <h4>Declaration</h4>
215221
</div>
216222
</div>
217223
<div class="slightly-smaller">
218-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L27-L309">Show on GitHub</a>
224+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L27-L309">Show on GitHub</a>
219225
</div>
220226
</section>
221227
</div>
@@ -250,7 +256,7 @@ <h4>Declaration</h4>
250256
</div>
251257
</div>
252258
<div class="slightly-smaller">
253-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/Characteristic.swift#L6-L180">Show on GitHub</a>
259+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/Characteristic.swift#L6-L180">Show on GitHub</a>
254260
</div>
255261
</section>
256262
</div>
@@ -287,7 +293,7 @@ <h4>Declaration</h4>
287293
</div>
288294
</div>
289295
<div class="slightly-smaller">
290-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/Descriptor.swift#L8-L104">Show on GitHub</a>
296+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/Descriptor.swift#L8-L104">Show on GitHub</a>
291297
</div>
292298
</section>
293299
</div>
@@ -322,7 +328,7 @@ <h4>Declaration</h4>
322328
</div>
323329
</div>
324330
<div class="slightly-smaller">
325-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/Logging.swift#L6-L95">Show on GitHub</a>
331+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/Logging.swift#L6-L105">Show on GitHub</a>
326332
</div>
327333
</section>
328334
</div>
@@ -358,7 +364,7 @@ <h4>Declaration</h4>
358364
</div>
359365
</div>
360366
<div class="slightly-smaller">
361-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/Peripheral.swift#L10-L875">Show on GitHub</a>
367+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/Peripheral.swift#L10-L873">Show on GitHub</a>
362368
</div>
363369
</section>
364370
</div>
@@ -408,7 +414,7 @@ <h4>Declaration</h4>
408414
</div>
409415
</div>
410416
<div class="slightly-smaller">
411-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/PeripheralManager.swift#L22-L376">Show on GitHub</a>
417+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/PeripheralManager.swift#L22-L376">Show on GitHub</a>
412418
</div>
413419
</section>
414420
</div>
@@ -444,7 +450,7 @@ <h4>Declaration</h4>
444450
</div>
445451
</div>
446452
<div class="slightly-smaller">
447-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/ScannedPeripheral.swift#L6-L22">Show on GitHub</a>
453+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/ScannedPeripheral.swift#L6-L22">Show on GitHub</a>
448454
</div>
449455
</section>
450456
</div>
@@ -479,7 +485,7 @@ <h4>Declaration</h4>
479485
</div>
480486
</div>
481487
<div class="slightly-smaller">
482-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/Service.swift#L6-L81">Show on GitHub</a>
488+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/Service.swift#L6-L81">Show on GitHub</a>
483489
</div>
484490
</section>
485491
</div>
@@ -489,8 +495,8 @@ <h4>Declaration</h4>
489495
</section>
490496
</section>
491497
<section id="footer">
492-
<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>
493-
<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>
498+
<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>
499+
<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>
494500
</section>
495501
</article>
496502
</div>

‎docs/Classes/CentralManager.html‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<a title="CentralManager Class Reference"></a>
1515
<header>
1616
<div class="content-wrapper">
17-
<p><a href="../index.html">RxBluetoothKit Docs</a> (80% documented)</p>
17+
<p><a href="../index.html">RxBluetoothKit 5.3.0 Docs</a> (80% documented)</p>
1818
<p class="header-right"><a href="https://github.com/Polidea/RxBluetoothKit"><img src="../img/gh.png"/>View on GitHub</a></p>
1919
</div>
2020
</header>
@@ -69,6 +69,9 @@
6969
<li class="nav-group-task">
7070
<a href="../Enums/BluetoothState.html">BluetoothState</a>
7171
</li>
72+
<li class="nav-group-task">
73+
<a href="../Enums/RxBluetoothKitLogger.html">RxBluetoothKitLogger</a>
74+
</li>
7275
<li class="nav-group-task">
7376
<a href="../Enums/StartAdvertisingResult.html">StartAdvertisingResult</a>
7477
</li>
@@ -111,6 +114,9 @@
111114
<li class="nav-group-task">
112115
<a href="../Protocols/DescriptorIdentifier.html">DescriptorIdentifier</a>
113116
</li>
117+
<li class="nav-group-task">
118+
<a href="../Protocols/Logger.html">Logger</a>
119+
</li>
114120
<li class="nav-group-task">
115121
<a href="../Protocols/ManagerType.html">ManagerType</a>
116122
</li>
@@ -220,7 +226,7 @@ <h4>Declaration</h4>
220226
</div>
221227
</div>
222228
<div class="slightly-smaller">
223-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L30">Show on GitHub</a>
229+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L30">Show on GitHub</a>
224230
</div>
225231
</section>
226232
</div>
@@ -250,7 +256,7 @@ <h4>Declaration</h4>
250256
</div>
251257
</div>
252258
<div class="slightly-smaller">
253-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L">Show on GitHub</a>
259+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L">Show on GitHub</a>
254260
</div>
255261
</section>
256262
</div>
@@ -329,7 +335,7 @@ <h4>Parameters</h4>
329335
</table>
330336
</div>
331337
<div class="slightly-smaller">
332-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L73-L83">Show on GitHub</a>
338+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L73-L83">Show on GitHub</a>
333339
</div>
334340
</section>
335341
</div>
@@ -361,7 +367,7 @@ <h4>Declaration</h4>
361367
</div>
362368
</div>
363369
<div class="slightly-smaller">
364-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L88-L90">Show on GitHub</a>
370+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L88-L90">Show on GitHub</a>
365371
</div>
366372
</section>
367373
</div>
@@ -401,7 +407,7 @@ <h4>Declaration</h4>
401407
</div>
402408
</div>
403409
<div class="slightly-smaller">
404-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L94-L96">Show on GitHub</a>
410+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L94-L96">Show on GitHub</a>
405411
</div>
406412
</section>
407413
</div>
@@ -430,7 +436,7 @@ <h4>Declaration</h4>
430436
</div>
431437
</div>
432438
<div class="slightly-smaller">
433-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L98-L100">Show on GitHub</a>
439+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L98-L100">Show on GitHub</a>
434440
</div>
435441
</section>
436442
</div>
@@ -540,7 +546,7 @@ <h4>Return Value</h4>
540546
<p>Infinite stream of scanned peripherals.</p>
541547
</div>
542548
<div class="slightly-smaller">
543-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L137-L177">Show on GitHub</a>
549+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L137-L177">Show on GitHub</a>
544550
</div>
545551
</section>
546552
</div>
@@ -635,7 +641,7 @@ <h4>Return Value</h4>
635641
<p><code>Observable</code> which emits next event after connection is established.</p>
636642
</div>
637643
<div class="slightly-smaller">
638-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L202-L205">Show on GitHub</a>
644+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L202-L205">Show on GitHub</a>
639645
</div>
640646
</section>
641647
</div>
@@ -701,7 +707,7 @@ <h4>Return Value</h4>
701707
<code><a href="../Classes/Service.html">Service</a></code>s with UUIDs specified in the <code>serviceUUIDs</code> parameter.</p>
702708
</div>
703709
<div class="slightly-smaller">
704-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L215-L218">Show on GitHub</a>
710+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L215-L218">Show on GitHub</a>
705711
</div>
706712
</section>
707713
</div>
@@ -754,7 +760,7 @@ <h4>Return Value</h4>
754760
<p>Retrieved <code><a href="../Classes/Peripheral.html">Peripheral</a></code>s.</p>
755761
</div>
756762
<div class="slightly-smaller">
757-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L224-L227">Show on GitHub</a>
763+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L224-L227">Show on GitHub</a>
758764
</div>
759765
</section>
760766
</div>
@@ -831,7 +837,7 @@ <h4>Return Value</h4>
831837
<p>Observable which emits next events when <code>peripheral</code> was connected.</p>
832838
</div>
833839
<div class="slightly-smaller">
834-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L245-L253">Show on GitHub</a>
840+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L245-L253">Show on GitHub</a>
835841
</div>
836842
</section>
837843
</div>
@@ -899,7 +905,7 @@ <h4>Return Value</h4>
899905
if it wasn&rsquo;t the <code>cancelPeripheralConnection</code> call.</p>
900906
</div>
901907
<div class="slightly-smaller">
902-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager.swift#L270-L286">Show on GitHub</a>
908+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager.swift#L270-L286">Show on GitHub</a>
903909
</div>
904910
</section>
905911
</div>
@@ -943,7 +949,7 @@ <h4>Declaration</h4>
943949
</div>
944950
</div>
945951
<div class="slightly-smaller">
946-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager+RestoredState.swift#L16-L23">Show on GitHub</a>
952+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager+RestoredState.swift#L16-L23">Show on GitHub</a>
947953
</div>
948954
</section>
949955
</div>
@@ -1031,7 +1037,7 @@ <h4>Parameters</h4>
10311037
</table>
10321038
</div>
10331039
<div class="slightly-smaller">
1034-
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.2.1/Source/CentralManager+RestoredState.swift#L35-L42">Show on GitHub</a>
1040+
<a href="https://github.com/Polidea/RxBluetoothKit/tree/5.3.0/Source/CentralManager+RestoredState.swift#L35-L42">Show on GitHub</a>
10351041
</div>
10361042
</section>
10371043
</div>
@@ -1041,8 +1047,8 @@ <h4>Parameters</h4>
10411047
</section>
10421048
</section>
10431049
<section id="footer">
1044-
<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>
1045-
<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>
1050+
<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>
1051+
<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>
10461052
</section>
10471053
</article>
10481054
</div>

0 commit comments

Comments
 (0)