Skip to content

Commit be822c5

Browse files
committed
chore: update Gemfile and Gemfile.lock for dependency adjustments
Reordered the exclusion of specific cocoapods versions in the Gemfile and updated several gem versions in the Gemfile.lock for improved compatibility and stability, including activesupport, aws-sdk components, and others. Adjusted Fastlane keychain settings for better command execution.
1 parent 8864435 commit be822c5

File tree

3 files changed

+40
-54
lines changed

3 files changed

+40
-54
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
33
ruby '2.7.7'
44

55
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
6-
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
6+
gem 'cocoapods', '>= 1.13', '!= 1.15.1', '!= 1.15.0'
77
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
88
gem 'xcodeproj', '< 1.26.0'
99
gem 'concurrent-ruby', '< 1.3.4'

Gemfile.lock

Lines changed: 37 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.9)
5-
abbrev (0.1.2)
6-
activesupport (7.1.6)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
7+
rexml
8+
activesupport (7.1.5.1)
79
base64
810
benchmark (>= 0.3)
911
bigdecimal
@@ -16,36 +18,35 @@ GEM
1618
mutex_m
1719
securerandom (>= 0.3)
1820
tzinfo (~> 2.0)
19-
addressable (2.8.8)
20-
public_suffix (>= 2.0.2, < 8.0)
21+
addressable (2.8.7)
22+
public_suffix (>= 2.0.2, < 7.0)
2123
algoliasearch (1.27.5)
2224
httpclient (~> 2.8, >= 2.8.3)
2325
json (>= 1.5.1)
2426
artifactory (3.0.17)
2527
atomos (0.1.3)
26-
aws-eventstream (1.4.0)
27-
aws-partitions (1.1195.0)
28-
aws-sdk-core (3.240.0)
28+
aws-eventstream (1.3.2)
29+
aws-partitions (1.1083.0)
30+
aws-sdk-core (3.222.1)
2931
aws-eventstream (~> 1, >= 1.3.0)
3032
aws-partitions (~> 1, >= 1.992.0)
3133
aws-sigv4 (~> 1.9)
3234
base64
33-
bigdecimal
3435
jmespath (~> 1, >= 1.6.1)
3536
logger
36-
aws-sdk-kms (1.118.0)
37-
aws-sdk-core (~> 3, >= 3.239.1)
37+
aws-sdk-kms (1.99.0)
38+
aws-sdk-core (~> 3, >= 3.216.0)
3839
aws-sigv4 (~> 1.5)
39-
aws-sdk-s3 (1.208.0)
40-
aws-sdk-core (~> 3, >= 3.234.0)
40+
aws-sdk-s3 (1.183.0)
41+
aws-sdk-core (~> 3, >= 3.216.0)
4142
aws-sdk-kms (~> 1)
4243
aws-sigv4 (~> 1.5)
43-
aws-sigv4 (1.12.1)
44+
aws-sigv4 (1.11.0)
4445
aws-eventstream (~> 1, >= 1.0.2)
4546
babosa (1.0.4)
4647
base64 (0.2.0)
47-
benchmark (0.5.0)
48-
bigdecimal (4.0.0)
48+
benchmark (0.4.0)
49+
bigdecimal (3.1.9)
4950
claide (1.1.0)
5051
cocoapods (1.15.2)
5152
addressable (~> 2.8)
@@ -89,17 +90,16 @@ GEM
8990
commander (4.6.0)
9091
highline (~> 2.0.0)
9192
concurrent-ruby (1.3.3)
92-
connection_pool (2.5.5)
93-
csv (3.3.5)
93+
connection_pool (2.5.0)
9494
declarative (0.0.20)
9595
digest-crc (0.7.0)
9696
rake (>= 12.0.0, < 14.0.0)
9797
domain_name (0.6.20240107)
9898
dotenv (2.8.1)
99-
drb (2.2.3)
99+
drb (2.2.1)
100100
emoji_regex (3.2.3)
101101
escape (0.0.4)
102-
ethon (0.15.0)
102+
ethon (0.16.0)
103103
ffi (>= 1.15.0)
104104
excon (0.112.0)
105105
faraday (1.10.4)
@@ -114,14 +114,14 @@ GEM
114114
faraday-rack (~> 1.0)
115115
faraday-retry (~> 1.0)
116116
ruby2_keywords (>= 0.0.4)
117-
faraday-cookie_jar (0.0.8)
117+
faraday-cookie_jar (0.0.7)
118118
faraday (>= 0.8.0)
119-
http-cookie (>= 1.0.0)
119+
http-cookie (~> 1.0.0)
120120
faraday-em_http (1.0.0)
121-
faraday-em_synchrony (1.0.1)
121+
faraday-em_synchrony (1.0.0)
122122
faraday-excon (1.1.0)
123123
faraday-httpclient (1.0.1)
124-
faraday-multipart (1.1.1)
124+
faraday-multipart (1.1.0)
125125
multipart-post (~> 2.0)
126126
faraday-net_http (1.0.2)
127127
faraday-net_http_persistent (1.2.0)
@@ -131,18 +131,15 @@ GEM
131131
faraday_middleware (1.2.1)
132132
faraday (~> 1.0)
133133
fastimage (2.4.0)
134-
fastlane (2.229.1)
134+
fastlane (2.227.0)
135135
CFPropertyList (>= 2.3, < 4.0.0)
136-
abbrev (~> 0.1.2)
137136
addressable (>= 2.8, < 3.0.0)
138137
artifactory (~> 3.0)
139138
aws-sdk-s3 (~> 1.0)
140139
babosa (>= 1.0.3, < 2.0.0)
141-
base64 (~> 0.2.0)
142140
bundler (>= 1.12.0, < 3.0.0)
143141
colored (~> 1.2)
144142
commander (~> 4.6)
145-
csv (~> 3.3)
146143
dotenv (>= 2.1.1, < 3.0.0)
147144
emoji_regex (>= 0.1, < 4.0)
148145
excon (>= 0.71.0, < 1.0.0)
@@ -162,9 +159,7 @@ GEM
162159
jwt (>= 2.1.0, < 3)
163160
mini_magick (>= 4.9.4, < 5.0.0)
164161
multipart-post (>= 2.0.0, < 3.0.0)
165-
mutex_m (~> 0.3.0)
166162
naturally (~> 2.2)
167-
nkf (~> 0.2.0)
168163
optparse (>= 0.1.1, < 1.0.0)
169164
plist (>= 3.1.0, < 4.0.0)
170165
rubyzip (>= 2.0.0, < 3.0.0)
@@ -176,15 +171,14 @@ GEM
176171
tty-spinner (>= 0.8.0, < 1.0.0)
177172
word_wrap (~> 1.0.0)
178173
xcodeproj (>= 1.13.0, < 2.0.0)
179-
xcpretty (~> 0.4.1)
174+
xcpretty (~> 0.4.0)
180175
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
181-
fastlane-plugin-bugsnag (3.0.0)
182-
abbrev
176+
fastlane-plugin-bugsnag (2.3.1)
183177
git
184178
xml-simple
185179
fastlane-sirp (1.0.0)
186180
sysrandom (~> 1.0)
187-
ffi (1.17.2)
181+
ffi (1.17.1)
188182
fourflusher (2.3.1)
189183
fuzzy_match (2.0.4)
190184
gh_inspector (1.1.3)
@@ -235,34 +229,34 @@ GEM
235229
i18n (1.14.7)
236230
concurrent-ruby (~> 1.0)
237231
jmespath (1.6.2)
238-
json (2.18.0)
239-
jwt (2.10.2)
232+
json (2.10.2)
233+
jwt (2.10.1)
240234
base64
241235
logger (1.7.0)
242236
mini_magick (4.13.2)
243237
mini_mime (1.1.5)
244-
minitest (5.26.1)
238+
minitest (5.25.5)
245239
molinillo (0.8.0)
246240
multi_json (1.15.0)
247241
multipart-post (2.4.1)
248242
mutex_m (0.3.0)
249243
nanaimo (0.3.0)
250244
nap (1.1.0)
251-
naturally (2.3.0)
245+
naturally (2.2.1)
252246
netrc (0.11.0)
253247
nkf (0.2.0)
254-
optparse (0.8.1)
248+
optparse (0.6.0)
255249
os (1.1.4)
256250
plist (3.7.2)
257251
public_suffix (4.0.7)
258-
rake (13.3.1)
252+
rake (13.2.1)
259253
rchardet (1.8.0)
260254
representable (3.2.0)
261255
declarative (< 0.1.0)
262256
trailblazer-option (>= 0.1.1, < 0.2.0)
263257
uber (< 0.2.0)
264258
retriable (3.1.2)
265-
rexml (3.4.4)
259+
rexml (3.4.1)
266260
rouge (3.28.0)
267261
ruby-macho (2.5.1)
268262
ruby2_keywords (0.0.5)
@@ -286,8 +280,8 @@ GEM
286280
tty-screen (0.8.2)
287281
tty-spinner (0.9.3)
288282
tty-cursor (~> 0.7)
289-
typhoeus (1.5.0)
290-
ethon (>= 0.9.0, < 0.16.0)
283+
typhoeus (1.4.1)
284+
ethon (>= 0.9.0)
291285
tzinfo (2.0.6)
292286
concurrent-ruby (~> 1.0)
293287
uber (0.1.0)

ios/fastlane/Fastfile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ platform :ios do
6161
get_provisioning_profile(app_identifier: "chat.rocket.reactnative.NotificationService", platform: "ios")
6262
get_provisioning_profile(app_identifier: "chat.rocket.reactnative.watchkitapp", platform: "ios")
6363
# pem(api_key: api_key) # still uses Spaceship http://docs.fastlane.tools/actions/pem/#how-does-it-work
64-
set_key_partition_list(
65-
keychain: ENV["MATCH_KEYCHAIN_NAME"],
66-
keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"],
67-
partition_list: "apple-tool:,apple:,codesign:"
68-
)
64+
sh "security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k \"#{ENV['MATCH_KEYCHAIN_PASSWORD']}\" ~/Library/Keychains/#{ENV['MATCH_KEYCHAIN_NAME']}-db"
6965
gym(
7066
scheme: "RocketChatRN",
7167
workspace: "RocketChatRN.xcworkspace",
@@ -85,11 +81,7 @@ platform :ios do
8581
output_path: './'
8682
)
8783

88-
set_key_partition_list(
89-
keychain: ENV["MATCH_KEYCHAIN_NAME"],
90-
keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"],
91-
partition_list: "apple-tool:,apple:,codesign:"
92-
)
84+
sh "security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k \"#{ENV['MATCH_KEYCHAIN_PASSWORD']}\" ~/Library/Keychains/#{ENV['MATCH_KEYCHAIN_NAME']}-db"
9385

9486
update_code_signing_settings(
9587
profile_name: "match AppStore chat.rocket.ios.NotificationService",

0 commit comments

Comments
 (0)