Skip to content

Commit 8c9832d

Browse files
committed
Merge branch 'feature/xcode-9' into develop
2 parents a22e2dd + de2187a commit 8c9832d

File tree

16 files changed

+183
-150
lines changed

16 files changed

+183
-150
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.1
1+
2.4.2

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
3.2

.swiftlint.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ variable_name:
1111
excluded:
1212
- id
1313
- URL
14+
included:
15+
- iCookTV
16+
- iCookTVTests
1417
excluded:
1518
- Carthage
1619
- Pods
1720
- iCookTV/R.generated.swift
21+
- vendor

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode8.2
2+
osx_image: xcode9.2
33
cache:
44
bundler: true
55
directories:
@@ -11,7 +11,7 @@ before_install:
1111
- brew bundle
1212
install:
1313
- bundle install --without development --deployment --jobs=3 --retry=3
14-
- sh ./scripts/pod-install-if-needed.sh
14+
- bundle exec pod install
1515
before_script:
1616
- bundle exec danger
1717
script:

Brewfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
brew "pkg-config"
2-
brew "swiftlint"
32
brew "xcproj"

Gemfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
source "http://rubygems.org"
2-
ruby "2.3.1"
32

4-
gem "cocoapods", "~> 1.1.0"
3+
gem "cocoapods"
54
gem "cocoapods-keys"
6-
gem "danger", "~> 4.0.0"
5+
gem "danger"
76
gem "fastlane"
8-
gem "slather"

Gemfile.lock

Lines changed: 99 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,236 +1,231 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
CFPropertyList (2.3.4)
4+
CFPropertyList (2.3.6)
55
RubyInline (3.12.4)
66
ZenTest (~> 4.3)
77
ZenTest (4.11.1)
8-
activesupport (4.2.7.1)
8+
activesupport (4.2.10)
99
i18n (~> 0.7)
10-
json (~> 1.7, >= 1.7.7)
1110
minitest (~> 5.1)
1211
thread_safe (~> 0.3, >= 0.3.4)
1312
tzinfo (~> 1.1)
14-
addressable (2.5.0)
15-
public_suffix (~> 2.0, >= 2.0.2)
13+
addressable (2.5.2)
14+
public_suffix (>= 2.0.2, < 4.0)
1615
babosa (1.0.2)
17-
claide (1.0.1)
16+
claide (1.0.2)
1817
claide-plugins (0.9.2)
1918
cork
2019
nap
2120
open4 (~> 1.3)
22-
clamp (0.6.5)
23-
cocoapods (1.1.1)
21+
cocoapods (1.3.1)
2422
activesupport (>= 4.0.2, < 5)
25-
claide (>= 1.0.1, < 2.0)
26-
cocoapods-core (= 1.1.1)
23+
claide (>= 1.0.2, < 2.0)
24+
cocoapods-core (= 1.3.1)
2725
cocoapods-deintegrate (>= 1.0.1, < 2.0)
28-
cocoapods-downloader (>= 1.1.2, < 2.0)
26+
cocoapods-downloader (>= 1.1.3, < 2.0)
2927
cocoapods-plugins (>= 1.0.0, < 2.0)
3028
cocoapods-search (>= 1.0.0, < 2.0)
3129
cocoapods-stats (>= 1.0.0, < 2.0)
32-
cocoapods-trunk (>= 1.1.1, < 2.0)
30+
cocoapods-trunk (>= 1.2.0, < 2.0)
3331
cocoapods-try (>= 1.1.0, < 2.0)
34-
colored (~> 1.2)
32+
colored2 (~> 3.1)
3533
escape (~> 0.0.4)
3634
fourflusher (~> 2.0.1)
3735
gh_inspector (~> 1.0)
38-
molinillo (~> 0.5.1)
36+
molinillo (~> 0.5.7)
3937
nap (~> 1.0)
40-
xcodeproj (>= 1.3.3, < 2.0)
41-
cocoapods-core (1.1.1)
42-
activesupport (>= 4.0.2, < 5)
38+
ruby-macho (~> 1.1)
39+
xcodeproj (>= 1.5.1, < 2.0)
40+
cocoapods-core (1.3.1)
41+
activesupport (>= 4.0.2, < 6)
4342
fuzzy_match (~> 2.0.4)
4443
nap (~> 1.0)
4544
cocoapods-deintegrate (1.0.1)
4645
cocoapods-downloader (1.1.3)
47-
cocoapods-keys (1.7.0)
46+
cocoapods-keys (2.0.0)
4847
dotenv
4948
osx_keychain
5049
cocoapods-plugins (1.0.0)
5150
nap
5251
cocoapods-search (1.0.0)
5352
cocoapods-stats (1.0.0)
54-
cocoapods-trunk (1.1.2)
53+
cocoapods-trunk (1.3.0)
5554
nap (>= 0.8, < 2.0)
56-
netrc (= 0.7.8)
55+
netrc (~> 0.11)
5756
cocoapods-try (1.1.0)
5857
colored (1.2)
59-
commander (4.4.3)
58+
colored2 (3.1.2)
59+
commander-fastlane (4.4.5)
6060
highline (~> 1.7.2)
61-
cork (0.2.0)
62-
colored (~> 1.2)
63-
danger (4.0.3)
61+
concurrent-ruby (1.0.5)
62+
cork (0.3.0)
63+
colored2 (~> 3.1)
64+
danger (5.5.5)
6465
claide (~> 1.0)
6566
claide-plugins (>= 0.9.2)
66-
colored (~> 1.2)
67+
colored2 (~> 3.1)
6768
cork (~> 0.1)
6869
faraday (~> 0.9)
6970
faraday-http-cache (~> 1.0)
7071
git (~> 1)
7172
kramdown (~> 1.5)
72-
octokit (~> 4.2)
73+
no_proxy_fix
74+
octokit (~> 4.7)
7375
terminal-table (~> 1)
74-
domain_name (0.5.20161129)
76+
declarative (0.0.10)
77+
declarative-option (0.1.0)
78+
domain_name (0.5.20170404)
7579
unf (>= 0.0.5, < 1.0.0)
76-
dotenv (2.1.1)
80+
dotenv (2.2.1)
7781
escape (0.0.4)
78-
excon (0.54.0)
79-
faraday (0.10.0)
82+
excon (0.60.0)
83+
faraday (0.13.1)
8084
multipart-post (>= 1.2, < 3)
8185
faraday-cookie_jar (0.0.6)
8286
faraday (>= 0.7.4)
8387
http-cookie (~> 1.0.0)
8488
faraday-http-cache (1.3.1)
8589
faraday (~> 0.8)
86-
faraday_middleware (0.10.1)
90+
faraday_middleware (0.12.2)
8791
faraday (>= 0.7.4, < 1.0)
88-
fastimage (2.0.1)
89-
addressable (~> 2)
90-
fastlane (2.3.0)
91-
activesupport (< 5)
92+
fastimage (2.1.1)
93+
fastlane (2.71.0)
94+
CFPropertyList (>= 2.3, < 3.0.0)
9295
addressable (>= 2.3, < 3.0.0)
9396
babosa (>= 1.0.2, < 2.0.0)
94-
bundler (~> 1.12)
97+
bundler (>= 1.12.0, < 2.0.0)
9598
colored
96-
commander (>= 4.4.0, < 5.0.0)
99+
commander-fastlane (>= 4.4.5, < 5.0.0)
97100
dotenv (>= 2.1.1, < 3.0.0)
98101
excon (>= 0.45.0, < 1.0.0)
99102
faraday (~> 0.9)
100103
faraday-cookie_jar (~> 0.0.6)
101104
faraday_middleware (~> 0.9)
102-
fastimage (>= 1.6)
105+
fastimage (>= 2.1.0, < 3.0.0)
103106
gh_inspector (>= 1.0.1, < 2.0.0)
104-
google-api-client (~> 0.9.1)
107+
google-api-client (>= 0.13.1, < 0.14.0)
105108
highline (>= 1.7.2, < 2.0.0)
106109
json (< 3.0.0)
107110
mini_magick (~> 4.5.1)
108111
multi_json
109112
multi_xml (~> 0.5)
110113
multipart-post (~> 2.0.0)
111114
plist (>= 3.1.0, < 4.0.0)
115+
public_suffix (~> 2.0.0)
112116
rubyzip (>= 1.1.0, < 2.0.0)
113117
security (= 0.1.3)
114118
slack-notifier (>= 1.3, < 2.0.0)
115119
terminal-notifier (>= 1.6.2, < 2.0.0)
116120
terminal-table (>= 1.4.5, < 2.0.0)
121+
tty-screen (~> 0.6.3)
117122
word_wrap (~> 1.0.0)
118-
xcodeproj (>= 0.20, < 2.0.0)
123+
xcodeproj (>= 1.5.2, < 2.0.0)
119124
xcpretty (>= 0.2.4, < 1.0.0)
120125
xcpretty-travis-formatter (>= 0.0.3)
121126
fourflusher (2.0.1)
122127
fuzzy_match (2.0.4)
123-
gh_inspector (1.0.2)
128+
gh_inspector (1.0.3)
124129
git (1.3.0)
125-
google-api-client (0.9.20)
126-
addressable (~> 2.3)
130+
google-api-client (0.13.6)
131+
addressable (~> 2.5, >= 2.5.1)
127132
googleauth (~> 0.5)
128-
httpclient (~> 2.7)
129-
hurley (~> 0.1)
130-
memoist (~> 0.11)
131-
mime-types (>= 1.6)
132-
representable (~> 2.3.0)
133-
retriable (~> 2.0)
134-
googleauth (0.5.1)
135-
faraday (~> 0.9)
136-
jwt (~> 1.4)
133+
httpclient (>= 2.8.1, < 3.0)
134+
mime-types (~> 3.0)
135+
representable (~> 3.0)
136+
retriable (>= 2.0, < 4.0)
137+
googleauth (0.6.2)
138+
faraday (~> 0.12)
139+
jwt (>= 1.4, < 3.0)
137140
logging (~> 2.0)
138141
memoist (~> 0.12)
139142
multi_json (~> 1.11)
140143
os (~> 0.9)
141144
signet (~> 0.7)
142-
highline (1.7.8)
145+
highline (1.7.10)
143146
http-cookie (1.0.3)
144147
domain_name (~> 0.5)
145148
httpclient (2.8.3)
146-
hurley (0.2)
147-
i18n (0.7.0)
148-
json (1.8.3)
149-
jwt (1.5.6)
150-
kramdown (1.13.1)
149+
i18n (0.9.1)
150+
concurrent-ruby (~> 1.0)
151+
json (2.1.0)
152+
jwt (2.1.0)
153+
kramdown (1.16.2)
151154
little-plugger (1.1.4)
152-
logging (2.1.0)
155+
logging (2.2.2)
153156
little-plugger (~> 1.1)
154157
multi_json (~> 1.10)
155-
memoist (0.15.0)
158+
memoist (0.16.0)
156159
mime-types (3.1)
157160
mime-types-data (~> 3.2015)
158161
mime-types-data (3.2016.0521)
159162
mini_magick (4.5.1)
160-
mini_portile2 (2.1.0)
161-
minitest (5.10.1)
162-
molinillo (0.5.4)
163-
multi_json (1.12.1)
163+
minitest (5.10.3)
164+
molinillo (0.5.7)
165+
multi_json (1.12.2)
164166
multi_xml (0.6.0)
165167
multipart-post (2.0.0)
166168
nanaimo (0.2.3)
167169
nap (1.1.0)
168-
netrc (0.7.8)
169-
nokogiri (1.6.8.1)
170-
mini_portile2 (~> 2.1.0)
171-
octokit (4.6.2)
170+
netrc (0.11.0)
171+
no_proxy_fix (0.1.2)
172+
octokit (4.8.0)
172173
sawyer (~> 0.8.0, >= 0.5.3)
173174
open4 (1.3.4)
174175
os (0.9.6)
175176
osx_keychain (1.0.1)
176177
RubyInline (~> 3)
177-
plist (3.2.0)
178-
public_suffix (2.0.4)
179-
representable (2.3.0)
180-
uber (~> 0.0.7)
181-
retriable (2.1.0)
182-
rouge (1.11.1)
183-
rubyzip (1.2.0)
178+
plist (3.4.0)
179+
public_suffix (2.0.5)
180+
representable (3.0.4)
181+
declarative (< 0.1.0)
182+
declarative-option (< 0.2.0)
183+
uber (< 0.2.0)
184+
retriable (3.1.1)
185+
rouge (2.0.7)
186+
ruby-macho (1.1.0)
187+
rubyzip (1.2.1)
184188
sawyer (0.8.1)
185189
addressable (>= 2.3.5, < 2.6)
186190
faraday (~> 0.8, < 1.0)
187191
security (0.1.3)
188-
signet (0.7.3)
192+
signet (0.8.1)
189193
addressable (~> 2.3)
190194
faraday (~> 0.9)
191-
jwt (~> 1.5)
195+
jwt (>= 1.5, < 3.0)
192196
multi_json (~> 1.10)
193197
slack-notifier (1.5.1)
194-
slather (2.3.0)
195-
activesupport (>= 4.0.2, < 5)
196-
clamp (~> 0.6)
197-
nokogiri (~> 1.6.3)
198-
xcodeproj (>= 0.20, < 2.0.0)
199-
terminal-notifier (1.7.1)
200-
terminal-table (1.7.3)
201-
unicode-display_width (~> 1.1.1)
202-
thread_safe (0.3.5)
203-
tzinfo (1.2.2)
198+
terminal-notifier (1.8.0)
199+
terminal-table (1.8.0)
200+
unicode-display_width (~> 1.1, >= 1.1.1)
201+
thread_safe (0.3.6)
202+
tty-screen (0.6.4)
203+
tzinfo (1.2.4)
204204
thread_safe (~> 0.1)
205-
uber (0.0.15)
205+
uber (0.1.0)
206206
unf (0.1.4)
207207
unf_ext
208-
unf_ext (0.0.7.2)
209-
unicode-display_width (1.1.2)
208+
unf_ext (0.0.7.4)
209+
unicode-display_width (1.3.0)
210210
word_wrap (1.0.0)
211-
xcodeproj (1.4.2)
211+
xcodeproj (1.5.4)
212212
CFPropertyList (~> 2.3.3)
213-
activesupport (>= 3)
214-
claide (>= 1.0.1, < 2.0)
215-
colored (~> 1.2)
213+
claide (>= 1.0.2, < 2.0)
214+
colored2 (~> 3.1)
216215
nanaimo (~> 0.2.3)
217-
xcpretty (0.2.4)
218-
rouge (~> 1.8)
219-
xcpretty-travis-formatter (0.0.4)
216+
xcpretty (0.2.8)
217+
rouge (~> 2.0.7)
218+
xcpretty-travis-formatter (1.0.0)
220219
xcpretty (~> 0.2, >= 0.0.7)
221220

222221
PLATFORMS
223222
ruby
224223

225224
DEPENDENCIES
226-
cocoapods (~> 1.1.0)
225+
cocoapods
227226
cocoapods-keys
228-
danger (~> 4.0.0)
227+
danger
229228
fastlane
230-
slather
231-
232-
RUBY VERSION
233-
ruby 2.3.1p112
234229

235230
BUNDLED WITH
236-
1.13.6
231+
1.16.1

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,3 @@ bootstrap:
1010
# sh scripts/fabric.sh
1111
echo "fabric.apikey" > keys/fabric.apikey
1212
echo "fabric.buildsecret" > keys/fabric.buildsecret
13-
14-
coverage:
15-
bundle exec slather coverage -s --input-format profdata --scheme iCookTV --workspace iCookTV.xcworkspace iCookTV.xcodeproj

0 commit comments

Comments
 (0)