Skip to content

Commit 0594eb9

Browse files
authored
Merge pull request #36 from CodeAcmen/develop
Develop
2 parents 7f2770e + 981b8a8 commit 0594eb9

File tree

272 files changed

+37913
-2664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+37913
-2664
lines changed

Podfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ target 'iOS-Network-Stack-Dive' do
1818
# pod 'MJRefresh'
1919
pod 'DZNEmptyDataSet'
2020
pod 'Masonry'
21+
pod 'SDWebImage'
22+
# pod 'YYKit'
23+
pod 'YYModel'
2124

2225

2326
target 'iOS-Network-Stack-DiveTests' do

Podfile.lock

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ PODS:
55
- OCMock (3.9.4)
66
- Reachability (3.7.5)
77
- ReactiveObjC (3.1.1)
8+
- SDWebImage (5.21.1):
9+
- SDWebImage/Core (= 5.21.1)
10+
- SDWebImage/Core (5.21.1)
811
- Typhoon (4.0.9):
912
- Typhoon/DeallocNotifier (= 4.0.9)
1013
- Typhoon/IntrospectionUtils (= 4.0.9)
@@ -13,6 +16,7 @@ PODS:
1316
- Typhoon/IntrospectionUtils (4.0.9)
1417
- Typhoon/no-arc (4.0.9):
1518
- Typhoon/IntrospectionUtils
19+
- YYModel (1.0.4)
1620

1721
DEPENDENCIES:
1822
- CocoaAsyncSocket
@@ -21,7 +25,9 @@ DEPENDENCIES:
2125
- OCMock
2226
- Reachability (= 3.7.5)
2327
- ReactiveObjC
28+
- SDWebImage
2429
- Typhoon
30+
- YYModel
2531

2632
SPEC REPOS:
2733
trunk:
@@ -31,7 +37,9 @@ SPEC REPOS:
3137
- OCMock
3238
- Reachability
3339
- ReactiveObjC
40+
- SDWebImage
3441
- Typhoon
42+
- YYModel
3543

3644
SPEC CHECKSUMS:
3745
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
@@ -40,8 +48,10 @@ SPEC CHECKSUMS:
4048
OCMock: 589f2c84dacb1f5aaf6e4cec1f292551fe748e74
4149
Reachability: 44d15955cdaee6cef699877e1f6647dd6f6698cc
4250
ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040
51+
SDWebImage: f29024626962457f3470184232766516dee8dfea
4352
Typhoon: 1973c93ecfb3edb963d78b10e715bc2911475bd2
53+
YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
4454

45-
PODFILE CHECKSUM: 5174ba062381b1d1018e35549d3138efd6e177c7
55+
PODFILE CHECKSUM: 5702b619b709c95d4327c5f3ddd34f25d16b4f2d
4656

4757
COCOAPODS: 1.16.2

Pods/Manifest.lock

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 3113 additions & 2001 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Pods.xcodeproj/xcuserdata/aarongtang.xcuserdatad/xcschemes/SDWebImage-SDWebImage.xcscheme

Lines changed: 58 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Pods.xcodeproj/xcuserdata/aarongtang.xcuserdatad/xcschemes/SDWebImage.xcscheme

Lines changed: 58 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Pods.xcodeproj/xcuserdata/aarongtang.xcuserdatad/xcschemes/YYModel.xcscheme

Lines changed: 58 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Pods.xcodeproj/xcuserdata/aarongtang.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 22 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/SDWebImage/LICENSE

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)