Skip to content

Commit b7d1c85

Browse files
bcylinbcylin
committed
Merge branch 'feature/ruby-3.2' into develop
2 parents 5c4fe62 + 43d2777 commit b7d1c85

6 files changed

Lines changed: 171 additions & 90 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ jobs:
88
if: contains(github.event.head_commit.message, '[ci skip]') == false
99
env:
1010
BUNDLE_PATH: vendor/bundle
11-
DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer
11+
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
1212
steps:
13-
- uses: actions/checkout@v2.3.3
14-
- uses: actions/setup-ruby@v1.1.2
13+
- uses: actions/checkout@v2
14+
- uses: ruby/setup-ruby@v1
1515
with:
16-
ruby-version: '2.6.x'
16+
ruby-version: '3.2.1'
1717
- run: |
1818
ls -l /Applications | grep -i Xcode
1919
2020
# Cache
2121
- name: Cache ${{ env.BUNDLE_PATH }}
22-
uses: actions/cache@v2.1.1
22+
uses: actions/cache@v2
2323
with:
2424
path: ${{ env.BUNDLE_PATH }}
2525
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}

‎.github/workflows/docs.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ jobs:
99
env:
1010
BUNDLE_PATH: vendor/bundle
1111
MINT_PATH: vendor/mint
12+
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
1213
steps:
1314
- uses: actions/checkout@v2
14-
- uses: actions/setup-ruby@v1
15+
- uses: ruby/setup-ruby@v1
1516
with:
16-
ruby-version: '2.7'
17+
ruby-version: '3.2.1'
1718

1819
# Cache
1920
- name: Cache ${{ env.BUNDLE_PATH }}

‎Gemfile.lock‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,58 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.5)
4+
CFPropertyList (3.0.6)
55
rexml
6-
activesupport (6.1.6.1)
6+
activesupport (7.0.4.3)
77
concurrent-ruby (~> 1.0, >= 1.0.2)
88
i18n (>= 1.6, < 2)
99
minitest (>= 5.1)
1010
tzinfo (~> 2.0)
11-
zeitwerk (~> 2.3)
12-
addressable (2.8.0)
13-
public_suffix (>= 2.0.2, < 5.0)
11+
addressable (2.8.1)
12+
public_suffix (>= 2.0.2, < 6.0)
1413
algoliasearch (1.27.5)
1514
httpclient (~> 2.8, >= 2.8.3)
1615
json (>= 1.5.1)
1716
artifactory (3.0.15)
1817
atomos (0.1.3)
1918
aws-eventstream (1.2.0)
20-
aws-partitions (1.613.0)
21-
aws-sdk-core (3.131.5)
19+
aws-partitions (1.730.0)
20+
aws-sdk-core (3.170.1)
2221
aws-eventstream (~> 1, >= 1.0.2)
23-
aws-partitions (~> 1, >= 1.525.0)
24-
aws-sigv4 (~> 1.1)
22+
aws-partitions (~> 1, >= 1.651.0)
23+
aws-sigv4 (~> 1.5)
2524
jmespath (~> 1, >= 1.6.1)
26-
aws-sdk-kms (1.58.0)
27-
aws-sdk-core (~> 3, >= 3.127.0)
25+
aws-sdk-kms (1.63.0)
26+
aws-sdk-core (~> 3, >= 3.165.0)
2827
aws-sigv4 (~> 1.1)
29-
aws-sdk-s3 (1.114.0)
30-
aws-sdk-core (~> 3, >= 3.127.0)
28+
aws-sdk-s3 (1.119.1)
29+
aws-sdk-core (~> 3, >= 3.165.0)
3130
aws-sdk-kms (~> 1)
3231
aws-sigv4 (~> 1.4)
33-
aws-sigv4 (1.5.1)
32+
aws-sigv4 (1.5.2)
3433
aws-eventstream (~> 1, >= 1.0.2)
3534
babosa (1.0.4)
3635
claide (1.1.0)
37-
cocoapods (1.11.3)
36+
cocoapods (1.12.0)
3837
addressable (~> 2.8)
3938
claide (>= 1.0.2, < 2.0)
40-
cocoapods-core (= 1.11.3)
39+
cocoapods-core (= 1.12.0)
4140
cocoapods-deintegrate (>= 1.0.3, < 2.0)
42-
cocoapods-downloader (>= 1.4.0, < 2.0)
41+
cocoapods-downloader (>= 1.6.0, < 2.0)
4342
cocoapods-plugins (>= 1.0.0, < 2.0)
4443
cocoapods-search (>= 1.0.0, < 2.0)
45-
cocoapods-trunk (>= 1.4.0, < 2.0)
44+
cocoapods-trunk (>= 1.6.0, < 2.0)
4645
cocoapods-try (>= 1.1.0, < 2.0)
4746
colored2 (~> 3.1)
4847
escape (~> 0.0.4)
4948
fourflusher (>= 2.3.0, < 3.0)
5049
gh_inspector (~> 1.0)
5150
molinillo (~> 0.8.0)
5251
nap (~> 1.0)
53-
ruby-macho (>= 1.0, < 3.0)
52+
ruby-macho (>= 2.3.0, < 3.0)
5453
xcodeproj (>= 1.21.0, < 2.0)
55-
cocoapods-core (1.11.3)
56-
activesupport (>= 5.0, < 7)
54+
cocoapods-core (1.12.0)
55+
activesupport (>= 5.0, < 8)
5756
addressable (~> 2.8)
5857
algoliasearch (~> 1.0)
5958
concurrent-ruby (~> 1.1)
@@ -75,7 +74,7 @@ GEM
7574
colored2 (3.1.2)
7675
commander (4.6.0)
7776
highline (~> 2.0.0)
78-
concurrent-ruby (1.1.10)
77+
concurrent-ruby (1.2.2)
7978
declarative (0.0.20)
8079
digest-crc (0.6.4)
8180
rake (>= 12.0.0, < 14.0.0)
@@ -84,10 +83,10 @@ GEM
8483
dotenv (2.8.1)
8584
emoji_regex (3.2.3)
8685
escape (0.0.4)
87-
ethon (0.15.0)
86+
ethon (0.16.0)
8887
ffi (>= 1.15.0)
89-
excon (0.92.4)
90-
faraday (1.10.0)
88+
excon (0.99.0)
89+
faraday (1.10.3)
9190
faraday-em_http (~> 1.0)
9291
faraday-em_synchrony (~> 1.0)
9392
faraday-excon (~> 1.1)
@@ -116,7 +115,7 @@ GEM
116115
faraday_middleware (1.2.0)
117116
faraday (~> 1.0)
118117
fastimage (2.2.6)
119-
fastlane (2.208.0)
118+
fastlane (2.212.1)
120119
CFPropertyList (>= 2.3, < 4.0.0)
121120
addressable (>= 2.8, < 3.0.0)
122121
artifactory (~> 3.0)
@@ -159,9 +158,9 @@ GEM
159158
fourflusher (2.3.1)
160159
fuzzy_match (2.0.4)
161160
gh_inspector (1.1.3)
162-
google-apis-androidpublisher_v3 (0.25.0)
163-
google-apis-core (>= 0.7, < 2.a)
164-
google-apis-core (0.7.0)
161+
google-apis-androidpublisher_v3 (0.37.0)
162+
google-apis-core (>= 0.11.0, < 2.a)
163+
google-apis-core (0.11.0)
165164
addressable (~> 2.5, >= 2.5.1)
166165
googleauth (>= 0.16.2, < 2.a)
167166
httpclient (>= 2.8.1, < 3.a)
@@ -170,27 +169,27 @@ GEM
170169
retriable (>= 2.0, < 4.a)
171170
rexml
172171
webrick
173-
google-apis-iamcredentials_v1 (0.13.0)
174-
google-apis-core (>= 0.7, < 2.a)
175-
google-apis-playcustomapp_v1 (0.10.0)
176-
google-apis-core (>= 0.7, < 2.a)
177-
google-apis-storage_v1 (0.17.0)
178-
google-apis-core (>= 0.7, < 2.a)
172+
google-apis-iamcredentials_v1 (0.17.0)
173+
google-apis-core (>= 0.11.0, < 2.a)
174+
google-apis-playcustomapp_v1 (0.13.0)
175+
google-apis-core (>= 0.11.0, < 2.a)
176+
google-apis-storage_v1 (0.19.0)
177+
google-apis-core (>= 0.9.0, < 2.a)
179178
google-cloud-core (1.6.0)
180179
google-cloud-env (~> 1.0)
181180
google-cloud-errors (~> 1.0)
182181
google-cloud-env (1.6.0)
183182
faraday (>= 0.17.3, < 3.0)
184-
google-cloud-errors (1.2.0)
185-
google-cloud-storage (1.38.0)
183+
google-cloud-errors (1.3.1)
184+
google-cloud-storage (1.44.0)
186185
addressable (~> 2.8)
187186
digest-crc (~> 0.4)
188187
google-apis-iamcredentials_v1 (~> 0.1)
189-
google-apis-storage_v1 (~> 0.17.0)
188+
google-apis-storage_v1 (~> 0.19.0)
190189
google-cloud-core (~> 1.6)
191190
googleauth (>= 0.16.2, < 2.a)
192191
mini_mime (~> 1.0)
193-
googleauth (1.2.0)
192+
googleauth (1.3.0)
194193
faraday (>= 0.17.3, < 3.a)
195194
jwt (>= 1.4, < 3.0)
196195
memoist (~> 0.16)
@@ -203,7 +202,7 @@ GEM
203202
httpclient (2.8.3)
204203
i18n (1.12.0)
205204
concurrent-ruby (~> 1.0)
206-
jazzy (0.14.2)
205+
jazzy (0.14.3)
207206
cocoapods (~> 1.5)
208207
mustache (~> 1.1)
209208
open4 (~> 1.3)
@@ -213,14 +212,15 @@ GEM
213212
sassc (~> 2.1)
214213
sqlite3 (~> 1.3)
215214
xcinvoke (~> 0.3.0)
216-
jmespath (1.6.1)
217-
json (2.6.2)
218-
jwt (2.4.1)
215+
jmespath (1.6.2)
216+
json (2.6.3)
217+
jwt (2.7.0)
219218
liferaft (0.0.6)
220219
memoist (0.16.2)
221-
mini_magick (4.11.0)
220+
mini_magick (4.12.0)
222221
mini_mime (1.1.2)
223-
minitest (5.16.2)
222+
mini_portile2 (2.8.1)
223+
minitest (5.18.0)
224224
molinillo (0.8.0)
225225
multi_json (1.15.0)
226226
multipart-post (2.0.0)
@@ -232,10 +232,10 @@ GEM
232232
open4 (1.3.4)
233233
optparse (0.1.1)
234234
os (1.1.4)
235-
plist (3.6.0)
235+
plist (3.7.0)
236236
public_suffix (4.0.7)
237237
rake (13.0.6)
238-
redcarpet (3.5.1)
238+
redcarpet (3.6.0)
239239
representable (3.2.0)
240240
declarative (< 0.1.0)
241241
trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -254,10 +254,11 @@ GEM
254254
faraday (>= 0.17.5, < 3.a)
255255
jwt (>= 1.5, < 3.0)
256256
multi_json (~> 1.10)
257-
simctl (1.6.8)
257+
simctl (1.6.10)
258258
CFPropertyList
259259
naturally
260-
sqlite3 (1.4.4)
260+
sqlite3 (1.6.1)
261+
mini_portile2 (~> 2.8.0)
261262
terminal-notifier (2.0.0)
262263
terminal-table (1.8.0)
263264
unicode-display_width (~> 1.1, >= 1.1.1)
@@ -268,14 +269,14 @@ GEM
268269
tty-cursor (~> 0.7)
269270
typhoeus (1.4.0)
270271
ethon (>= 0.9.0)
271-
tzinfo (2.0.5)
272+
tzinfo (2.0.6)
272273
concurrent-ruby (~> 1.0)
273274
uber (0.1.0)
274275
unf (0.1.4)
275276
unf_ext
276277
unf_ext (0.0.8.2)
277278
unicode-display_width (1.8.0)
278-
webrick (1.7.0)
279+
webrick (1.8.1)
279280
word_wrap (1.0.0)
280281
xcinvoke (0.3.0)
281282
liferaft (~> 0.0.6)
@@ -290,7 +291,6 @@ GEM
290291
rouge (~> 2.0.7)
291292
xcpretty-travis-formatter (1.0.1)
292293
xcpretty (~> 0.2, >= 0.0.7)
293-
zeitwerk (2.6.0)
294294

295295
PLATFORMS
296296
ruby
@@ -301,4 +301,4 @@ DEPENDENCIES
301301
xcpretty
302302

303303
BUNDLED WITH
304-
2.1.4
304+
2.4.6

‎Package/Package.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ packages:
44
path: ../
55
options:
66
deploymentTarget:
7-
iOS: "9.0"
8-
tvOS: "9.0"
7+
iOS: "11.0"
8+
tvOS: "11.0"
99
targetTemplates:
1010
AppTemplate:
1111
type: application

0 commit comments

Comments
 (0)