Skip to content

Commit bc62825

Browse files
authored
Bump ruby version, macOS version for distribute & upgrade all the gems (home-assistant#2181)
* Bump ruby dependencies * Bump ruby version * Bump to macOS 12 for distribute * Update README for ruby version * Certificate updates for MAS too * Disable `key: key` -> `key:` in rubocop
1 parent 77cfde5 commit bc62825

File tree

29 files changed

+52
-48
lines changed

29 files changed

+52
-48
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/checkout@v2
2929
- uses: ruby/setup-ruby@v1
3030
with:
31-
ruby-version: '2.7'
31+
ruby-version: '3.1'
3232
bundler-cache: true
3333
- name: RuboCop
3434
run: bundle exec rubocop --format github

.github/workflows/distribute.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616

1717
jobs:
1818
build:
19-
runs-on: macos-11
19+
runs-on: macos-12
2020
strategy:
2121
fail-fast: false
2222
matrix:

.github/workflows/download_localized_strings.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111

1212
jobs:
1313
update_strings:
14-
runs-on: macos-11
14+
runs-on: macos-12
1515
steps:
1616
- uses: actions/checkout@v2
1717
with:

.github/workflows/set_version.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
ssh-key: ${{ secrets.HOMEASSISTANT_SSH_DEPLOY_KEY }}
1515
- uses: ruby/setup-ruby@v1
1616
with:
17-
ruby-version: '2.7'
17+
ruby-version: '3.1'
1818
bundler-cache: true
1919
- run: "bundle exec fastlane set_version version:${{ github.event.inputs.version }}"
2020
- name: Commit changes

.rubocop.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AllCops:
2-
TargetRubyVersion: 2.7
2+
TargetRubyVersion: 3.1
33
NewCops: enable
44
Exclude:
55
- 'Pods/**/*'
@@ -10,3 +10,6 @@ Metrics/BlockLength:
1010

1111
Style/FrozenStringLiteralComment:
1212
Enabled: false
13+
14+
Style/HashSyntax:
15+
EnforcedShorthandSyntax: never

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.4
1+
3.1.2

Gemfile.lock

+40-39
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ GEM
33
specs:
44
CFPropertyList (3.0.5)
55
rexml
6-
activesupport (5.2.8)
6+
activesupport (5.2.8.1)
77
concurrent-ruby (~> 1.0, >= 1.0.2)
88
i18n (>= 0.7, < 2)
99
minitest (~> 5.1)
@@ -17,20 +17,20 @@ GEM
1717
ast (2.4.2)
1818
atomos (0.1.3)
1919
aws-eventstream (1.2.0)
20-
aws-partitions (1.589.0)
21-
aws-sdk-core (3.131.1)
20+
aws-partitions (1.618.0)
21+
aws-sdk-core (3.132.0)
2222
aws-eventstream (~> 1, >= 1.0.2)
2323
aws-partitions (~> 1, >= 1.525.0)
2424
aws-sigv4 (~> 1.1)
2525
jmespath (~> 1, >= 1.6.1)
26-
aws-sdk-kms (1.57.0)
26+
aws-sdk-kms (1.58.0)
2727
aws-sdk-core (~> 3, >= 3.127.0)
2828
aws-sigv4 (~> 1.1)
2929
aws-sdk-s3 (1.114.0)
3030
aws-sdk-core (~> 3, >= 3.127.0)
3131
aws-sdk-kms (~> 1)
3232
aws-sigv4 (~> 1.4)
33-
aws-sigv4 (1.5.0)
33+
aws-sigv4 (1.5.1)
3434
aws-eventstream (~> 1, >= 1.0.2)
3535
babosa (1.0.4)
3636
claide (1.1.0)
@@ -85,13 +85,13 @@ GEM
8585
rake (>= 12.0.0, < 14.0.0)
8686
domain_name (0.5.20190701)
8787
unf (>= 0.0.5, < 1.0.0)
88-
dotenv (2.7.6)
88+
dotenv (2.8.1)
8989
emoji_regex (3.2.3)
9090
escape (0.0.4)
9191
ethon (0.15.0)
9292
ffi (>= 1.15.0)
93-
excon (0.92.3)
94-
faraday (1.10.0)
93+
excon (0.92.4)
94+
faraday (1.10.1)
9595
faraday-em_http (~> 1.0)
9696
faraday-em_synchrony (~> 1.0)
9797
faraday-excon (~> 1.1)
@@ -110,8 +110,8 @@ GEM
110110
faraday-em_synchrony (1.0.0)
111111
faraday-excon (1.1.0)
112112
faraday-httpclient (1.0.1)
113-
faraday-multipart (1.0.3)
114-
multipart-post (>= 1.2, < 3)
113+
faraday-multipart (1.0.4)
114+
multipart-post (~> 2)
115115
faraday-net_http (1.0.1)
116116
faraday-net_http_persistent (1.2.0)
117117
faraday-patron (1.0.0)
@@ -120,7 +120,7 @@ GEM
120120
faraday_middleware (1.2.0)
121121
faraday (~> 1.0)
122122
fastimage (2.2.6)
123-
fastlane (2.206.0)
123+
fastlane (2.209.0)
124124
CFPropertyList (>= 2.3, < 4.0.0)
125125
addressable (>= 2.8, < 3.0.0)
126126
artifactory (~> 3.0)
@@ -167,9 +167,9 @@ GEM
167167
fourflusher (2.3.1)
168168
fuzzy_match (2.0.4)
169169
gh_inspector (1.1.3)
170-
google-apis-androidpublisher_v3 (0.21.0)
171-
google-apis-core (>= 0.4, < 2.a)
172-
google-apis-core (0.5.0)
170+
google-apis-androidpublisher_v3 (0.25.0)
171+
google-apis-core (>= 0.7, < 2.a)
172+
google-apis-core (0.7.0)
173173
addressable (~> 2.5, >= 2.5.1)
174174
googleauth (>= 0.16.2, < 2.a)
175175
httpclient (>= 2.8.1, < 3.a)
@@ -178,46 +178,46 @@ GEM
178178
retriable (>= 2.0, < 4.a)
179179
rexml
180180
webrick
181-
google-apis-iamcredentials_v1 (0.10.0)
182-
google-apis-core (>= 0.4, < 2.a)
183-
google-apis-playcustomapp_v1 (0.7.0)
184-
google-apis-core (>= 0.4, < 2.a)
185-
google-apis-storage_v1 (0.14.0)
186-
google-apis-core (>= 0.4, < 2.a)
181+
google-apis-iamcredentials_v1 (0.13.0)
182+
google-apis-core (>= 0.7, < 2.a)
183+
google-apis-playcustomapp_v1 (0.10.0)
184+
google-apis-core (>= 0.7, < 2.a)
185+
google-apis-storage_v1 (0.17.0)
186+
google-apis-core (>= 0.7, < 2.a)
187187
google-cloud-core (1.6.0)
188188
google-cloud-env (~> 1.0)
189189
google-cloud-errors (~> 1.0)
190190
google-cloud-env (1.6.0)
191191
faraday (>= 0.17.3, < 3.0)
192192
google-cloud-errors (1.2.0)
193-
google-cloud-storage (1.36.2)
193+
google-cloud-storage (1.38.0)
194194
addressable (~> 2.8)
195195
digest-crc (~> 0.4)
196196
google-apis-iamcredentials_v1 (~> 0.1)
197-
google-apis-storage_v1 (~> 0.1)
197+
google-apis-storage_v1 (~> 0.17.0)
198198
google-cloud-core (~> 1.6)
199199
googleauth (>= 0.16.2, < 2.a)
200200
mini_mime (~> 1.0)
201-
googleauth (1.1.3)
201+
googleauth (1.2.0)
202202
faraday (>= 0.17.3, < 3.a)
203203
jwt (>= 1.4, < 3.0)
204204
memoist (~> 0.16)
205205
multi_json (~> 1.11)
206206
os (>= 0.9, < 2.0)
207207
signet (>= 0.16, < 2.a)
208208
highline (2.0.3)
209-
http-cookie (1.0.4)
209+
http-cookie (1.0.5)
210210
domain_name (~> 0.5)
211211
httpclient (2.8.3)
212-
i18n (1.10.0)
212+
i18n (1.12.0)
213213
concurrent-ruby (~> 1.0)
214214
jmespath (1.6.1)
215215
json (2.6.2)
216-
jwt (2.3.0)
216+
jwt (2.4.1)
217217
memoist (0.16.2)
218218
mini_magick (4.11.0)
219219
mini_mime (1.1.2)
220-
minitest (5.15.0)
220+
minitest (5.16.2)
221221
molinillo (0.6.6)
222222
multi_json (1.15.0)
223223
multipart-post (2.0.0)
@@ -228,40 +228,41 @@ GEM
228228
optparse (0.1.1)
229229
os (1.1.4)
230230
parallel (1.22.1)
231-
parser (3.1.2.0)
231+
parser (3.1.2.1)
232232
ast (~> 2.4.1)
233233
plist (3.6.0)
234234
public_suffix (4.0.7)
235235
rainbow (3.1.1)
236236
rake (13.0.6)
237237
redcarpet (3.5.1)
238-
regexp_parser (2.4.0)
238+
regexp_parser (2.5.0)
239239
representable (3.2.0)
240240
declarative (< 0.1.0)
241241
trailblazer-option (>= 0.1.1, < 0.2.0)
242242
uber (< 0.2.0)
243243
retriable (3.1.2)
244244
rexml (3.2.5)
245245
rouge (2.0.7)
246-
rubocop (1.29.1)
246+
rubocop (1.35.0)
247+
json (~> 2.3)
247248
parallel (~> 1.10)
248-
parser (>= 3.1.0.0)
249+
parser (>= 3.1.2.1)
249250
rainbow (>= 2.2.2, < 4.0)
250251
regexp_parser (>= 1.8, < 3.0)
251252
rexml (>= 3.2.5, < 4.0)
252-
rubocop-ast (>= 1.17.0, < 2.0)
253+
rubocop-ast (>= 1.20.1, < 2.0)
253254
ruby-progressbar (~> 1.7)
254255
unicode-display_width (>= 1.4.0, < 3.0)
255-
rubocop-ast (1.18.0)
256+
rubocop-ast (1.21.0)
256257
parser (>= 3.1.1.0)
257258
ruby-macho (1.4.0)
258259
ruby-progressbar (1.11.0)
259260
ruby2_keywords (0.0.5)
260261
rubyzip (2.3.2)
261262
security (0.1.3)
262-
signet (0.16.1)
263+
signet (0.17.0)
263264
addressable (~> 2.8)
264-
faraday (>= 0.17.5, < 3.0)
265+
faraday (>= 0.17.5, < 3.a)
265266
jwt (>= 1.5, < 3.0)
266267
multi_json (~> 1.10)
267268
simctl (1.6.8)
@@ -277,16 +278,16 @@ GEM
277278
tty-cursor (~> 0.7)
278279
typhoeus (1.4.0)
279280
ethon (>= 0.9.0)
280-
tzinfo (1.2.9)
281+
tzinfo (1.2.10)
281282
thread_safe (~> 0.1)
282283
uber (0.1.0)
283284
unf (0.1.4)
284285
unf_ext
285-
unf_ext (0.0.8.1)
286-
unicode-display_width (2.1.0)
286+
unf_ext (0.0.8.2)
287+
unicode-display_width (2.2.0)
287288
webrick (1.7.0)
288289
word_wrap (1.0.0)
289-
xcodeproj (1.21.0)
290+
xcodeproj (1.22.0)
290291
CFPropertyList (>= 2.3.3, < 4.0)
291292
atomos (~> 0.1.3)
292293
claide (>= 1.0.2, < 2.0)

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ brew install cocoapods
2121
pod install --repo-update
2222

2323
## install ruby via homebrew, use that
24-
brew install ruby@2.7
25-
/usr/local/opt/ruby@2.7/bin/bundle install
26-
/usr/local/opt/ruby@2.7/bin/bundle exec pod install --repo-update
24+
brew install ruby@3.1
25+
/usr/local/opt/ruby@3.1/bin/bundle install
26+
/usr/local/opt/ruby@3.1/bin/bundle exec pod install --repo-update
2727

2828
## install ruby via rbenv, use that
2929
brew install rbenv ruby-build

0 commit comments

Comments
 (0)