Skip to content

Commit 8d0c063

Browse files
easyhoooneasyhooon
authored
Merge pull request #169 from Nexters/refactor/cmp-koin
[refactor] CMP 로 migration
2 parents 6a80f4d + 4dfbdae commit 8d0c063

File tree

465 files changed

+13284
-10014
lines changed

Some content is hidden

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

465 files changed

+13284
-10014
lines changed

‎.editorconfig

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@ root = true
22

33
[*]
44
charset = utf-8
5-
indent_size = 2
5+
indent_size = 4
66
indent_style = space
77
max_line_length = 150
88
insert_final_newline = true
99
trim_trailing_whitespace = true
1010
ktlint_standard_filename = disabled
1111
ktlint_standard_import-ordering = disabled
12-
ktlint_standard_annotation = disabled
1312
ktlint_standard_wrapping = disabled
1413
ktlint_standard_argument-list-wrapping = disabled
1514
ktlint_standard_multiline-if-else = disabled
15+
ktlint_standard_trailing-comma-on-call-site = disabled
16+
ktlint_standard_trailing-comma-on-declaration-site = disabled
17+
ktlint_standard_no_blank_line_in_list = disabled
1618

1719
[*.{kt,kts}]
1820
ij_kotlin_allow_trailing_comma = true
19-
ij_kotlin_allow_trailing_comma_on_call_site = true
21+
ij_kotlin_allow_trailing_comma_on_call_site = true

‎.github/workflows/android-cd.yml

+117-117
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,124 @@
11
name: Android CD
22

33
env:
4-
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false"
5-
GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
4+
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false"
5+
GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
66

77
on:
8-
push:
9-
branches: [ main ]
8+
push:
9+
branches: [ main ]
1010

1111
jobs:
12-
# cd-build:
13-
# runs-on: macos-latest
14-
15-
# steps:
16-
# - uses: actions/checkout@v3
17-
18-
# - name: Setup JDK 17
19-
# uses: actions/setup-java@v3
20-
# with:
21-
# distribution: zulu
22-
# java-version: 17
23-
24-
# - name: Setup Android SDK
25-
# uses: android-actions/setup-android@v2
26-
27-
# - name: Setup Gradle
28-
# uses: gradle/gradle-build-action@v2
29-
# with:
30-
# gradle-home-cache-cleanup: true
31-
32-
# - name: Generate secrets.properties
33-
# run: |
34-
# echo "SERVER_BASE_URL=${{ secrets.SERVER_BASE_URL }}" >> secrets.properties
35-
36-
# - name: Decode Keystore
37-
# id: decode_keystore
38-
# uses: timheuer/base64-to-file@v1
39-
# with:
40-
# fileName: '/app/bandalart.jks'
41-
# encodedString: ${{secrets.APP_RELEASE_KEY_STORE_BASE_64}}
42-
43-
# - name: Generate keystore.properties
44-
# run: |
45-
# echo "STORE_FILE=${{ secrets.STORE_FILE }}" >> keystore.properties
46-
# echo "STORE_PASSWORD=${{ secrets.STORE_PASSWORD }}" >> keystore.properties
47-
# echo "KEY_ALIAS=${{ secrets.KEY_ALIAS }}" >> keystore.properties
48-
# echo "KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> keystore.properties
49-
50-
# - name: Code style checks
51-
# run: ./gradlew ktlintCheck detekt
52-
53-
# - name: Run build
54-
# run: ./gradlew buildDebug --stacktrace
55-
56-
# 이 위까지는 만일 핫픽스로 급한 경우에 바로 main에 push 할 경우가 생길 수 있으므로 ci 보존
57-
58-
59-
publish_aab:
60-
runs-on: ubuntu-latest
61-
62-
steps:
63-
- uses: actions/checkout@v2
64-
65-
# JDK 설정
66-
- name: Setup JDK 17
67-
uses: actions/setup-java@v3
68-
with:
69-
distribution: zulu
70-
java-version: 17
71-
72-
- name: Setup Android SDK
73-
uses: android-actions/setup-android@v2
74-
75-
- name: Setup Gradle
76-
uses: gradle/gradle-build-action@v2
77-
with:
78-
gradle-home-cache-cleanup: true
79-
80-
- name: Generate secrets.properties
81-
run: |
82-
echo "SERVER_BASE_URL=${{ secrets.SERVER_BASE_URL }}" >> secrets.properties
83-
84-
# - name: Decode Keystore
85-
# id: decode_keystore
86-
# uses: timheuer/base64-to-file@v1
87-
# with:
88-
# fileName: '/app/bandalart.jks'
89-
# encodedString: ${{secrets.APP_RELEASE_KEY_STORE_BASE_64}}
90-
91-
- name: Generate Keystore file from Github Secrets
92-
run: |
93-
echo "$KEYSTORE" > ./app/bandalart.b64
94-
base64 -d -i ./app/bandalart.b64 > ./app/bandalart.jks
95-
env:
96-
KEYSTORE: ${{ secrets.APP_RELEASE_KEY_STORE_BASE_64 }}
97-
98-
- name: Generate keystore.properties
99-
run: |
100-
echo "STORE_FILE=${{ secrets.STORE_FILE }}" >> keystore.properties
101-
echo "STORE_PASSWORD=${{ secrets.STORE_PASSWORD }}" >> keystore.properties
102-
echo "KEY_ALIAS=${{ secrets.KEY_ALIAS }}" >> keystore.properties
103-
echo "KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> keystore.properties
104-
pwd
105-
106-
- name: Run build
107-
run: ./gradlew buildRelease --stacktrace
108-
109-
# Fastlane 위한 Ruby Setting
110-
- uses: ruby/setup-ruby@v1
111-
with:
112-
bundler: "Gemfile.lock"
113-
ruby-version: 2.7.2
114-
bundler-cache: true
115-
116-
# Fastlane Setting
117-
- name: Set Up fastlane And Publish Google Play
118-
uses: maierj/[email protected]
119-
with:
120-
lane: 'productionDeploy'
121-
env:
122-
SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
123-
SIGNING_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
124-
SIGNING_STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
12+
# cd-build:
13+
# runs-on: macos-latest
14+
15+
# steps:
16+
# - uses: actions/checkout@v3
17+
18+
# - name: Setup JDK 17
19+
# uses: actions/setup-java@v3
20+
# with:
21+
# distribution: zulu
22+
# java-version: 17
23+
24+
# - name: Setup Android SDK
25+
# uses: android-actions/setup-android@v2
26+
27+
# - name: Setup Gradle
28+
# uses: gradle/gradle-build-action@v2
29+
# with:
30+
# gradle-home-cache-cleanup: true
31+
32+
# - name: Generate secrets.properties
33+
# run: |
34+
# echo "SERVER_BASE_URL=${{ secrets.SERVER_BASE_URL }}" >> secrets.properties
35+
36+
# - name: Decode Keystore
37+
# id: decode_keystore
38+
# uses: timheuer/base64-to-file@v1
39+
# with:
40+
# fileName: '/app/bandalart.jks'
41+
# encodedString: ${{secrets.APP_RELEASE_KEY_STORE_BASE_64}}
42+
43+
# - name: Generate keystore.properties
44+
# run: |
45+
# echo "STORE_FILE=${{ secrets.STORE_FILE }}" >> keystore.properties
46+
# echo "STORE_PASSWORD=${{ secrets.STORE_PASSWORD }}" >> keystore.properties
47+
# echo "KEY_ALIAS=${{ secrets.KEY_ALIAS }}" >> keystore.properties
48+
# echo "KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> keystore.properties
49+
50+
# - name: Code style checks
51+
# run: ./gradlew ktlintCheck detekt
52+
53+
# - name: Run build
54+
# run: ./gradlew buildDebug --stacktrace
55+
56+
# 이 위까지는 만일 핫픽스로 급한 경우에 바로 main에 push 할 경우가 생길 수 있으므로 ci 보존
57+
58+
59+
publish_aab:
60+
runs-on: ubuntu-latest
61+
62+
steps:
63+
- uses: actions/checkout@v2
64+
65+
# JDK 설정
66+
- name: Setup JDK 17
67+
uses: actions/setup-java@v3
68+
with:
69+
distribution: zulu
70+
java-version: 17
71+
72+
- name: Setup Android SDK
73+
uses: android-actions/setup-android@v2
74+
75+
- name: Setup Gradle
76+
uses: gradle/gradle-build-action@v2
77+
with:
78+
gradle-home-cache-cleanup: true
79+
80+
- name: Generate secrets.properties
81+
run: |
82+
echo "SERVER_BASE_URL=${{ secrets.SERVER_BASE_URL }}" >> secrets.properties
83+
84+
# - name: Decode Keystore
85+
# id: decode_keystore
86+
# uses: timheuer/base64-to-file@v1
87+
# with:
88+
# fileName: '/app/bandalart.jks'
89+
# encodedString: ${{secrets.APP_RELEASE_KEY_STORE_BASE_64}}
90+
91+
- name: Generate Keystore file from Github Secrets
92+
run: |
93+
echo "$KEYSTORE" > ./app/bandalart.b64
94+
base64 -d -i ./app/bandalart.b64 > ./app/bandalart.jks
95+
env:
96+
KEYSTORE: ${{ secrets.APP_RELEASE_KEY_STORE_BASE_64 }}
97+
98+
- name: Generate keystore.properties
99+
run: |
100+
echo "STORE_FILE=${{ secrets.STORE_FILE }}" >> keystore.properties
101+
echo "STORE_PASSWORD=${{ secrets.STORE_PASSWORD }}" >> keystore.properties
102+
echo "KEY_ALIAS=${{ secrets.KEY_ALIAS }}" >> keystore.properties
103+
echo "KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> keystore.properties
104+
pwd
105+
106+
- name: Run build
107+
run: ./gradlew buildRelease --stacktrace
108+
109+
# Fastlane 위한 Ruby Setting
110+
- uses: ruby/setup-ruby@v1
111+
with:
112+
bundler: "Gemfile.lock"
113+
ruby-version: 2.7.2
114+
bundler-cache: true
115+
116+
# Fastlane Setting
117+
- name: Set Up fastlane And Publish Google Play
118+
uses: maierj/[email protected]
119+
with:
120+
lane: 'productionDeploy'
121+
env:
122+
SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
123+
SIGNING_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
124+
SIGNING_STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}

‎.github/workflows/android-ci.yml

+34-34
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
name: Android CI
22

33
env:
4-
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false"
5-
GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
4+
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false"
5+
GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
66

77
on:
8-
pull_request:
8+
pull_request:
99

1010
concurrency:
11-
group: build-${{ github.ref }}
12-
cancel-in-progress: true
11+
group: build-${{ github.ref }}
12+
cancel-in-progress: true
1313

1414
jobs:
15-
ci-build:
16-
runs-on: macos-latest
15+
ci-build:
16+
runs-on: macos-latest
1717

18-
if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
18+
if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
1919

20-
steps:
21-
- uses: actions/checkout@v3
20+
steps:
21+
- uses: actions/checkout@v3
2222

23-
- name: Setup JDK 17
24-
uses: actions/setup-java@v3
25-
with:
26-
distribution: zulu
27-
java-version: 17
23+
- name: Setup JDK 17
24+
uses: actions/setup-java@v3
25+
with:
26+
distribution: zulu
27+
java-version: 17
2828

29-
- name: Setup Android SDK
30-
uses: android-actions/setup-android@v2
29+
- name: Setup Android SDK
30+
uses: android-actions/setup-android@v2
3131

32-
- name: Setup Gradle
33-
uses: gradle/gradle-build-action@v2
34-
with:
35-
gradle-home-cache-cleanup: true
32+
- name: Setup Gradle
33+
uses: gradle/gradle-build-action@v2
34+
with:
35+
gradle-home-cache-cleanup: true
3636

37-
- name: Generate secrets.properties
38-
run: |
39-
echo "SERVER_BASE_URL=${{ secrets.SERVER_BASE_URL }}" >> secrets.properties
37+
- name: Generate secrets.properties
38+
run: |
39+
echo "SERVER_BASE_URL=${{ secrets.SERVER_BASE_URL }}" >> secrets.properties
4040
41-
- name: Generate keystore.properties
42-
run: |
43-
echo "STORE_FILE=${{ secrets.STORE_FILE }}" >> keystore.properties
44-
echo "STORE_PASSWORD=${{ secrets.STORE_PASSWORD }}" >> keystore.properties
45-
echo "KEY_ALIAS=${{ secrets.KEY_ALIAS }}" >> keystore.properties
46-
echo "KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> keystore.properties
41+
- name: Generate keystore.properties
42+
run: |
43+
echo "STORE_FILE=${{ secrets.STORE_FILE }}" >> keystore.properties
44+
echo "STORE_PASSWORD=${{ secrets.STORE_PASSWORD }}" >> keystore.properties
45+
echo "KEY_ALIAS=${{ secrets.KEY_ALIAS }}" >> keystore.properties
46+
echo "KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> keystore.properties
4747
48-
- name: Code style checks
49-
run: ./gradlew ktlintCheck detekt
48+
- name: Code style checks
49+
run: ./gradlew ktlintCheck detekt
5050

51-
- name: Run build
52-
run: ./gradlew buildDebug --stacktrace
51+
- name: Run build
52+
run: ./gradlew buildDebug --stacktrace

0 commit comments

Comments
 (0)