Skip to content

Commit 5bf02d0

Browse files
authored
Merge pull request #9 from polydice/feature/update-project-config
Update project configuration
2 parents 8c9832d + 5877f2b commit 5bf02d0

19 files changed

+148
-129
lines changed

.codecov.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
coverage:
22
status:
3-
project: yes
4-
patch: no
5-
changes: no
3+
project:
4+
default:
5+
threshold: 5%
6+
patch: off
7+
changes: off
8+
comment:
9+
layout: "files"
10+
ignore:
11+
- "*Tests/**/*"
12+
- "Pods/**/*"

.hound.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
swift:
1+
swiftlint:
22
enabled: true
33
config_file: .swiftlint.yml

.slather.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.swiftlint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ disabled_rules:
22
- force_try
33
- line_length
44
- nesting
5+
- variable_name
56
- vertical_whitespace
67
type_name:
78
excluded:

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@ cache:
77
- Pods
88
before_install:
99
- export LANG=en_US.UTF-8
10-
- brew tap homebrew/bundle
11-
- brew bundle
1210
install:
13-
- bundle install --without development --deployment --jobs=3 --retry=3
14-
- bundle exec pod install
11+
- make bootstrap
1512
before_script:
16-
- bundle exec danger
13+
- if [ -n "$DANGER_GITHUB_API_TOKEN" ]; then bundle exec danger; fi
1714
script:
1815
- bundle exec fastlane scan
1916
after_success:

Brewfile

Lines changed: 0 additions & 2 deletions
This file was deleted.

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "http://rubygems.org"
22

3-
gem "cocoapods"
3+
gem "cocoapods", "1.3.1"
44
gem "cocoapods-keys"
55
gem "danger"
66
gem "fastlane"

Gemfile.lock

Lines changed: 104 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
CFPropertyList (2.3.6)
4+
CFPropertyList (3.0.0)
55
RubyInline (3.12.4)
66
ZenTest (~> 4.3)
7-
ZenTest (4.11.1)
8-
activesupport (4.2.10)
7+
ZenTest (4.11.2)
8+
activesupport (4.2.11.1)
99
i18n (~> 0.7)
1010
minitest (~> 5.1)
1111
thread_safe (~> 0.3, >= 0.3.4)
1212
tzinfo (~> 1.1)
13-
addressable (2.5.2)
13+
addressable (2.6.0)
1414
public_suffix (>= 2.0.2, < 4.0)
15+
atomos (0.1.3)
1516
babosa (1.0.2)
16-
claide (1.0.2)
17+
claide (1.0.3)
1718
claide-plugins (0.9.2)
1819
cork
1920
nap
@@ -41,179 +42,201 @@ GEM
4142
activesupport (>= 4.0.2, < 6)
4243
fuzzy_match (~> 2.0.4)
4344
nap (~> 1.0)
44-
cocoapods-deintegrate (1.0.1)
45-
cocoapods-downloader (1.1.3)
46-
cocoapods-keys (2.0.0)
45+
cocoapods-deintegrate (1.0.4)
46+
cocoapods-downloader (1.2.2)
47+
cocoapods-keys (2.1.0)
4748
dotenv
4849
osx_keychain
4950
cocoapods-plugins (1.0.0)
5051
nap
5152
cocoapods-search (1.0.0)
52-
cocoapods-stats (1.0.0)
53-
cocoapods-trunk (1.3.0)
53+
cocoapods-stats (1.1.0)
54+
cocoapods-trunk (1.3.1)
5455
nap (>= 0.8, < 2.0)
5556
netrc (~> 0.11)
5657
cocoapods-try (1.1.0)
5758
colored (1.2)
5859
colored2 (3.1.2)
59-
commander-fastlane (4.4.5)
60+
commander-fastlane (4.4.6)
6061
highline (~> 1.7.2)
61-
concurrent-ruby (1.0.5)
62+
concurrent-ruby (1.1.5)
6263
cork (0.3.0)
6364
colored2 (~> 3.1)
64-
danger (5.5.5)
65+
danger (6.0.9)
6566
claide (~> 1.0)
6667
claide-plugins (>= 0.9.2)
6768
colored2 (~> 3.1)
6869
cork (~> 0.1)
6970
faraday (~> 0.9)
70-
faraday-http-cache (~> 1.0)
71-
git (~> 1)
72-
kramdown (~> 1.5)
71+
faraday-http-cache (~> 2.0)
72+
git (~> 1.5)
73+
kramdown (~> 2.0)
74+
kramdown-parser-gfm (~> 1.0)
7375
no_proxy_fix
7476
octokit (~> 4.7)
7577
terminal-table (~> 1)
7678
declarative (0.0.10)
7779
declarative-option (0.1.0)
78-
domain_name (0.5.20170404)
80+
digest-crc (0.4.1)
81+
domain_name (0.5.20190701)
7982
unf (>= 0.0.5, < 1.0.0)
80-
dotenv (2.2.1)
83+
dotenv (2.7.5)
84+
emoji_regex (1.0.1)
8185
escape (0.0.4)
82-
excon (0.60.0)
83-
faraday (0.13.1)
86+
excon (0.65.0)
87+
faraday (0.15.4)
8488
multipart-post (>= 1.2, < 3)
8589
faraday-cookie_jar (0.0.6)
8690
faraday (>= 0.7.4)
8791
http-cookie (~> 1.0.0)
88-
faraday-http-cache (1.3.1)
92+
faraday-http-cache (2.0.0)
8993
faraday (~> 0.8)
90-
faraday_middleware (0.12.2)
94+
faraday_middleware (0.13.1)
9195
faraday (>= 0.7.4, < 1.0)
92-
fastimage (2.1.1)
93-
fastlane (2.71.0)
94-
CFPropertyList (>= 2.3, < 3.0.0)
96+
fastimage (2.1.5)
97+
fastlane (2.128.1)
98+
CFPropertyList (>= 2.3, < 4.0.0)
9599
addressable (>= 2.3, < 3.0.0)
96100
babosa (>= 1.0.2, < 2.0.0)
97-
bundler (>= 1.12.0, < 2.0.0)
101+
bundler (>= 1.12.0, < 3.0.0)
98102
colored
99-
commander-fastlane (>= 4.4.5, < 5.0.0)
103+
commander-fastlane (>= 4.4.6, < 5.0.0)
100104
dotenv (>= 2.1.1, < 3.0.0)
105+
emoji_regex (>= 0.1, < 2.0)
101106
excon (>= 0.45.0, < 1.0.0)
102107
faraday (~> 0.9)
103108
faraday-cookie_jar (~> 0.0.6)
104109
faraday_middleware (~> 0.9)
105110
fastimage (>= 2.1.0, < 3.0.0)
106-
gh_inspector (>= 1.0.1, < 2.0.0)
107-
google-api-client (>= 0.13.1, < 0.14.0)
111+
gh_inspector (>= 1.1.2, < 2.0.0)
112+
google-api-client (>= 0.21.2, < 0.24.0)
113+
google-cloud-storage (>= 1.15.0, < 2.0.0)
108114
highline (>= 1.7.2, < 2.0.0)
109115
json (< 3.0.0)
110-
mini_magick (~> 4.5.1)
111-
multi_json
116+
jwt (~> 2.1.0)
117+
mini_magick (>= 4.9.4, < 5.0.0)
112118
multi_xml (~> 0.5)
113119
multipart-post (~> 2.0.0)
114120
plist (>= 3.1.0, < 4.0.0)
115121
public_suffix (~> 2.0.0)
116-
rubyzip (>= 1.1.0, < 2.0.0)
122+
rubyzip (>= 1.2.2, < 2.0.0)
117123
security (= 0.1.3)
118-
slack-notifier (>= 1.3, < 2.0.0)
119-
terminal-notifier (>= 1.6.2, < 2.0.0)
124+
simctl (~> 1.6.3)
125+
slack-notifier (>= 2.0.0, < 3.0.0)
126+
terminal-notifier (>= 2.0.0, < 3.0.0)
120127
terminal-table (>= 1.4.5, < 2.0.0)
121-
tty-screen (~> 0.6.3)
128+
tty-screen (>= 0.6.3, < 1.0.0)
129+
tty-spinner (>= 0.8.0, < 1.0.0)
122130
word_wrap (~> 1.0.0)
123-
xcodeproj (>= 1.5.2, < 2.0.0)
124-
xcpretty (>= 0.2.4, < 1.0.0)
131+
xcodeproj (>= 1.8.1, < 2.0.0)
132+
xcpretty (~> 0.3.0)
125133
xcpretty-travis-formatter (>= 0.0.3)
126134
fourflusher (2.0.1)
127135
fuzzy_match (2.0.4)
128-
gh_inspector (1.0.3)
129-
git (1.3.0)
130-
google-api-client (0.13.6)
136+
gh_inspector (1.1.3)
137+
git (1.5.0)
138+
google-api-client (0.23.9)
131139
addressable (~> 2.5, >= 2.5.1)
132-
googleauth (~> 0.5)
140+
googleauth (>= 0.5, < 0.7.0)
133141
httpclient (>= 2.8.1, < 3.0)
134142
mime-types (~> 3.0)
135143
representable (~> 3.0)
136144
retriable (>= 2.0, < 4.0)
137-
googleauth (0.6.2)
145+
signet (~> 0.9)
146+
google-cloud-core (1.3.0)
147+
google-cloud-env (~> 1.0)
148+
google-cloud-env (1.2.0)
149+
faraday (~> 0.11)
150+
google-cloud-storage (1.16.0)
151+
digest-crc (~> 0.4)
152+
google-api-client (~> 0.23)
153+
google-cloud-core (~> 1.2)
154+
googleauth (>= 0.6.2, < 0.10.0)
155+
googleauth (0.6.7)
138156
faraday (~> 0.12)
139157
jwt (>= 1.4, < 3.0)
140-
logging (~> 2.0)
141-
memoist (~> 0.12)
158+
memoist (~> 0.16)
142159
multi_json (~> 1.11)
143-
os (~> 0.9)
160+
os (>= 0.9, < 2.0)
144161
signet (~> 0.7)
145162
highline (1.7.10)
146163
http-cookie (1.0.3)
147164
domain_name (~> 0.5)
148165
httpclient (2.8.3)
149-
i18n (0.9.1)
166+
i18n (0.9.5)
150167
concurrent-ruby (~> 1.0)
151-
json (2.1.0)
168+
json (2.2.0)
152169
jwt (2.1.0)
153-
kramdown (1.16.2)
154-
little-plugger (1.1.4)
155-
logging (2.2.2)
156-
little-plugger (~> 1.1)
157-
multi_json (~> 1.10)
170+
kramdown (2.1.0)
171+
kramdown-parser-gfm (1.1.0)
172+
kramdown (~> 2.0)
158173
memoist (0.16.0)
159-
mime-types (3.1)
174+
mime-types (3.2.2)
160175
mime-types-data (~> 3.2015)
161-
mime-types-data (3.2016.0521)
162-
mini_magick (4.5.1)
163-
minitest (5.10.3)
176+
mime-types-data (3.2019.0331)
177+
mini_magick (4.9.5)
178+
minitest (5.11.3)
164179
molinillo (0.5.7)
165-
multi_json (1.12.2)
180+
multi_json (1.13.1)
166181
multi_xml (0.6.0)
167182
multipart-post (2.0.0)
168-
nanaimo (0.2.3)
183+
nanaimo (0.2.6)
169184
nap (1.1.0)
185+
naturally (2.2.0)
170186
netrc (0.11.0)
171187
no_proxy_fix (0.1.2)
172-
octokit (4.8.0)
188+
octokit (4.14.0)
173189
sawyer (~> 0.8.0, >= 0.5.3)
174190
open4 (1.3.4)
175-
os (0.9.6)
176-
osx_keychain (1.0.1)
191+
os (1.0.1)
192+
osx_keychain (1.0.2)
177193
RubyInline (~> 3)
178-
plist (3.4.0)
194+
plist (3.5.0)
179195
public_suffix (2.0.5)
180196
representable (3.0.4)
181197
declarative (< 0.1.0)
182198
declarative-option (< 0.2.0)
183199
uber (< 0.2.0)
184-
retriable (3.1.1)
200+
retriable (3.1.2)
185201
rouge (2.0.7)
186-
ruby-macho (1.1.0)
187-
rubyzip (1.2.1)
188-
sawyer (0.8.1)
189-
addressable (>= 2.3.5, < 2.6)
190-
faraday (~> 0.8, < 1.0)
202+
ruby-macho (1.4.0)
203+
rubyzip (1.2.3)
204+
sawyer (0.8.2)
205+
addressable (>= 2.3.5)
206+
faraday (> 0.8, < 2.0)
191207
security (0.1.3)
192-
signet (0.8.1)
208+
signet (0.11.0)
193209
addressable (~> 2.3)
194210
faraday (~> 0.9)
195211
jwt (>= 1.5, < 3.0)
196212
multi_json (~> 1.10)
197-
slack-notifier (1.5.1)
198-
terminal-notifier (1.8.0)
213+
simctl (1.6.5)
214+
CFPropertyList
215+
naturally
216+
slack-notifier (2.3.2)
217+
terminal-notifier (2.0.0)
199218
terminal-table (1.8.0)
200219
unicode-display_width (~> 1.1, >= 1.1.1)
201220
thread_safe (0.3.6)
202-
tty-screen (0.6.4)
203-
tzinfo (1.2.4)
221+
tty-cursor (0.7.0)
222+
tty-screen (0.7.0)
223+
tty-spinner (0.9.1)
224+
tty-cursor (~> 0.7)
225+
tzinfo (1.2.5)
204226
thread_safe (~> 0.1)
205227
uber (0.1.0)
206228
unf (0.1.4)
207229
unf_ext
208-
unf_ext (0.0.7.4)
209-
unicode-display_width (1.3.0)
230+
unf_ext (0.0.7.6)
231+
unicode-display_width (1.6.0)
210232
word_wrap (1.0.0)
211-
xcodeproj (1.5.4)
212-
CFPropertyList (~> 2.3.3)
233+
xcodeproj (1.12.0)
234+
CFPropertyList (>= 2.3.3, < 4.0)
235+
atomos (~> 0.1.3)
213236
claide (>= 1.0.2, < 2.0)
214237
colored2 (~> 3.1)
215-
nanaimo (~> 0.2.3)
216-
xcpretty (0.2.8)
238+
nanaimo (~> 0.2.6)
239+
xcpretty (0.3.0)
217240
rouge (~> 2.0.7)
218241
xcpretty-travis-formatter (1.0.0)
219242
xcpretty (~> 0.2, >= 0.0.7)
@@ -222,10 +245,10 @@ PLATFORMS
222245
ruby
223246

224247
DEPENDENCIES
225-
cocoapods
248+
cocoapods (= 1.3.1)
226249
cocoapods-keys
227250
danger
228251
fastlane
229252

230253
BUNDLED WITH
231-
1.16.1
254+
2.0.2

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
bootstrap:
2-
brew tap homebrew/bundle
3-
brew bundle
2+
gem install bundler -v 2.0.2
43
bundle install
54
# pod install
65
bundle exec pod keys set BaseAPIURL "https://polydice.com/iCook-tvOS/demo/"
76
bundle exec pod keys set CrashlyticsAPIKey "-"
87
bundle exec pod keys set TreasureDataAPIKey "-"
98
bundle exec pod install
109
# sh scripts/fabric.sh
11-
echo "fabric.apikey" > keys/fabric.apikey
12-
echo "fabric.buildsecret" > keys/fabric.buildsecret
10+
mkdir -p keys
11+
touch keys/fabric.apikey && echo "fabric.apikey" > keys/fabric.apikey
12+
touch keys/fabric.buildsecret && echo "fabric.buildsecret" > keys/fabric.buildsecret

0 commit comments

Comments
 (0)