Skip to content

Commit 1d70d9a

Browse files
authored
Merge pull request #85 from jinsu3758/master
add RxSwift6 support
2 parents 3dc3007 + 0b79e5a commit 1d70d9a

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

Cartfile

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

Cartfile.resolved

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

Demo/Podfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PODS:
2-
- Nimble (8.0.7)
2+
- Nimble (9.0.0)
33
- "NSObject+Rx (5.1.0)":
4-
- RxSwift (~> 5.1)
5-
- Quick (2.2.0)
6-
- RxSwift (5.1.1)
4+
- RxSwift (~> 6.0.0)
5+
- Quick (3.0.0)
6+
- RxSwift (6.0.0)
77

88
DEPENDENCIES:
99
- Nimble
@@ -22,10 +22,10 @@ EXTERNAL SOURCES:
2222
:path: "../"
2323

2424
SPEC CHECKSUMS:
25-
Nimble: a73af6ecd4c9106f434f3d55fc54570be3739e0b
26-
"NSObject+Rx": fa6bbcc1ab1faa06b01466bc09b1e0692bbc5946
27-
Quick: 7fb19e13be07b5dfb3b90d4f9824c855a11af40e
28-
RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178
25+
Nimble: 3b4ec3fd40f1dc178058e0981107721c615643d8
26+
"NSObject+Rx": d6db7585604967c8b2f754373eb3273b87a40328
27+
Quick: 6d9559f40647bc4d510103842ef2fdd882d753e2
28+
RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295
2929

3030
PODFILE CHECKSUM: 4f420ecd33a82075e360098bbed0ccaadfeb1728
3131

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', '~> 5.1'
22+
s.dependency 'RxSwift', '~> 6.0.0'
2323
end

Package.resolved

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

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import PackageDescription
44
let package = Package(
55
name: "NSObject-Rx",
66
platforms: [
7-
.iOS(.v8),
7+
.iOS(.v9),
88
.macOS(.v10_14)
99
],
1010
products: [
1111
.library(name: "NSObject-Rx", targets: ["NSObject-Rx"]),
1212
],
1313
dependencies: [
14-
.package(url: "https://github.com/ReactiveX/RxSwift", from: "5.1.1"),
14+
.package(url: "https://github.com/ReactiveX/RxSwift", from: "6.0.0"),
1515
],
1616
targets: [
1717
.target(

0 commit comments

Comments
 (0)