Skip to content

Commit 77afa84

Browse files
bsakhujanathanmsmith
authored andcommitted
Swift 4 and iPhone X support (#33)
* Swift 4 and iPhone X support Upgraded to Swift 4 and added iPhone X support * Updated readme.md copyright to 2018 * Used .flatMap instead of .compactMap (an Xcode 9.3 beta exclusive). .flatMap is more stable.
1 parent 0df9732 commit 77afa84

File tree

277 files changed

+28201
-71
lines changed

Some content is hidden

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

277 files changed

+28201
-71
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# CocoaPods - Only use to conserve bandwidth / Save time on Pushing
77
# - Also handy if you have a lage number of dependant pods
88
# - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGONRE THE LOCK FILE
9-
Pods/
109

1110
### macOS ###
1211
*.DS_Store

Podfile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ platform :ios, '9.0'
22
use_frameworks!
33

44
target 'UCLA Radio' do
5-
pod 'Alamofire', '~> 4.0'
5+
pod 'Alamofire'
66
pod 'ASHorizontalScrollView', '~> 1.3'
7-
pod 'SDWebImage', '~>3.8'
7+
pod 'SDWebImage', '~>3.7.6'
88
pod "KRLCollectionViewGridLayout", "~> 0.4.1"
99
pod 'DynamicColor', '~> 3.1.0'
1010
pod 'Google/Analytics'
@@ -14,3 +14,12 @@ target 'UCLA Radio' do
1414
# pod 'HTHorizontalSelectionList', '~> 0.7.0'
1515

1616
end
17+
18+
19+
target 'UCLA RadioTests' do
20+
pod 'Google/Analytics'
21+
end
22+
23+
target 'UCLA RadioUITests' do
24+
pod 'Google/Analytics'
25+
end

Podfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- Alamofire (4.5.1)
2+
- Alamofire (4.6.0)
33
- ASHorizontalScrollView (1.5.1)
44
- DynamicColor (3.1.0)
55
- FirebaseAnalytics (3.9.0):
@@ -21,21 +21,21 @@ PODS:
2121
- GoogleToolboxForMac/Defines (= 2.1.3)
2222
- KRLCollectionViewGridLayout (0.4.1)
2323
- Presentr (1.3)
24-
- SDWebImage (3.8.2):
25-
- SDWebImage/Core (= 3.8.2)
26-
- SDWebImage/Core (3.8.2)
24+
- SDWebImage (3.7.6):
25+
- SDWebImage/Core (= 3.7.6)
26+
- SDWebImage/Core (3.7.6)
2727

2828
DEPENDENCIES:
29-
- Alamofire (~> 4.0)
29+
- Alamofire
3030
- ASHorizontalScrollView (~> 1.3)
3131
- DynamicColor (~> 3.1.0)
3232
- Google/Analytics
3333
- KRLCollectionViewGridLayout (~> 0.4.1)
3434
- Presentr
35-
- SDWebImage (~> 3.8)
35+
- SDWebImage (~> 3.7.6)
3636

3737
SPEC CHECKSUMS:
38-
Alamofire: 2d95912bf4c34f164fdfc335872e8c312acaea4a
38+
Alamofire: f41a599bd63041760b26d393ec1069d9d7b917f4
3939
ASHorizontalScrollView: 9c98b9226509540075b6398c92f68fb474bea7e9
4040
DynamicColor: 4dec283a881f7f9d9f3bc88fb5f306724242575f
4141
FirebaseAnalytics: e5fe8486efc01bec33f6bf82e2fa9fce4b124052
@@ -46,8 +46,8 @@ SPEC CHECKSUMS:
4646
GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20
4747
KRLCollectionViewGridLayout: 6363dc7e3d91cf1f97e19ed20846764566659596
4848
Presentr: 3f0825a42cb32ecd8fc6b6d0b0de87d7d0b42482
49-
SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
49+
SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
5050

51-
PODFILE CHECKSUM: baee7e121859edcfc87d29f7799d9e3b2235317e
51+
PODFILE CHECKSUM: d45f732bb70a8dadc92e8e10b34936c9f259ddce
5252

53-
COCOAPODS: 1.3.1
53+
COCOAPODS: 1.4.0

Pods/ASHorizontalScrollView/README.md

Lines changed: 73 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)