forked from haxpor/Potatso
-
Notifications
You must be signed in to change notification settings - Fork 13
/
Podfile.lock.rej
135 lines (131 loc) · 4.92 KB
/
Podfile.lock.rej
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
diff a/Podfile.lock b/Podfile.lock (rejected hunks)
@@ -24,17 +24,17 @@ PODS:
- CocoaLumberjack/Default
- CocoaLumberjack/Swift (3.0.0):
- CocoaLumberjack/Extensions
- - Crashlytics (3.7.3):
- - Fabric (~> 1.6.3)
+ - Crashlytics (3.9.3):
+ - Fabric (~> 1.7.2)
- Eureka (1.6.0)
- - Fabric (1.6.8)
+ - Fabric (1.7.2)
- Fuzi (1.0.0)
- Helpshift (5.6.1)
- - ICDMaterialActivityIndicatorView (0.1.2)
+ - ICDMaterialActivityIndicatorView (0.1.3)
- ICSMainFramework (0.0.1)
- ICSPullToRefresh (0.6)
- ISO8601DateFormatter (0.8)
- - KeychainAccess (3.0.1)
+ - KeychainAccess (3.1.0)
- KissXML (5.1.2):
- KissXML/Core (= 5.1.2)
- KissXML/Core (5.1.2)
@@ -50,16 +50,16 @@ PODS:
- CocoaLumberjack (~> 3.0)
- LogglyLogger-CocoaLumberjack/Logger (3.0.0):
- CocoaLumberjack (~> 3.0)
- - MBProgressHUD (1.0.0)
+ - MBProgressHUD (1.1.0)
- MMWormhole (2.0.0):
- MMWormhole/Core (= 2.0.0)
- MMWormhole/Core (2.0.0)
- - Moya (9.0.0):
- - Moya/Core (= 9.0.0)
- - Moya/Core (9.0.0):
+ - Moya (10.0.1):
+ - Moya/Core (= 10.0.1)
+ - Moya/Core (10.0.1):
- Alamofire (~> 4.1)
- Result (~> 3.0)
- - ObjectMapper (2.2.2)
+ - ObjectMapper (3.1.0)
- PKHUD (4.2.3)
- PlainPing (0.4)
- PSOperations (3.0.0):
@@ -71,14 +71,14 @@ PODS:
- PSOperations/Core
- PSOperations/Passbook (3.0.0):
- PSOperations/Core
- - Realm (2.1.1):
- - Realm/Headers (= 2.1.1)
- - Realm/Headers (2.1.1)
- - RealmSwift (2.1.1):
- - Realm (= 2.1.1)
+ - Realm (3.0.2):
+ - Realm/Headers (= 3.0.2)
+ - Realm/Headers (3.0.2)
+ - RealmSwift (3.0.2):
+ - Realm (= 3.0.2)
- Result (3.2.4)
- Reveal-iOS-SDK (1.6.2)
- - SwiftColor (0.4.0)
+ - SwiftColor (0.6.0)
DEPENDENCIES:
- Alamofire
@@ -118,45 +118,52 @@ EXTERNAL SOURCES:
:path: "./Library/Aspects/"
CallbackURLKit:
:path: "./Library/CallbackURLKit"
+ Cartography:
+ :git: https://github.com/corujautx/Cartography.git
Eureka:
:path: "./Library/Eureka/"
ICSMainFramework:
:path: "./Library/ICSMainFramework/"
+CHECKOUT OPTIONS:
+ Cartography:
+ :commit: cc950703be0aa2a604edfb6e71cb345bee1861d6
+ :git: https://github.com/corujautx/Cartography.git
+
SPEC CHECKSUMS:
- Alamofire: aa2e09d871c9160ac53c90e83c68064a94e3dfbe
- Appirater: e7c0a47fb67ee5041ce8479e6ba960927fb40264
+ Alamofire: 2d95912bf4c34f164fdfc335872e8c312acaea4a
+ Appirater: 44a4651f7912a17dc906b655f0c215d5bb768b84
Aspects: 35254a4a73948e7bc1118ce0554674f77467a80b
- AsyncSwift: 632138e42ead868b53c745fcde9bf733ce1527ad
+ AsyncSwift: 65775a7b32e740609b24969ece3de58723b9dc3e
CallbackURLKit: 1a56181ef8d6a1491865041b2192dd8c9a364669
- Cartography: c1460e99395b824d9d75360b0382faeb0b33dcd7
+ Cartography: f8c899bb0f5cf20758644a8eea59a75e98a03a5d
CocoaAsyncSocket: a18c75dca4b08723628a0bacca6e94803d90be91
CocoaLumberjack: c823149bccc5519a9447aeb433be7b1212a7d6a5
- Crashlytics: 76f6beaff70acf226139582c09c78461597c2b98
+ Crashlytics: dbb07d01876c171c5ccbdf7826410380189e452c
Eureka: 4c97c804b619c09ccc76b54857a23a1613d0b0ba
- Fabric: 5755268d0171435ab167e3d0878a28a777deaf10
+ Fabric: 9cd6a848efcf1b8b07497e0b6a2e7d336353ba15
Fuzi: e88177b7cfdf3aa2b828c096c73551232a7f5c72
Helpshift: b48366299844f119acf5e91d02a2e89288494fe6
- ICDMaterialActivityIndicatorView: 3f02a9dc9e52417023a98385d631c93d3f95c465
+ ICDMaterialActivityIndicatorView: 52e3f11f27ebf0b53a7bc7725f416b1a182367b6
ICSMainFramework: 56240e9556d3b0755fc9c934a91ee8ebd09cb753
ICSPullToRefresh: a64f102c6558cc34270ea60e99df7c91d1f3d2c0
ISO8601DateFormatter: 4551b6ce4f83185425f583b0b3feb3c7b59b942c
- KeychainAccess: 017ea25e313a49eda10bb19b0bb0760fb1edfe1a
+ KeychainAccess: 94c5540b32eabf7bc32bfb976a268e8ea05fd6da
KissXML: 246c842586bb77110e04fb88e19376d96245c856
LogglyLogger-CocoaLumberjack: 16afad0a63fb70179fda1db85e03aeb3ded7fb02
- MBProgressHUD: 4890f671c94e8a0f3cf959aa731e9de2f036d71a
+ MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
MMWormhole: 0cd3fd35a9118b2e2d762b499f54eeaace0be791
- Moya: cf5e6ee93af526532f92614004b8ad2ea60fd845
- ObjectMapper: 9e385c2295bcc4e16eabbcfc85db801442bba545
+ Moya: 9e621707ff754eeb51ff3ec51a3d54e517c0733a
+ ObjectMapper: 20505058f54e5c3ca69e1d6de9897d152a5369a6
PKHUD: c7692163a09875cbf15827dc581df3c5cf7f1015
PlainPing: 17845ab9e2b41460edc0faa94fd02093fa17d236
PSOperations: 6bc00aac233d9d19b60caced190e6cb8fbcb1dcd
- Realm: a55959c0b171a5fe5267406d17f314fec3cefaae
- RealmSwift: 749fd955bf8d6471c21d218b9389a47aaeccfe3f
+ Realm: 6f23fd1f178a09342eac21bfa7c2bf4312a7a180
+ RealmSwift: 695393add1b8f9d5fa75dd16e6355cf3935f71e2
Result: d2d07204ce72856f1fd9130bbe42c35a7b0fea10
Reveal-iOS-SDK: e2250b3c155bcfac53ae223ddc1f76d08f206c33
- SwiftColor: c240d8cb2e1a29d731ae8deca8739eac6b9c56bd
+ SwiftColor: ce45cc128e2a433a20e6f052c41f533590a567b4
-PODFILE CHECKSUM: c97f1a7c32001ed0a26b07f16d74757a08c2b656
+PODFILE CHECKSUM: 34212ad1d5456c8ff1485c8921e9ec4e14ef5c57
COCOAPODS: 1.2.0