Skip to content

Commit

Permalink
Merge pull request #2 from Tj3n/test
Browse files Browse the repository at this point in the history
Test
  • Loading branch information
Tj3n committed Jan 18, 2016
2 parents 94fe6ea + cf926f0 commit 4d3f9d8
Show file tree
Hide file tree
Showing 22 changed files with 3,789 additions and 1,385 deletions.
6 changes: 5 additions & 1 deletion icndb/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ use_frameworks!

pod 'Alamofire', '~> 3.0'
pod 'RealmSwift'
pod 'Moya'
pod 'Moya'
pod 'SwiftyJSON'
pod 'RxSwift', '~> 2.0.0-beta'
pod 'RxCocoa', '~> 2.0.0-beta'
pod 'RxBlocking', '~> 2.0.0-beta'
14 changes: 14 additions & 0 deletions icndb/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,31 @@ PODS:
- RealmSwift (0.97.0):
- Realm (= 0.97.0)
- Result (1.0.1)
- RxBlocking (2.0.0):
- RxSwift (~> 2.0)
- RxCocoa (2.0.0):
- RxSwift (~> 2.0)
- RxSwift (2.0.0)
- SwiftyJSON (2.3.2)

DEPENDENCIES:
- Alamofire (~> 3.0)
- Moya
- RealmSwift
- RxBlocking (~> 2.0.0-beta)
- RxCocoa (~> 2.0.0-beta)
- RxSwift (~> 2.0.0-beta)
- SwiftyJSON

SPEC CHECKSUMS:
Alamofire: fbc829692f351fa1d8a31dd75fd7f7f56fea31fb
Moya: 9bd9f20e6451c820c17ca40e1b3f6489757fa821
Realm: b498a6fb9d288b171ff98d0e2d4384c295be8990
RealmSwift: d014810dec75c9a3f1a33926d2dabfed855c582c
Result: caef80340451e1f07492fa1e89117f83613bce24
RxBlocking: a95a10ed54eb5d116f6c9a87047ff671e181d07b
RxCocoa: b0ebd70b4f7450bdb3c8987b122f8fd568dc1e2f
RxSwift: d83246efa6f16c50c143bec134649d045498f601
SwiftyJSON: 04ccea08915aa0109039157c7974cf0298da292a

COCOAPODS: 0.39.0
14 changes: 14 additions & 0 deletions icndb/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4,106 changes: 2,814 additions & 1,292 deletions icndb/Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

77 changes: 77 additions & 0 deletions icndb/Pods/Target Support Files/Pods/Pods-acknowledgements.plist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions icndb/Pods/Target Support Files/Pods/Pods-frameworks.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions icndb/Pods/Target Support Files/Pods/Pods.debug.xcconfig

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions icndb/Pods/Target Support Files/Pods/Pods.release.xcconfig

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4d3f9d8

Please sign in to comment.