Skip to content

Commit 855618d

Browse files
authored
Merge pull request #86 from Guerrix/feature/FixRxSwift6Support
Add Support to RxSwift 6.1
2 parents 8dacb02 + 0016dd7 commit 855618d

5 files changed

Lines changed: 12 additions & 12 deletions

File tree

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
build-and-test:
44
macos:
5-
xcode: "11.4.0"
5+
xcode: "12.3.0"
66

77
steps:
88
- checkout

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" ~> 6.0.0
1+
github "ReactiveX/RxSwift" ~> 6.0

Cartfile.resolved

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

Demo/Podfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PODS:
22
- Nimble (9.0.0)
3-
- "NSObject+Rx (5.1.0)":
4-
- RxSwift (~> 6.0.0)
5-
- Quick (3.0.0)
6-
- RxSwift (6.0.0)
3+
- "NSObject+Rx (5.2.0)":
4+
- RxSwift (~> 6.0)
5+
- Quick (3.1.2)
6+
- RxSwift (6.1.0)
77

88
DEPENDENCIES:
99
- Nimble
@@ -23,10 +23,10 @@ EXTERNAL SOURCES:
2323

2424
SPEC CHECKSUMS:
2525
Nimble: 3b4ec3fd40f1dc178058e0981107721c615643d8
26-
"NSObject+Rx": d6db7585604967c8b2f754373eb3273b87a40328
27-
Quick: 6d9559f40647bc4d510103842ef2fdd882d753e2
28-
RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295
26+
"NSObject+Rx": d5aeadd891914d6e72765cd56421b4a6bcf8fdad
27+
Quick: 60f0ea3b8e0cfc0df3259a5c06a238ad8b3c46e0
28+
RxSwift: a834e5c538e89eca0cae86f403f4fbf0336786ce
2929

3030
PODFILE CHECKSUM: 4f420ecd33a82075e360098bbed0ccaadfeb1728
3131

32-
COCOAPODS: 1.9.1
32+
COCOAPODS: 1.10.1

NSObject+Rx.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
1919
s.source = { :git => "https://github.com/RxSwiftCommunity/NSObject-Rx.git", :tag => s.version }
2020
s.source_files = %w(NSObject+Rx.swift HasDisposeBag.swift)
2121
s.frameworks = "Foundation"
22-
s.dependency 'RxSwift', '~> 6.0.0'
22+
s.dependency 'RxSwift', '~> 6.0'
2323
end

0 commit comments

Comments
 (0)