Skip to content

Commit 1ebc7da

Browse files
committed
Merge remote-tracking branch 'origin/release/2.0.0'
2 parents 40a04da + 4368414 commit 1ebc7da

File tree

132 files changed

+3872
-3388
lines changed

Some content is hidden

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

132 files changed

+3872
-3388
lines changed

.bundle/config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
BUNDLE_PATH: "vendor/bundle"

.github/workflows/deploy-qa.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# .github/workflows/deploy-qa.yml
2+
name: Deploy QA Build to Firebase
3+
4+
on:
5+
push:
6+
branches:
7+
- 'release/**'
8+
workflow_dispatch:
9+
10+
jobs:
11+
deploy_qa:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout repository
15+
uses: actions/checkout@v6
16+
with:
17+
fetch-depth: 0
18+
19+
- name: Setup Java
20+
uses: actions/setup-java@v5
21+
with:
22+
distribution: 'temurin'
23+
java-version: '17'
24+
25+
- name: Setup Gradle
26+
uses: gradle/actions/setup-gradle@v5
27+
28+
- name: Create required files from secrets
29+
env:
30+
GOOGLE_SERVICES_JSON_CONTENT: ${{ secrets.GOOGLE_SERVICES_JSON }}
31+
DEBUG_KEYSTORE_BASE64: ${{ secrets.DEBUG_KEYSTORE_BASE64 }}
32+
LOCAL_PROPERTIES_CONTENT: ${{ secrets.LOCAL_PROPERTIES }} # 수정된 시크릿 이름
33+
run: |
34+
echo "$GOOGLE_SERVICES_JSON_CONTENT" > app/google-services.json
35+
mkdir -p keystore
36+
echo "$DEBUG_KEYSTORE_BASE64" | base64 --decode > keystore/hilingual-debug-key.jks
37+
echo "$LOCAL_PROPERTIES_CONTENT" > local.properties
38+
39+
- name: Setup Ruby
40+
uses: ruby/setup-ruby@v1
41+
with:
42+
ruby-version: '3.4.7'
43+
bundler-cache: true
44+
45+
- name: Run unit tests
46+
run: ./gradlew testDebugUnitTest
47+
48+
- name: Deploy to Firebase App Distribution
49+
env:
50+
FIREBASE_APP_ID_DEBUG: ${{ secrets.FIREBASE_APP_ID_DEBUG }}
51+
FIREBASE_SERVICE_ACCOUNT_JSON_CONTENT: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_JSON }}
52+
run: |
53+
echo "$FIREBASE_SERVICE_ACCOUNT_JSON_CONTENT" > firebase_credentials.json
54+
export FIREBASE_SERVICE_CREDENTIALS_JSON_PATH="$(pwd)/firebase_credentials.json"
55+
bundle exec fastlane android qa

.github/workflows/pr_checker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v5
14+
uses: actions/checkout@v6
1515

1616
- name: Gradle cache
1717
uses: actions/cache@v4
@@ -54,7 +54,7 @@ jobs:
5454
runs-on: ubuntu-latest
5555
steps:
5656
- name: Checkout
57-
uses: actions/checkout@v5
57+
uses: actions/checkout@v6
5858

5959
- name: Gradle cache
6060
uses: actions/cache@v4

.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ proguard/
159159
*.ipr
160160
*.swp
161161

162-
# Keystore files
162+
# Keystores files
163163

164164
# Google Services (e.g. APIs or Firebase)
165165
# google-services.json
@@ -239,4 +239,7 @@ fabric.properties
239239

240240
!/gradle/wrapper/gradle-wrapper.jar
241241

242-
# End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,macos,windows,linux
242+
# End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,macos,windows,linux
243+
244+
# Fastlane dependencies
245+
vendor/

Gemfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
source "https://rubygems.org"
2+
3+
gem "fastlane", ">= 2.226.0"
4+
5+
# Ruby 3.4 compatibility: Add standard libraries that were removed from default gems
6+
gem "base64"
7+
gem "bigdecimal"
8+
gem "mutex_m"
9+
gem "abbrev"
10+
gem "observer"
11+
gem "racc"
12+
gem "drb"
13+
gem "csv"
14+
gem "nkf"
15+
16+
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
17+
eval_gemfile(plugins_path) if File.exist?(plugins_path)

Gemfile.lock

Lines changed: 250 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,250 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (3.0.8)
5+
abbrev (0.1.2)
6+
addressable (2.8.8)
7+
public_suffix (>= 2.0.2, < 8.0)
8+
artifactory (3.0.17)
9+
atomos (0.1.3)
10+
aws-eventstream (1.4.0)
11+
aws-partitions (1.1190.0)
12+
aws-sdk-core (3.239.2)
13+
aws-eventstream (~> 1, >= 1.3.0)
14+
aws-partitions (~> 1, >= 1.992.0)
15+
aws-sigv4 (~> 1.9)
16+
base64
17+
bigdecimal
18+
jmespath (~> 1, >= 1.6.1)
19+
logger
20+
aws-sdk-kms (1.118.0)
21+
aws-sdk-core (~> 3, >= 3.239.1)
22+
aws-sigv4 (~> 1.5)
23+
aws-sdk-s3 (1.206.0)
24+
aws-sdk-core (~> 3, >= 3.234.0)
25+
aws-sdk-kms (~> 1)
26+
aws-sigv4 (~> 1.5)
27+
aws-sigv4 (1.12.1)
28+
aws-eventstream (~> 1, >= 1.0.2)
29+
babosa (1.0.4)
30+
base64 (0.3.0)
31+
bigdecimal (3.3.1)
32+
claide (1.1.0)
33+
colored (1.2)
34+
colored2 (3.1.2)
35+
commander (4.6.0)
36+
highline (~> 2.0.0)
37+
csv (3.3.5)
38+
declarative (0.0.20)
39+
digest-crc (0.7.0)
40+
rake (>= 12.0.0, < 14.0.0)
41+
domain_name (0.6.20240107)
42+
dotenv (2.8.1)
43+
drb (2.2.3)
44+
emoji_regex (3.2.3)
45+
excon (0.112.0)
46+
faraday (1.10.4)
47+
faraday-em_http (~> 1.0)
48+
faraday-em_synchrony (~> 1.0)
49+
faraday-excon (~> 1.1)
50+
faraday-httpclient (~> 1.0)
51+
faraday-multipart (~> 1.0)
52+
faraday-net_http (~> 1.0)
53+
faraday-net_http_persistent (~> 1.0)
54+
faraday-patron (~> 1.0)
55+
faraday-rack (~> 1.0)
56+
faraday-retry (~> 1.0)
57+
ruby2_keywords (>= 0.0.4)
58+
faraday-cookie_jar (0.0.8)
59+
faraday (>= 0.8.0)
60+
http-cookie (>= 1.0.0)
61+
faraday-em_http (1.0.0)
62+
faraday-em_synchrony (1.0.1)
63+
faraday-excon (1.1.0)
64+
faraday-httpclient (1.0.1)
65+
faraday-multipart (1.1.1)
66+
multipart-post (~> 2.0)
67+
faraday-net_http (1.0.2)
68+
faraday-net_http_persistent (1.2.0)
69+
faraday-patron (1.0.0)
70+
faraday-rack (1.0.0)
71+
faraday-retry (1.0.3)
72+
faraday_middleware (1.2.1)
73+
faraday (~> 1.0)
74+
fastimage (2.4.0)
75+
fastlane (2.229.0)
76+
CFPropertyList (>= 2.3, < 4.0.0)
77+
abbrev (~> 0.1.2)
78+
addressable (>= 2.8, < 3.0.0)
79+
artifactory (~> 3.0)
80+
aws-sdk-s3 (~> 1.0)
81+
babosa (>= 1.0.3, < 2.0.0)
82+
bundler (>= 1.12.0, < 3.0.0)
83+
colored (~> 1.2)
84+
commander (~> 4.6)
85+
csv (~> 3.3)
86+
dotenv (>= 2.1.1, < 3.0.0)
87+
emoji_regex (>= 0.1, < 4.0)
88+
excon (>= 0.71.0, < 1.0.0)
89+
faraday (~> 1.0)
90+
faraday-cookie_jar (~> 0.0.6)
91+
faraday_middleware (~> 1.0)
92+
fastimage (>= 2.1.0, < 3.0.0)
93+
fastlane-sirp (>= 1.0.0)
94+
gh_inspector (>= 1.1.2, < 2.0.0)
95+
google-apis-androidpublisher_v3 (~> 0.3)
96+
google-apis-playcustomapp_v1 (~> 0.1)
97+
google-cloud-env (>= 1.6.0, < 2.0.0)
98+
google-cloud-storage (~> 1.31)
99+
highline (~> 2.0)
100+
http-cookie (~> 1.0.5)
101+
json (< 3.0.0)
102+
jwt (>= 2.1.0, < 3)
103+
mini_magick (>= 4.9.4, < 5.0.0)
104+
multipart-post (>= 2.0.0, < 3.0.0)
105+
mutex_m (~> 0.3.0)
106+
naturally (~> 2.2)
107+
optparse (>= 0.1.1, < 1.0.0)
108+
plist (>= 3.1.0, < 4.0.0)
109+
rubyzip (>= 2.0.0, < 3.0.0)
110+
security (= 0.1.5)
111+
simctl (~> 1.6.3)
112+
terminal-notifier (>= 2.0.0, < 3.0.0)
113+
terminal-table (~> 3)
114+
tty-screen (>= 0.6.3, < 1.0.0)
115+
tty-spinner (>= 0.8.0, < 1.0.0)
116+
word_wrap (~> 1.0.0)
117+
xcodeproj (>= 1.13.0, < 2.0.0)
118+
xcpretty (~> 0.4.1)
119+
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
120+
fastlane-plugin-firebase_app_distribution (0.10.1)
121+
google-apis-firebaseappdistribution_v1 (~> 0.3.0)
122+
google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
123+
fastlane-sirp (1.0.0)
124+
sysrandom (~> 1.0)
125+
gh_inspector (1.1.3)
126+
google-apis-androidpublisher_v3 (0.54.0)
127+
google-apis-core (>= 0.11.0, < 2.a)
128+
google-apis-core (0.11.3)
129+
addressable (~> 2.5, >= 2.5.1)
130+
googleauth (>= 0.16.2, < 2.a)
131+
httpclient (>= 2.8.1, < 3.a)
132+
mini_mime (~> 1.0)
133+
representable (~> 3.0)
134+
retriable (>= 2.0, < 4.a)
135+
rexml
136+
google-apis-firebaseappdistribution_v1 (0.3.0)
137+
google-apis-core (>= 0.11.0, < 2.a)
138+
google-apis-firebaseappdistribution_v1alpha (0.2.0)
139+
google-apis-core (>= 0.11.0, < 2.a)
140+
google-apis-iamcredentials_v1 (0.17.0)
141+
google-apis-core (>= 0.11.0, < 2.a)
142+
google-apis-playcustomapp_v1 (0.13.0)
143+
google-apis-core (>= 0.11.0, < 2.a)
144+
google-apis-storage_v1 (0.31.0)
145+
google-apis-core (>= 0.11.0, < 2.a)
146+
google-cloud-core (1.8.0)
147+
google-cloud-env (>= 1.0, < 3.a)
148+
google-cloud-errors (~> 1.0)
149+
google-cloud-env (1.6.0)
150+
faraday (>= 0.17.3, < 3.0)
151+
google-cloud-errors (1.5.0)
152+
google-cloud-storage (1.47.0)
153+
addressable (~> 2.8)
154+
digest-crc (~> 0.4)
155+
google-apis-iamcredentials_v1 (~> 0.1)
156+
google-apis-storage_v1 (~> 0.31.0)
157+
google-cloud-core (~> 1.6)
158+
googleauth (>= 0.16.2, < 2.a)
159+
mini_mime (~> 1.0)
160+
googleauth (1.8.1)
161+
faraday (>= 0.17.3, < 3.a)
162+
jwt (>= 1.4, < 3.0)
163+
multi_json (~> 1.11)
164+
os (>= 0.9, < 2.0)
165+
signet (>= 0.16, < 2.a)
166+
highline (2.0.3)
167+
http-cookie (1.0.8)
168+
domain_name (~> 0.5)
169+
httpclient (2.9.0)
170+
mutex_m
171+
jmespath (1.6.2)
172+
json (2.17.1)
173+
jwt (2.10.2)
174+
base64
175+
logger (1.7.0)
176+
mini_magick (4.13.2)
177+
mini_mime (1.1.5)
178+
multi_json (1.18.0)
179+
multipart-post (2.4.1)
180+
mutex_m (0.3.0)
181+
nanaimo (0.4.0)
182+
naturally (2.3.0)
183+
nkf (0.2.0)
184+
observer (0.1.2)
185+
optparse (0.8.0)
186+
os (1.1.4)
187+
plist (3.7.2)
188+
public_suffix (7.0.0)
189+
racc (1.8.1)
190+
rake (13.3.1)
191+
representable (3.2.0)
192+
declarative (< 0.1.0)
193+
trailblazer-option (>= 0.1.1, < 0.2.0)
194+
uber (< 0.2.0)
195+
retriable (3.1.2)
196+
rexml (3.4.4)
197+
rouge (3.28.0)
198+
ruby2_keywords (0.0.5)
199+
rubyzip (2.4.1)
200+
security (0.1.5)
201+
signet (0.21.0)
202+
addressable (~> 2.8)
203+
faraday (>= 0.17.5, < 3.a)
204+
jwt (>= 1.5, < 4.0)
205+
multi_json (~> 1.10)
206+
simctl (1.6.10)
207+
CFPropertyList
208+
naturally
209+
sysrandom (1.0.5)
210+
terminal-notifier (2.0.0)
211+
terminal-table (3.0.2)
212+
unicode-display_width (>= 1.1.1, < 3)
213+
trailblazer-option (0.1.2)
214+
tty-cursor (0.7.1)
215+
tty-screen (0.8.2)
216+
tty-spinner (0.9.3)
217+
tty-cursor (~> 0.7)
218+
uber (0.1.0)
219+
unicode-display_width (2.6.0)
220+
word_wrap (1.0.0)
221+
xcodeproj (1.27.0)
222+
CFPropertyList (>= 2.3.3, < 4.0)
223+
atomos (~> 0.1.3)
224+
claide (>= 1.0.2, < 2.0)
225+
colored2 (~> 3.1)
226+
nanaimo (~> 0.4.0)
227+
rexml (>= 3.3.6, < 4.0)
228+
xcpretty (0.4.1)
229+
rouge (~> 3.28.0)
230+
xcpretty-travis-formatter (1.0.1)
231+
xcpretty (~> 0.2, >= 0.0.7)
232+
233+
PLATFORMS
234+
ruby
235+
236+
DEPENDENCIES
237+
abbrev
238+
base64
239+
bigdecimal
240+
csv
241+
drb
242+
fastlane (>= 2.226.0)
243+
fastlane-plugin-firebase_app_distribution
244+
mutex_m
245+
nkf
246+
observer
247+
racc
248+
249+
BUNDLED WITH
250+
2.5.23

0 commit comments

Comments
 (0)