From 1bb90eed9385a4a047175936056cbf740d06ddc1 Mon Sep 17 00:00:00 2001 From: Grigory Ulanov Date: Fri, 12 Aug 2016 10:45:47 +0300 Subject: [PATCH 1/5] Dependencies fixed --- Cartfile | 7 ++++--- LeadKit.podspec | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Cartfile b/Cartfile index cbb1351a..f17f09a3 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,4 @@ -github "CocoaLumberjack/CocoaLumberjack" -github "ReactiveX/RxSwift" -github "lyft/mapper" \ No newline at end of file +github "CocoaLumberjack/CocoaLumberjack" ~> 2.2 +github "ReactiveX/RxSwift" ~> 2.6 +github "lyft/mapper" ~> 3.0 +github "Alamofire/Alamofire" ~> 3.4 \ No newline at end of file diff --git a/LeadKit.podspec b/LeadKit.podspec index 9a7daa08..45579ac3 100644 --- a/LeadKit.podspec +++ b/LeadKit.podspec @@ -11,5 +11,9 @@ Pod::Spec.new do |s| s.source_files = "LeadKit/LeadKit/**/*.swift" s.dependency "CocoaLumberjack/Swift", '~> 2.2' - s.dependency "AlamofireObjectMapper", '~> 3.0' + s.dependency "ModelMapper", '~> 3.0' + s.dependency "RxSwift", '~> 2.6' + s.dependency "Alamofire", '~> 3.4' + + end From 063dab5f6bc29d778f1354b28509c3e56522c8c6 Mon Sep 17 00:00:00 2001 From: Grigory Ulanov Date: Fri, 12 Aug 2016 10:47:00 +0300 Subject: [PATCH 2/5] remove empty lines --- LeadKit.podspec | 2 -- 1 file changed, 2 deletions(-) diff --git a/LeadKit.podspec b/LeadKit.podspec index 45579ac3..c44c737c 100644 --- a/LeadKit.podspec +++ b/LeadKit.podspec @@ -14,6 +14,4 @@ Pod::Spec.new do |s| s.dependency "ModelMapper", '~> 3.0' s.dependency "RxSwift", '~> 2.6' s.dependency "Alamofire", '~> 3.4' - - end From 5f7a762ee12d2224a53edaae537a7523783100ea Mon Sep 17 00:00:00 2001 From: Grigory Ulanov Date: Fri, 12 Aug 2016 11:37:51 +0300 Subject: [PATCH 3/5] RxCocoa added --- LeadKit.podspec | 1 + 1 file changed, 1 insertion(+) diff --git a/LeadKit.podspec b/LeadKit.podspec index c44c737c..437e88a1 100644 --- a/LeadKit.podspec +++ b/LeadKit.podspec @@ -13,5 +13,6 @@ Pod::Spec.new do |s| s.dependency "CocoaLumberjack/Swift", '~> 2.2' s.dependency "ModelMapper", '~> 3.0' s.dependency "RxSwift", '~> 2.6' + s.dependency "RxCocoa", '~> 2.6' s.dependency "Alamofire", '~> 3.4' end From 1df07a49aefeb8cff3078f37fd0371b90729e29c Mon Sep 17 00:00:00 2001 From: Grigory Ulanov Date: Fri, 12 Aug 2016 11:44:00 +0300 Subject: [PATCH 4/5] RxAlamofire added --- Cartfile | 3 ++- LeadKit.podspec | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Cartfile b/Cartfile index f17f09a3..c0738da1 100644 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1,5 @@ github "CocoaLumberjack/CocoaLumberjack" ~> 2.2 github "ReactiveX/RxSwift" ~> 2.6 github "lyft/mapper" ~> 3.0 -github "Alamofire/Alamofire" ~> 3.4 \ No newline at end of file +github "Alamofire/Alamofire" ~> 3.4 +github "RxSwiftCommunity/RxAlamofire" ~> 1.1 \ No newline at end of file diff --git a/LeadKit.podspec b/LeadKit.podspec index 437e88a1..fa45988b 100644 --- a/LeadKit.podspec +++ b/LeadKit.podspec @@ -15,4 +15,5 @@ Pod::Spec.new do |s| s.dependency "RxSwift", '~> 2.6' s.dependency "RxCocoa", '~> 2.6' s.dependency "Alamofire", '~> 3.4' + s.dependency "RxAlamofire", '~> 1.1' end From e23573e9044458e5f4719fbebb14239e361a0bda Mon Sep 17 00:00:00 2001 From: Grigory Ulanov Date: Fri, 12 Aug 2016 12:18:59 +0300 Subject: [PATCH 5/5] submodules removed --- .gitmodules | 3 - Cartfile.resolved | 2 + LeadKit/.DS_Store | Bin 0 -> 6148 bytes LeadKit/LeadKit.xcodeproj/project.pbxproj | 82 +++++++----------- .../AlamofireManager+Extensions.swift | 1 + .../AlamofireRequest+Extensions.swift | 1 + 6 files changed, 33 insertions(+), 56 deletions(-) delete mode 100644 .gitmodules create mode 100644 LeadKit/.DS_Store diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 36499afe..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "LeadKit/RxAlamofire"] - path = LeadKit/RxAlamofire - url = https://github.com/RxSwiftCommunity/RxAlamofire diff --git a/Cartfile.resolved b/Cartfile.resolved index 58eb60c9..add1c1a2 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,5 @@ +github "Alamofire/Alamofire" "3.4.1" github "CocoaLumberjack/CocoaLumberjack" "2.3.0" github "ReactiveX/RxSwift" "2.6.0" github "lyft/mapper" "3.0.0" +github "RxSwiftCommunity/RxAlamofire" "1.2" diff --git a/LeadKit/.DS_Store b/LeadKit/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ff34d0557148e086cf7266146c6336d809da14ba GIT binary patch literal 6148 zcmeHKJ5B>J5Pd^ZM50NkD18E?lys}GRM6!DplrlPtagPGiE>ZJ1#$yU!kZZ(ZKz=TCnw9#Yg?j1VIlgC7{HSX|&4X*HkRnJ0y(WQHz z;T~%|qQde18}`>|@s0+sZ%^~(s;OH)!q@dMR^60kwcSvQ-LAYa?tpLAO?6=1d=6!` z&qq5H{XN4%flwe62n9lcUIiGl)h6eTQHKJdKqzofK<|gdqF7|?9PR30WhnqrpV4M) z+uM_v)IlsVc8>JW#HmE5N=`Av>GY>OugKUrIvtXe56NHNColV#uOyoeDIB8?1ww&S z1xDVTYW%