Skip to content

Commit a68d36c

Browse files
authored
Merge branch 'master' into master
2 parents bae81b5 + fa4aa1c commit a68d36c

File tree

323 files changed

+42575
-36135
lines changed

Some content is hidden

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

323 files changed

+42575
-36135
lines changed

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ target 'XcodeBenchmark' do
2727
pod 'SwiftyJSON', '~> 4.0'
2828
pod 'Realm', '~> 5.3.4'
2929
pod 'MagicalRecord', :git => 'https://github.com/magicalpanda/MagicalRecord'
30-
pod 'RxBluetoothKit'
30+
pod 'RxBluetoothKit', :git => 'https://github.com/i-mobility/RxBluetoothKit.git', :tag => '7.0.2'
3131
pod 'ReactiveCocoa', '~> 10.1'
3232
pod 'CryptoSwift', '~> 1.4.0'
3333
pod 'R.swift.Library'

Podfile.lock

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -489,9 +489,9 @@ PODS:
489489
- Realm (5.3.4):
490490
- Realm/Headers (= 5.3.4)
491491
- Realm/Headers (5.3.4)
492-
- RxBluetoothKit (5.3.0):
493-
- RxSwift (~> 5.0)
494-
- RxSwift (5.1.1)
492+
- RxBluetoothKit (7.0.0):
493+
- RxSwift (~> 6.0)
494+
- RxSwift (6.2.0)
495495
- SDWebImage (5.8.4):
496496
- SDWebImage/Core (= 5.8.4)
497497
- SDWebImage/Core (5.8.4)
@@ -542,7 +542,7 @@ DEPENDENCIES:
542542
- R.swift.Library
543543
- ReactiveCocoa (~> 10.1)
544544
- Realm (~> 5.3.4)
545-
- RxBluetoothKit
545+
- RxBluetoothKit (from `https://github.com/i-mobility/RxBluetoothKit.git`, tag `7.0.2`)
546546
- SDWebImage (~> 5.0)
547547
- SnapKit (~> 5.0.0)
548548
- Starscream (~> 4.0.0)
@@ -615,7 +615,6 @@ SPEC REPOS:
615615
- ReactiveCocoa
616616
- ReactiveSwift
617617
- Realm
618-
- RxBluetoothKit
619618
- RxSwift
620619
- SDWebImage
621620
- SnapKit
@@ -631,11 +630,17 @@ SPEC REPOS:
631630
EXTERNAL SOURCES:
632631
MagicalRecord:
633632
:git: https://github.com/magicalpanda/MagicalRecord
633+
RxBluetoothKit:
634+
:git: https://github.com/i-mobility/RxBluetoothKit.git
635+
:tag: 7.0.2
634636

635637
CHECKOUT OPTIONS:
636638
MagicalRecord:
637639
:commit: 6031f608b79c1d6802007aaed6efd100e11f59ba
638640
:git: https://github.com/magicalpanda/MagicalRecord
641+
RxBluetoothKit:
642+
:git: https://github.com/i-mobility/RxBluetoothKit.git
643+
:tag: 7.0.2
639644

640645
SPEC CHECKSUMS:
641646
abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f
@@ -699,8 +704,8 @@ SPEC CHECKSUMS:
699704
ReactiveCocoa: 083ae559e6f588ce519cab412ea119b431c26a24
700705
ReactiveSwift: 7937f26ec18d555e2a99352bd0a8b2817d1f042d
701706
Realm: 4dd457b6ed025041cf7efe05dae78c027ba842e0
702-
RxBluetoothKit: 0e781978e8a0df70ac3c611dcf44800b76c69f8a
703-
RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178
707+
RxBluetoothKit: be7acb92b3eaaa3a15c3813c2c12648ad7f49010
708+
RxSwift: d356ab7bee873611322f134c5f9ef379fa183d8f
704709
SDWebImage: cf6922231e95550934da2ada0f20f2becf2ceba9
705710
SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
706711
Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9
@@ -712,6 +717,6 @@ SPEC CHECKSUMS:
712717
TRON: 3cb6a8c19230177c97225860d2ff38b618d51a53
713718
VK-ios-sdk: 62a10b6571fbcda0657f455fedce7fedf55b4cd0
714719

715-
PODFILE CHECKSUM: 565f3da0ac53c7537087d956a9a46cf71f1932fa
720+
PODFILE CHECKSUM: aceb17c6e5beaf7292e79f66536ceed0c2d0d0e9
716721

717-
COCOAPODS: 1.10.1
722+
COCOAPODS: 1.11.2

Pods/Local Podspecs/RxBluetoothKit.podspec.json

Lines changed: 43 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Manifest.lock

Lines changed: 14 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)