Skip to content

Commit

Permalink
Merge pull request #44 from Econa77/feature/rxswift-6
Browse files Browse the repository at this point in the history
Add support for RxSwift 6
  • Loading branch information
fassko authored Jan 14, 2021
2 parents eb9fe8d + 19d96ca commit 91985b8
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "ReactiveX/RxSwift" ~> 5.1
github "ReactiveX/RxSwift" ~> 6.0

2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" "5.1.1"
github "ReactiveX/RxSwift" "6.0.0"
8 changes: 4 additions & 4 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ use_frameworks!

target 'RxAnimated_Example' do

pod 'RxSwift', '~> 5.1.0'
pod 'RxCocoa', '~> 5.1.0'
pod 'RxSwift', '~> 6.0.0'
pod 'RxCocoa', '~> 6.0.0'
pod 'RxAnimated', :path => '../'

end

target 'RxAnimated-Example-AppleTV' do

pod 'RxSwift', '~> 5.1.0'
pod 'RxCocoa', '~> 5.1.0'
pod 'RxSwift', '~> 6.0.0'
pod 'RxCocoa', '~> 6.0.0'
pod 'RxAnimated', :path => '../'

end
36 changes: 18 additions & 18 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
PODS:
- RxAnimated (0.8.1):
- RxAnimated/Core (= 0.8.1)
- RxCocoa (~> 5.1)
- RxSwift (~> 5.1)
- RxCocoa (~> 6.0)
- RxSwift (~> 6.0)
- RxAnimated/Core (0.8.1):
- RxCocoa (~> 5.1)
- RxSwift (~> 5.1)
- RxCocoa (5.1.1):
- RxRelay (~> 5)
- RxSwift (~> 5)
- RxRelay (5.1.1):
- RxSwift (~> 5)
- RxSwift (5.1.1)
- RxCocoa (~> 6.0)
- RxSwift (~> 6.0)
- RxCocoa (6.0.0):
- RxRelay (= 6.0.0)
- RxSwift (= 6.0.0)
- RxRelay (6.0.0):
- RxSwift (= 6.0.0)
- RxSwift (6.0.0)

DEPENDENCIES:
- RxAnimated (from `../`)
- RxCocoa (~> 5.1.0)
- RxSwift (~> 5.1.0)
- RxCocoa (~> 6.0.0)
- RxSwift (~> 6.0.0)

SPEC REPOS:
trunk:
Expand All @@ -29,11 +29,11 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
RxAnimated: 5181b7b8369e8cb7ecd66d91110d84f1bb0edb64
RxCocoa: 32065309a38d29b5b0db858819b5bf9ef038b601
RxRelay: d77f7d771495f43c556cbc43eebd1bb54d01e8e9
RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178
RxAnimated: 438f2f3882b221bd6fd5942fde149135a550ea75
RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e
RxRelay: 8d593be109c06ea850df027351beba614b012ffb
RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295

PODFILE CHECKSUM: 0fde4b5914dec89a7a84760211a9ae5223a647e6
PODFILE CHECKSUM: 7d22d4ad81fb04dc7cf36be978beb43332a3b5d0

COCOAPODS: 1.9.1
COCOAPODS: 1.10.0
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
"state": {
"branch": null,
"revision": "c1bd31b397d87a54467af4161dde9d6b27720c19",
"version": "5.1.0"
"revision": "c8742ed97fc2f0c015a5ea5eddefb064cd7532d2",
"version": "6.0.0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ let package = Package(
.library(name: "RxCocoaRuntime", targets: ["RxAnimated"]),
],
dependencies: [
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.1.1")),
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.0.0")),
],
targets: [
.target(
Expand Down
4 changes: 2 additions & 2 deletions RxAnimated.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ Pod::Spec.new do |s|
# end

s.frameworks = 'UIKit'
s.dependency 'RxSwift', '~> 5.1'
s.dependency 'RxCocoa', '~> 5.1'
s.dependency 'RxSwift', '~> 6.0'
s.dependency 'RxCocoa', '~> 6.0'

s.swift_version = "5.2"

Expand Down

0 comments on commit 91985b8

Please sign in to comment.