diff --git a/LeadKit.podspec b/LeadKit.podspec index ac60ff01..a7e60106 100644 --- a/LeadKit.podspec +++ b/LeadKit.podspec @@ -79,7 +79,7 @@ Pod::Spec.new do |s| ss.dependency "CocoaLumberjack/Swift", '~> 3.1.0' ss.dependency "RxSwift", '4.0.0-beta.0' ss.dependency "RxCocoa", '4.0.0-beta.0' - ss.dependency "RxAlamofire", :git => 'https://github.com/RxSwiftCommunity/RxAlamofire.git', :commit => 'c2fdccf8058d1a61f5fbb540054c21372de1151d' + ss.dependency "RxAlamofire", :git => 'https://github.com/RxSwiftCommunity/RxAlamofire.git', :branch => 'master', :commit => 'c2fdccf8058d1a61f5fbb540054c21372de1151d' ss.dependency "ObjectMapper", '~> 3.0.0' ss.ios.dependency "TableKit", '~> 2.5.0' @@ -101,7 +101,7 @@ Pod::Spec.new do |s| ss.dependency "CocoaLumberjack/Swift", '~> 3.1.0' ss.dependency "RxSwift", '4.0.0-beta.0' ss.dependency "RxCocoa", '4.0.0-beta.0' - ss.dependency "RxAlamofire", :git => 'https://github.com/RxSwiftCommunity/RxAlamofire.git', :commit => 'c2fdccf8058d1a61f5fbb540054c21372de1151d' + ss.dependency "RxAlamofire", :git => 'https://github.com/RxSwiftCommunity/RxAlamofire.git', :branch => 'master', :commit => 'c2fdccf8058d1a61f5fbb540054c21372de1151d' ss.dependency "ObjectMapper", '~> 3.0.0' end diff --git a/Podfile b/Podfile index 05915ba9..48ab2d1c 100644 --- a/Podfile +++ b/Podfile @@ -2,7 +2,7 @@ abstract_target 'LeadKit' do pod "CocoaLumberjack/Swift", '~> 3.1.0' pod "RxSwift", '4.0.0-beta.0' pod "RxCocoa", '4.0.0-beta.0' - pod "RxAlamofire", :git => 'https://github.com/RxSwiftCommunity/RxAlamofire.git', :commit => 'c2fdccf8058d1a61f5fbb540054c21372de1151d' + pod "RxAlamofire", :git => 'https://github.com/RxSwiftCommunity/RxAlamofire.git', :branch => 'master', :commit => 'c2fdccf8058d1a61f5fbb540054c21372de1151d' pod "ObjectMapper", '~> 3.0.0' inhibit_all_warnings! diff --git a/Podfile.lock b/Podfile.lock index 9a81e0fd..e8e815fb 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -18,7 +18,7 @@ PODS: DEPENDENCIES: - CocoaLumberjack/Swift (~> 3.1.0) - ObjectMapper (~> 3.0.0) - - RxAlamofire (from `https://github.com/RxSwiftCommunity/RxAlamofire.git`, commit `c2fdccf8058d1a61f5fbb540054c21372de1151d`) + - RxAlamofire (from `https://github.com/RxSwiftCommunity/RxAlamofire.git`, commit `c2fdccf8058d1a61f5fbb540054c21372de1151d`, branch `master`) - RxCocoa (= 4.0.0-beta.0) - RxSwift (= 4.0.0-beta.0) - TableKit (~> 2.5.0) @@ -26,6 +26,7 @@ DEPENDENCIES: EXTERNAL SOURCES: RxAlamofire: + :branch: master :commit: c2fdccf8058d1a61f5fbb540054c21372de1151d :git: https://github.com/RxSwiftCommunity/RxAlamofire.git @@ -44,6 +45,6 @@ SPEC CHECKSUMS: TableKit: 42d4dff2944f273cdeec2ef6352064eb6a9a355b UIScrollView-InfiniteScroll: a90df4ba4a7ca1926128ade34a850ddbdf74c564 -PODFILE CHECKSUM: c23a86e5adf05dabfc4d378f98a2fd90a58ad753 +PODFILE CHECKSUM: 7dc5da62d5fcaacd2ad35126235ca1fbf9c0aab8 COCOAPODS: 1.3.1