Skip to content

Commit 29a3349

Browse files
committed
* Added JSON ObjectMapper
1 parent 4616813 commit 29a3349

23 files changed

+608
-225
lines changed

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.pbxproj merge=union

.gitignore

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
geldermalsen.gpx
2+
3+
## Build generated
4+
build/
5+
DerivedData/
6+
7+
#Code Injection
8+
#
9+
# After new code Injection tools there's a generated folder /iOSInjectionProject
10+
# https://github.com/johnno1962/injectionforxcode
11+
12+
iOSInjectionProject/
13+
14+
## Other
15+
*.moved-aside
16+
*.xcuserstate
17+
18+
## Various settings
19+
*.pbxuser
20+
!default.pbxuser
21+
*.mode1v3
22+
!default.mode1v3
23+
*.mode2v3
24+
!default.mode2v3
25+
*.perspectivev3
26+
!default.perspectivev3
27+
xcuserdata/
28+
29+
## Obj-C/Swift specific
30+
*.hmap
31+
*.ipa
32+
*.dSYM.zip
33+
*.dSYM
34+
35+
# CocoaPods
36+
#
37+
# We recommend against adding the Pods directory to your .gitignore. However
38+
# you should judge for yourself, the pros and cons are mentioned at:
39+
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
40+
#
41+
Pods/
42+
Pods/CocoaPodsKeys
43+
44+
45+
##Document Generated
46+
47+
*.xcodeproj/project.xcworkspace/xcuserdata/*.xcuserdatad
48+
49+
*.xcodeproj/project.xcworkspace/xcshareddata/*.xcscmblueprint
50+
51+
*.xcodeproj/xcuserdata/*.xcuserdatad/
52+

Podfile

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ target 'TweetsFelt' do
77

88
# Pods for TweetsFelt
99
pod 'Alamofire', '~> 4.8.2'
10+
pod 'ObjectMapper', '~> 3.4'
1011

1112
target 'TweetsFeltTests' do
1213
inherit! :search_paths

Podfile.lock

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
PODS:
22
- Alamofire (4.8.2)
33
- Keys (1.0.1)
4+
- ObjectMapper (3.4.2)
45

56
DEPENDENCIES:
67
- Alamofire (~> 4.8.2)
78
- Keys (from `Pods/CocoaPodsKeys`)
9+
- ObjectMapper (~> 3.4)
810

911
SPEC REPOS:
1012
https://github.com/cocoapods/specs.git:
1113
- Alamofire
14+
- ObjectMapper
1215

1316
EXTERNAL SOURCES:
1417
Keys:
@@ -17,7 +20,8 @@ EXTERNAL SOURCES:
1720
SPEC CHECKSUMS:
1821
Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
1922
Keys: a576f4c9c1c641ca913a959a9c62ed3f215a8de9
23+
ObjectMapper: 0d4402610f4e468903ae64629eec4784531e5c51
2024

21-
PODFILE CHECKSUM: 740b47d1788d5bd375d7d7fadce64430cf866574
25+
PODFILE CHECKSUM: 4dc29b759a16d491550332dde1388ba0f0a5d073
2226

2327
COCOAPODS: 1.5.3

Pods/CocoaPodsKeys/TweetsFeltKeys.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/CocoaPodsKeys/TweetsFeltKeys.m

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Manifest.lock

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)