Merge branch 'develop'

osorioabel · Aug 8, 2016 · ff3469f · ff3469f
2 parents 8b37379 + a1784bb
commit ff3469f
Show file tree

Hide file tree

Showing 15 changed files with 975 additions and 4 deletions.
diff --git a/Podfile b/Podfile
@@ -5,4 +5,7 @@ target 'RxTutorials' do
     pod 'RxCocoa'
     pod 'RxDataSources'
     pod 'ChameleonFramework/Swift'
+    pod 'ObjectMapper'
+    pod 'RxAlamofire'
+    pod 'AlamofireNetworkActivityIndicator'
 end
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,7 +1,16 @@
 PODS:
+  - Alamofire (3.4.1)
+  - AlamofireNetworkActivityIndicator (1.0.1):
+    - Alamofire (~> 3.3)
   - ChameleonFramework/Default (2.1.0)
   - ChameleonFramework/Swift (2.1.0):
     - ChameleonFramework/Default
+  - ObjectMapper (1.3.0)
+  - RxAlamofire (2.5):
+    - RxAlamofire/Core (= 2.5)
+  - RxAlamofire/Core (2.5):
+    - Alamofire (~> 3.4)
+    - RxSwift (~> 2.5)
   - RxCocoa (2.6.0):
     - RxSwift (~> 2.5)
   - RxDataSources (0.9):
@@ -10,17 +19,24 @@ PODS:
   - RxSwift (2.6.0)
 
 DEPENDENCIES:
+  - AlamofireNetworkActivityIndicator
   - ChameleonFramework/Swift
+  - ObjectMapper
+  - RxAlamofire
   - RxCocoa
   - RxDataSources
   - RxSwift
 
 SPEC CHECKSUMS:
+  Alamofire: 01a82e2f6c0f860ade35534c8dd88be61bdef40c
+  AlamofireNetworkActivityIndicator: 49a6e39afb947136f7b1872bae2d684957c26697
   ChameleonFramework: d21a3cc247abfe5e37609a283a8238b03575cf64
+  ObjectMapper: 4eb08a726e9791a93b2632049951b56a7c17e471
+  RxAlamofire: b4572a077b6b2410c8732a27266299df4c00736e
   RxCocoa: 89ab00d5753502520227940e3a0e0a0413683c6b
   RxDataSources: e169bba94a7be584df7c1e1487fa56edc8753ae6
   RxSwift: 77f3a0b15324baa7a1c9bfa9f199648a82424e26
 
-PODFILE CHECKSUM: eddc4457677bde2bc3f6299c3462d1de50e45772
+PODFILE CHECKSUM: acdb8030ddfcf2a95ba2376b3f556d7e1aa82091
 
 COCOAPODS: 1.0.0