Skip to content

Commit 2f830ff

Browse files
authored
Merge branch 'development' into feature/loan-disbursement-screen
2 parents 456a8cd + 8c7d2bf commit 2f830ff

13 files changed

Lines changed: 471 additions & 89 deletions

File tree

Gemfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@ source "https://rubygems.org"
22

33
ruby '3.3.5'
44

5-
gem "fastlane"
5+
# Add compatibility gems for Ruby 3.3+
6+
gem "abbrev"
7+
gem "base64"
8+
gem "mutex_m"
9+
gem "bigdecimal"
10+
11+
gem "fastlane", "2.232.2"
12+
gem "cocoapods", "~> 1.16"
613

714
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
815
eval_gemfile(plugins_path) if File.exist?(plugins_path)

Gemfile.lock

Lines changed: 153 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,108 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.7)
4+
CFPropertyList (3.0.8)
5+
abbrev (0.1.2)
6+
activesupport (7.2.3)
57
base64
6-
nkf
7-
rexml
8-
addressable (2.8.7)
9-
public_suffix (>= 2.0.2, < 7.0)
8+
benchmark (>= 0.3)
9+
bigdecimal
10+
concurrent-ruby (~> 1.0, >= 1.3.1)
11+
connection_pool (>= 2.2.5)
12+
drb
13+
i18n (>= 1.6, < 2)
14+
logger (>= 1.4.2)
15+
minitest (>= 5.1)
16+
securerandom (>= 0.3)
17+
tzinfo (~> 2.0, >= 2.0.5)
18+
addressable (2.8.9)
19+
public_suffix (>= 2.0.2, < 8.0)
20+
algoliasearch (1.27.5)
21+
httpclient (~> 2.8, >= 2.8.3)
22+
json (>= 1.5.1)
1023
artifactory (3.0.17)
1124
atomos (0.1.3)
1225
aws-eventstream (1.4.0)
13-
aws-partitions (1.1152.0)
14-
aws-sdk-core (3.232.0)
26+
aws-partitions (1.1228.0)
27+
aws-sdk-core (3.244.0)
1528
aws-eventstream (~> 1, >= 1.3.0)
1629
aws-partitions (~> 1, >= 1.992.0)
1730
aws-sigv4 (~> 1.9)
1831
base64
1932
bigdecimal
2033
jmespath (~> 1, >= 1.6.1)
2134
logger
22-
aws-sdk-kms (1.112.0)
23-
aws-sdk-core (~> 3, >= 3.231.0)
35+
aws-sdk-kms (1.123.0)
36+
aws-sdk-core (~> 3, >= 3.244.0)
2437
aws-sigv4 (~> 1.5)
25-
aws-sdk-s3 (1.198.0)
26-
aws-sdk-core (~> 3, >= 3.231.0)
38+
aws-sdk-s3 (1.217.0)
39+
aws-sdk-core (~> 3, >= 3.244.0)
2740
aws-sdk-kms (~> 1)
2841
aws-sigv4 (~> 1.5)
2942
aws-sigv4 (1.12.1)
3043
aws-eventstream (~> 1, >= 1.0.2)
3144
babosa (1.0.4)
32-
base64 (0.3.0)
33-
bigdecimal (3.2.2)
45+
base64 (0.2.0)
46+
benchmark (0.5.0)
47+
bigdecimal (4.0.1)
3448
claide (1.1.0)
49+
cocoapods (1.16.2)
50+
addressable (~> 2.8)
51+
claide (>= 1.0.2, < 2.0)
52+
cocoapods-core (= 1.16.2)
53+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
54+
cocoapods-downloader (>= 2.1, < 3.0)
55+
cocoapods-plugins (>= 1.0.0, < 2.0)
56+
cocoapods-search (>= 1.0.0, < 2.0)
57+
cocoapods-trunk (>= 1.6.0, < 2.0)
58+
cocoapods-try (>= 1.1.0, < 2.0)
59+
colored2 (~> 3.1)
60+
escape (~> 0.0.4)
61+
fourflusher (>= 2.3.0, < 3.0)
62+
gh_inspector (~> 1.0)
63+
molinillo (~> 0.8.0)
64+
nap (~> 1.0)
65+
ruby-macho (>= 2.3.0, < 3.0)
66+
xcodeproj (>= 1.27.0, < 2.0)
67+
cocoapods-core (1.16.2)
68+
activesupport (>= 5.0, < 8)
69+
addressable (~> 2.8)
70+
algoliasearch (~> 1.0)
71+
concurrent-ruby (~> 1.1)
72+
fuzzy_match (~> 2.0.4)
73+
nap (~> 1.0)
74+
netrc (~> 0.11)
75+
public_suffix (~> 4.0)
76+
typhoeus (~> 1.0)
77+
cocoapods-deintegrate (1.0.5)
78+
cocoapods-downloader (2.1)
79+
cocoapods-plugins (1.0.0)
80+
nap
81+
cocoapods-search (1.0.1)
82+
cocoapods-trunk (1.6.0)
83+
nap (>= 0.8, < 2.0)
84+
netrc (~> 0.11)
85+
cocoapods-try (1.2.0)
3586
colored (1.2)
3687
colored2 (3.1.2)
3788
commander (4.6.0)
3889
highline (~> 2.0.0)
90+
concurrent-ruby (1.3.6)
91+
connection_pool (3.0.2)
92+
csv (3.3.5)
3993
declarative (0.0.20)
4094
digest-crc (0.7.0)
4195
rake (>= 12.0.0, < 14.0.0)
4296
domain_name (0.6.20240107)
4397
dotenv (2.8.1)
98+
drb (2.2.3)
4499
emoji_regex (3.2.3)
100+
escape (0.0.4)
101+
ethon (0.18.0)
102+
ffi (>= 1.15.0)
103+
logger
45104
excon (0.112.0)
46-
faraday (1.10.4)
105+
faraday (1.10.5)
47106
faraday-em_http (~> 1.0)
48107
faraday-em_synchrony (~> 1.0)
49108
faraday-excon (~> 1.1)
@@ -55,32 +114,36 @@ GEM
55114
faraday-rack (~> 1.0)
56115
faraday-retry (~> 1.0)
57116
ruby2_keywords (>= 0.0.4)
58-
faraday-cookie_jar (0.0.7)
117+
faraday-cookie_jar (0.0.8)
59118
faraday (>= 0.8.0)
60-
http-cookie (~> 1.0.0)
119+
http-cookie (>= 1.0.0)
61120
faraday-em_http (1.0.0)
62121
faraday-em_synchrony (1.0.1)
63122
faraday-excon (1.1.0)
64123
faraday-httpclient (1.0.1)
65-
faraday-multipart (1.1.1)
124+
faraday-multipart (1.2.0)
66125
multipart-post (~> 2.0)
67126
faraday-net_http (1.0.2)
68127
faraday-net_http_persistent (1.2.0)
69128
faraday-patron (1.0.0)
70129
faraday-rack (1.0.0)
71-
faraday-retry (1.0.3)
130+
faraday-retry (1.0.4)
72131
faraday_middleware (1.2.1)
73132
faraday (~> 1.0)
74-
fastimage (2.4.0)
75-
fastlane (2.228.0)
133+
fastimage (2.4.1)
134+
fastlane (2.232.2)
76135
CFPropertyList (>= 2.3, < 4.0.0)
136+
abbrev (~> 0.1.2)
77137
addressable (>= 2.8, < 3.0.0)
78138
artifactory (~> 3.0)
79-
aws-sdk-s3 (~> 1.0)
139+
aws-sdk-s3 (~> 1.197)
80140
babosa (>= 1.0.3, < 2.0.0)
81-
bundler (>= 1.12.0, < 3.0.0)
141+
base64 (~> 0.2.0)
142+
benchmark (>= 0.1.0)
143+
bundler (>= 1.17.3, < 5.0.0)
82144
colored (~> 1.2)
83145
commander (~> 4.6)
146+
csv (~> 3.3)
84147
dotenv (>= 2.1.1, < 3.0.0)
85148
emoji_regex (>= 0.1, < 4.0)
86149
excon (>= 0.71.0, < 1.0.0)
@@ -92,16 +155,20 @@ GEM
92155
gh_inspector (>= 1.1.2, < 2.0.0)
93156
google-apis-androidpublisher_v3 (~> 0.3)
94157
google-apis-playcustomapp_v1 (~> 0.1)
95-
google-cloud-env (>= 1.6.0, < 2.0.0)
158+
google-cloud-env (>= 1.6.0, <= 2.1.1)
96159
google-cloud-storage (~> 1.31)
97160
highline (~> 2.0)
98161
http-cookie (~> 1.0.5)
99162
json (< 3.0.0)
100163
jwt (>= 2.1.0, < 3)
164+
logger (>= 1.6, < 2.0)
101165
mini_magick (>= 4.9.4, < 5.0.0)
102166
multipart-post (>= 2.0.0, < 3.0.0)
167+
mutex_m (~> 0.3.0)
103168
naturally (~> 2.2)
169+
nkf (~> 0.2.0)
104170
optparse (>= 0.1.1, < 1.0.0)
171+
ostruct (>= 0.1.0)
105172
plist (>= 3.1.0, < 4.0.0)
106173
rubyzip (>= 2.0.0, < 3.0.0)
107174
security (= 0.1.5)
@@ -114,49 +181,56 @@ GEM
114181
xcodeproj (>= 1.13.0, < 2.0.0)
115182
xcpretty (~> 0.4.1)
116183
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
117-
fastlane-plugin-firebase_app_distribution (0.10.1)
118-
google-apis-firebaseappdistribution_v1 (~> 0.3.0)
119-
google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
184+
fastlane-plugin-firebase_app_distribution (1.0.0)
185+
fastlane (>= 2.232.0)
186+
google-apis-firebaseappdistribution_v1 (>= 0.9.0)
187+
google-apis-firebaseappdistribution_v1alpha (>= 0.12.0)
120188
fastlane-plugin-increment_build_number (0.0.4)
121189
fastlane-sirp (1.0.0)
122190
sysrandom (~> 1.0)
191+
ffi (1.17.3)
192+
ffi (1.17.3-x64-mingw-ucrt)
193+
fourflusher (2.3.1)
194+
fuzzy_match (2.0.4)
123195
gh_inspector (1.1.3)
124-
google-apis-androidpublisher_v3 (0.54.0)
125-
google-apis-core (>= 0.11.0, < 2.a)
126-
google-apis-core (0.11.3)
196+
google-apis-androidpublisher_v3 (0.97.0)
197+
google-apis-core (>= 0.15.0, < 2.a)
198+
google-apis-core (0.18.0)
127199
addressable (~> 2.5, >= 2.5.1)
128-
googleauth (>= 0.16.2, < 2.a)
129-
httpclient (>= 2.8.1, < 3.a)
200+
googleauth (~> 1.9)
201+
httpclient (>= 2.8.3, < 3.a)
130202
mini_mime (~> 1.0)
203+
mutex_m
131204
representable (~> 3.0)
132205
retriable (>= 2.0, < 4.a)
133-
rexml
134-
google-apis-firebaseappdistribution_v1 (0.3.0)
135-
google-apis-core (>= 0.11.0, < 2.a)
136-
google-apis-firebaseappdistribution_v1alpha (0.2.0)
137-
google-apis-core (>= 0.11.0, < 2.a)
138-
google-apis-iamcredentials_v1 (0.17.0)
139-
google-apis-core (>= 0.11.0, < 2.a)
140-
google-apis-playcustomapp_v1 (0.13.0)
141-
google-apis-core (>= 0.11.0, < 2.a)
142-
google-apis-storage_v1 (0.31.0)
143-
google-apis-core (>= 0.11.0, < 2.a)
206+
google-apis-firebaseappdistribution_v1 (0.17.0)
207+
google-apis-core (>= 0.15.0, < 2.a)
208+
google-apis-firebaseappdistribution_v1alpha (0.26.0)
209+
google-apis-core (>= 0.15.0, < 2.a)
210+
google-apis-iamcredentials_v1 (0.26.0)
211+
google-apis-core (>= 0.15.0, < 2.a)
212+
google-apis-playcustomapp_v1 (0.17.0)
213+
google-apis-core (>= 0.15.0, < 2.a)
214+
google-apis-storage_v1 (0.61.0)
215+
google-apis-core (>= 0.15.0, < 2.a)
144216
google-cloud-core (1.8.0)
145217
google-cloud-env (>= 1.0, < 3.a)
146218
google-cloud-errors (~> 1.0)
147-
google-cloud-env (1.6.0)
148-
faraday (>= 0.17.3, < 3.0)
219+
google-cloud-env (2.1.1)
220+
faraday (>= 1.0, < 3.a)
149221
google-cloud-errors (1.5.0)
150-
google-cloud-storage (1.47.0)
222+
google-cloud-storage (1.58.0)
151223
addressable (~> 2.8)
152224
digest-crc (~> 0.4)
153-
google-apis-iamcredentials_v1 (~> 0.1)
154-
google-apis-storage_v1 (~> 0.31.0)
225+
google-apis-core (>= 0.18, < 2)
226+
google-apis-iamcredentials_v1 (~> 0.18)
227+
google-apis-storage_v1 (>= 0.42)
155228
google-cloud-core (~> 1.6)
156-
googleauth (>= 0.16.2, < 2.a)
229+
googleauth (~> 1.9)
157230
mini_mime (~> 1.0)
158-
googleauth (1.8.1)
159-
faraday (>= 0.17.3, < 3.a)
231+
googleauth (1.11.2)
232+
faraday (>= 1.0, < 3.a)
233+
google-cloud-env (~> 2.1)
160234
jwt (>= 1.4, < 3.0)
161235
multi_json (~> 1.11)
162236
os (>= 0.9, < 2.0)
@@ -166,33 +240,45 @@ GEM
166240
domain_name (~> 0.5)
167241
httpclient (2.9.0)
168242
mutex_m
243+
i18n (1.14.8)
244+
concurrent-ruby (~> 1.0)
169245
jmespath (1.6.2)
170-
json (2.13.2)
246+
json (2.19.2)
171247
jwt (2.10.2)
172248
base64
173249
logger (1.7.0)
174250
mini_magick (4.13.2)
175251
mini_mime (1.1.5)
176-
multi_json (1.17.0)
252+
minitest (6.0.2)
253+
drb (~> 2.0)
254+
prism (~> 1.5)
255+
molinillo (0.8.0)
256+
multi_json (1.19.1)
177257
multipart-post (2.4.1)
178258
mutex_m (0.3.0)
179259
nanaimo (0.4.0)
260+
nap (1.1.0)
180261
naturally (2.3.0)
262+
netrc (0.11.0)
181263
nkf (0.2.0)
182-
optparse (0.6.0)
264+
optparse (0.8.1)
183265
os (1.1.4)
266+
ostruct (0.6.3)
184267
plist (3.7.2)
185-
public_suffix (6.0.2)
186-
rake (13.3.0)
268+
prism (1.9.0)
269+
public_suffix (4.0.7)
270+
rake (13.3.1)
187271
representable (3.2.0)
188272
declarative (< 0.1.0)
189273
trailblazer-option (>= 0.1.1, < 0.2.0)
190274
uber (< 0.2.0)
191-
retriable (3.1.2)
192-
rexml (3.4.2)
275+
retriable (3.4.1)
276+
rexml (3.4.4)
193277
rouge (3.28.0)
278+
ruby-macho (2.5.1)
194279
ruby2_keywords (0.0.5)
195280
rubyzip (2.4.1)
281+
securerandom (0.4.1)
196282
security (0.1.5)
197283
signet (0.21.0)
198284
addressable (~> 2.8)
@@ -211,6 +297,10 @@ GEM
211297
tty-screen (0.8.2)
212298
tty-spinner (0.9.3)
213299
tty-cursor (~> 0.7)
300+
typhoeus (1.6.0)
301+
ethon (>= 0.18.0)
302+
tzinfo (2.0.6)
303+
concurrent-ruby (~> 1.0)
214304
uber (0.1.0)
215305
unicode-display_width (2.6.0)
216306
word_wrap (1.0.0)
@@ -231,9 +321,14 @@ PLATFORMS
231321
x64-mingw-ucrt
232322

233323
DEPENDENCIES
234-
fastlane
324+
abbrev
325+
base64
326+
bigdecimal
327+
cocoapods (~> 1.16)
328+
fastlane (= 2.232.2)
235329
fastlane-plugin-firebase_app_distribution
236330
fastlane-plugin-increment_build_number
331+
mutex_m
237332

238333
RUBY VERSION
239334
ruby 3.3.5p100

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import org.gradle.kotlin.dsl.libs
22

33
// Top-level build file where you can add configuration options common to all sub-projects/modules.
44
plugins {
5+
alias(libs.plugins.kotlinCocoapods) apply false
56
alias(libs.plugins.android.application) apply false
67
alias(libs.plugins.android.library) apply false
78
alias(libs.plugins.android.test) apply false

0 commit comments

Comments
 (0)