Skip to content

Commit 11ee146

Browse files
committed
Merge branch 'main' into pac-guerreiro/fix/migrate-25309-25310-25311-25312-25313-to-typescript
2 parents 20b34e9 + 8fe465d commit 11ee146

File tree

162 files changed

+2578
-1265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+2578
-1265
lines changed

Gemfile.lock

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ GEM
33
specs:
44
CFPropertyList (3.0.6)
55
rexml
6-
activesupport (7.0.8)
6+
activesupport (6.1.7.7)
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)
1112
addressable (2.8.6)
1213
public_suffix (>= 2.0.2, < 6.0)
1314
algoliasearch (1.27.5)
@@ -80,7 +81,8 @@ GEM
8081
declarative (0.0.20)
8182
digest-crc (0.6.5)
8283
rake (>= 12.0.0, < 14.0.0)
83-
domain_name (0.6.20240107)
84+
domain_name (0.5.20190701)
85+
unf (>= 0.0.5, < 1.0.0)
8486
dotenv (2.8.1)
8587
emoji_regex (3.2.3)
8688
escape (0.0.4)
@@ -187,11 +189,11 @@ GEM
187189
google-cloud-env (1.6.0)
188190
faraday (>= 0.17.3, < 3.0)
189191
google-cloud-errors (1.3.1)
190-
google-cloud-storage (1.47.0)
192+
google-cloud-storage (1.37.0)
191193
addressable (~> 2.8)
192194
digest-crc (~> 0.4)
193195
google-apis-iamcredentials_v1 (~> 0.1)
194-
google-apis-storage_v1 (~> 0.31.0)
196+
google-apis-storage_v1 (~> 0.1)
195197
google-cloud-core (~> 1.6)
196198
googleauth (>= 0.16.2, < 2.a)
197199
mini_mime (~> 1.0)
@@ -260,6 +262,9 @@ GEM
260262
tzinfo (2.0.6)
261263
concurrent-ruby (~> 1.0)
262264
uber (0.1.0)
265+
unf (0.1.4)
266+
unf_ext
267+
unf_ext (0.0.9.1)
263268
unicode-display_width (2.5.0)
264269
word_wrap (1.0.0)
265270
xcodeproj (1.23.0)
@@ -273,6 +278,7 @@ GEM
273278
rouge (~> 2.0.7)
274279
xcpretty-travis-formatter (1.0.1)
275280
xcpretty (~> 0.2, >= 0.0.7)
281+
zeitwerk (2.6.13)
276282

277283
PLATFORMS
278284
arm64-darwin-21
@@ -292,4 +298,4 @@ RUBY VERSION
292298
ruby 2.6.10p210
293299

294300
BUNDLED WITH
295-
2.4.19
301+
2.3.22

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ android {
9898
minSdkVersion rootProject.ext.minSdkVersion
9999
targetSdkVersion rootProject.ext.targetSdkVersion
100100
multiDexEnabled rootProject.ext.multiDexEnabled
101-
versionCode 1001046002
102-
versionName "1.4.60-2"
101+
versionCode 1001046008
102+
versionName "1.4.60-8"
103103
}
104104

105105
flavorDimensions "default"
Lines changed: 43 additions & 0 deletions
Loading
Lines changed: 50 additions & 0 deletions
Loading
Lines changed: 38 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)