Skip to content

Commit 8c31c03

Browse files
mlight3kzaher
authored andcommitted
- Apply latest RxSwift 4.0 branch
- Change deprecated function
1 parent cf78673 commit 8c31c03

File tree

98 files changed

+3205
-3248
lines changed

Some content is hidden

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

98 files changed

+3205
-3248
lines changed

Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ platform :ios, '8.0'
22
use_frameworks!
33

44
def common
5-
pod 'RxSwift', :git => '[email protected]:ReactiveX/RxSwift.git', :branch => 'swift4.0'
6-
pod 'RxCocoa', :git => '[email protected]:ReactiveX/RxSwift.git', :branch => 'swift4.0'
5+
pod 'RxSwift', :git => '[email protected]:ReactiveX/RxSwift.git', :branch => 'rxswift4.0-swift4.0'
6+
pod 'RxCocoa', :git => '[email protected]:ReactiveX/RxSwift.git', :branch => 'rxswift4.0-swift4.0'
77
end
88

99
target 'RxDataSources' do

Podfile.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
PODS:
2-
- RxCocoa (4.0.0-alpha.0):
3-
- RxSwift (~> 4.0.0-alpha.0)
4-
- RxSwift (4.0.0-alpha.0)
2+
- RxCocoa (4.0.0-beta.0):
3+
- RxSwift (~> 4.0.0-beta.0)
4+
- RxSwift (4.0.0-beta.0)
55

66
DEPENDENCIES:
7-
- RxCocoa (from `[email protected]:ReactiveX/RxSwift.git`, branch `swift4.0`)
8-
- RxSwift (from `[email protected]:ReactiveX/RxSwift.git`, branch `swift4.0`)
7+
- RxCocoa (from `[email protected]:ReactiveX/RxSwift.git`, branch `rxswift4.0-swift4.0`)
8+
- RxSwift (from `[email protected]:ReactiveX/RxSwift.git`, branch `rxswift4.0-swift4.0`)
99

1010
EXTERNAL SOURCES:
1111
RxCocoa:
12-
:branch: swift4.0
12+
:branch: rxswift4.0-swift4.0
1313
:git: [email protected]:ReactiveX/RxSwift.git
1414
RxSwift:
15-
:branch: swift4.0
15+
:branch: rxswift4.0-swift4.0
1616
:git: [email protected]:ReactiveX/RxSwift.git
1717

1818
CHECKOUT OPTIONS:
1919
RxCocoa:
20-
:commit: 9fc634c07a2842c93e483c1f5284b23dbb83d705
20+
:commit: cb0fb3bda41f2a5622909b6e6deafd435efaf859
2121
:git: [email protected]:ReactiveX/RxSwift.git
2222
RxSwift:
23-
:commit: 9fc634c07a2842c93e483c1f5284b23dbb83d705
23+
:commit: cb0fb3bda41f2a5622909b6e6deafd435efaf859
2424
:git: [email protected]:ReactiveX/RxSwift.git
2525

2626
SPEC CHECKSUMS:
27-
RxCocoa: d57cc4a5b88c5179b3ca7fe30d0ab0d928e886ff
28-
RxSwift: 6946957e4e99243ea7c9bba38afa06b1363b0048
27+
RxCocoa: f2dff5e6b6a40f842867ec5915f449e1c3af563a
28+
RxSwift: cafebeafadc860ca27a2f3fb3760a8bb8663f6ef
2929

30-
PODFILE CHECKSUM: dd653991f55ded635124ebca59abede8af193ba5
30+
PODFILE CHECKSUM: 9036f79696b4d9746e08f5f31372797f0ae90cba
3131

32-
COCOAPODS: 1.2.1
32+
COCOAPODS: 1.3.1

Pods/Local Podspecs/RxCocoa.podspec.json

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

Pods/Local Podspecs/RxSwift.podspec.json

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

Pods/Manifest.lock

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

0 commit comments

Comments
 (0)