Skip to content

Commit 733a8d5

Browse files
committed
Update pod spec to support Xcode 9.0 & Swift 4.0
1 parent 6abd872 commit 733a8d5

File tree

395 files changed

+14967
-8904
lines changed

Some content is hidden

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

395 files changed

+14967
-8904
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,4 @@ Carthage/Checkouts
4343
Carthage/Build
4444

4545
.DS_Store
46+
**/.idea/**

RxAlamofire.podspec

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = 'RxAlamofire'
33

4-
s.version = '3.0.3'
4+
s.version = '4.0.0'
55
s.license = 'MIT'
66
s.summary = 'RxSwift wrapper around the elegant HTTP networking in Swift Alamofire'
77
s.homepage = 'https://github.com/RxSwiftCommunity/RxAlamofire'
@@ -19,14 +19,14 @@ Pod::Spec.new do |s|
1919

2020
s.subspec "Core" do |ss|
2121
ss.source_files = "Sources/*.swift"
22-
ss.dependency "RxSwift", "~> 3.0"
23-
ss.dependency "Alamofire", "~> 4.0"
22+
ss.dependency "RxSwift", '~> 4.0.0-beta.0'
23+
ss.dependency "Alamofire", '~> 4.5.1'
2424
ss.framework = "Foundation"
2525
end
2626

2727
s.subspec "RxCocoa" do |ss|
2828
ss.source_files = "Sources/Cocoa/*.swift"
29-
ss.dependency "RxCocoa", "~> 3.0"
29+
ss.dependency "RxCocoa", '~> 4.0.0-alpha.1'
3030
ss.dependency "RxAlamofire/Core"
3131
end
3232

RxAlamofire/Podfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ source 'https://github.com/CocoaPods/Specs.git'
33
use_frameworks!
44

55
def common
6-
pod 'Alamofire', '~> 4.0'
7-
pod 'RxSwift', :git => 'https://github.com/ReactiveX/RxSwift.git', :branch => 'master'
8-
pod 'RxCocoa', :git => 'https://github.com/ReactiveX/RxSwift.git', :branch => 'master'
6+
pod 'Alamofire', '~> 4.5.1'
7+
pod 'RxSwift', :git => 'https://github.com/ReactiveX/RxSwift.git', :tag => '4.0.0-beta.0'
8+
pod 'RxCocoa', :git => 'https://github.com/ReactiveX/RxSwift.git', :tag => '4.0.0-alpha.1'
99
end
1010

1111
target 'RxAlamofire-iOS-Example' do
@@ -26,7 +26,7 @@ target 'RxAlamofireTests' do
2626
common
2727
pod 'OHHTTPStubs', '~> 5.0'
2828
pod 'OHHTTPStubs/Swift', '~> 5.0'
29-
pod 'RxBlocking', :git => 'https://github.com/ReactiveX/RxSwift.git', :branch => 'master'
29+
pod 'RxBlocking', :git => 'https://github.com/ReactiveX/RxSwift.git', :tag => '4.0.0-beta.0'
3030
end
3131

3232
target 'RxAlamofire-tvOS' do

RxAlamofire/Podfile.lock

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- Alamofire (4.0.1)
2+
- Alamofire (4.5.1)
33
- OHHTTPStubs (5.2.2):
44
- OHHTTPStubs/Default (= 5.2.2)
55
- OHHTTPStubs/Core (5.2.2)
@@ -15,49 +15,49 @@ PODS:
1515
- OHHTTPStubs/OHPathHelpers (5.2.2)
1616
- OHHTTPStubs/Swift (5.2.2):
1717
- OHHTTPStubs/Core
18-
- RxBlocking (3.0.0):
19-
- RxSwift (~> 3.0)
20-
- RxCocoa (3.0.0):
21-
- RxSwift (~> 3.0)
22-
- RxSwift (3.0.0)
18+
- RxBlocking (4.0.0-beta.0):
19+
- RxSwift (~> 4.0.0-beta.0)
20+
- RxCocoa (4.0.0-alpha.1):
21+
- RxSwift (~> 4.0.0-alpha.1)
22+
- RxSwift (4.0.0-beta.0)
2323

2424
DEPENDENCIES:
25-
- Alamofire (~> 4.0)
25+
- Alamofire (~> 4.5.1)
2626
- OHHTTPStubs (~> 5.0)
2727
- OHHTTPStubs/Swift (~> 5.0)
28-
- RxBlocking (from `https://github.com/ReactiveX/RxSwift.git`, branch `master`)
29-
- RxCocoa (from `https://github.com/ReactiveX/RxSwift.git`, branch `master`)
30-
- RxSwift (from `https://github.com/ReactiveX/RxSwift.git`, branch `master`)
28+
- RxBlocking (from `https://github.com/ReactiveX/RxSwift.git`, tag `4.0.0-beta.0`)
29+
- RxCocoa (from `https://github.com/ReactiveX/RxSwift.git`, tag `4.0.0-alpha.1`)
30+
- RxSwift (from `https://github.com/ReactiveX/RxSwift.git`, tag `4.0.0-beta.0`)
3131

3232
EXTERNAL SOURCES:
3333
RxBlocking:
34-
:branch: master
3534
:git: https://github.com/ReactiveX/RxSwift.git
35+
:tag: 4.0.0-beta.0
3636
RxCocoa:
37-
:branch: master
3837
:git: https://github.com/ReactiveX/RxSwift.git
38+
:tag: 4.0.0-alpha.1
3939
RxSwift:
40-
:branch: master
4140
:git: https://github.com/ReactiveX/RxSwift.git
41+
:tag: 4.0.0-beta.0
4242

4343
CHECKOUT OPTIONS:
4444
RxBlocking:
45-
:commit: 3c55a309a24fbe3dbc480431798eec072b633b85
4645
:git: https://github.com/ReactiveX/RxSwift.git
46+
:tag: 4.0.0-beta.0
4747
RxCocoa:
48-
:commit: 3c55a309a24fbe3dbc480431798eec072b633b85
4948
:git: https://github.com/ReactiveX/RxSwift.git
49+
:tag: 4.0.0-alpha.1
5050
RxSwift:
51-
:commit: 3c55a309a24fbe3dbc480431798eec072b633b85
5251
:git: https://github.com/ReactiveX/RxSwift.git
52+
:tag: 4.0.0-beta.0
5353

5454
SPEC CHECKSUMS:
55-
Alamofire: 7682d43245de14874acd142ec137b144aa1dd335
55+
Alamofire: 2d95912bf4c34f164fdfc335872e8c312acaea4a
5656
OHHTTPStubs: 34d9d0994e64fcf8552dbfade5ce82ada913ee31
57-
RxBlocking: 46acc259c6249f926aff064cbf14c0d98063ee6f
58-
RxCocoa: eb3f8b6ded51036148f05ec223e22c893f4421b1
59-
RxSwift: 931443655decc4aec2ff4e4197bf1720c2d49c57
57+
RxBlocking: 85f1761ea288ccfbd935012c9db5d88e2aeea1ed
58+
RxCocoa: 2eb5f5d79668c61de6c32b636c2a1101a0ba3ca9
59+
RxSwift: cafebeafadc860ca27a2f3fb3760a8bb8663f6ef
6060

61-
PODFILE CHECKSUM: 8e614a0a2d749288f73cfc02fadf76f6cdafa791
61+
PODFILE CHECKSUM: 3ab506c74133643ff1a9a531a1ea2e83e316a64a
6262

63-
COCOAPODS: 1.1.1
63+
COCOAPODS: 1.3.1

RxAlamofire/Pods/Alamofire/LICENSE

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)