From a1033451455a3723856022dcd90744ac3d238226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=88=EB=B3=91=ED=97=8C?= <64366488+Heonbyeong@users.noreply.github.com> Date: Tue, 25 Jun 2024 14:44:12 +0900 Subject: [PATCH 01/76] Update README.md --- README.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ba8feccb..3a2a759d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,50 @@ -# 23rd-Android-Team-2-Android -![screen1](https://github.com/YAPP-Github/23rd-Android-Team-2-Android/assets/64366488/2925d2c6-a53b-41b2-a336-2f950c448d37) +![cover](https://github.com/MONEYMONG/Android-Moneymong/assets/64366488/d8d0ddcd-3eae-453d-87d0-b9138353fb71) +
+ + + +
+ +
+
+ + + +# 머니몽 +> 머니몽은 `Money` + `Monitoring` 두 단어가 결합된 이름입니다. 머니몽이라는 이름 그대로, 장부를 기록하고 확인하며 관리할 수 있는 서비스에요. + +2023년 기준 전국 대학은 334개, 그 안에 있는 동아리는 무수히 많습니다. 그 많은 동아리는 아직까지도 수기로 장부를 작성하며, 영수증을 파일로 관리하고, +엑셀로 정리하여 감사위원회에 제출합니다. 머니몽은 학생과 학생회의 불편함을 넘어, 국내 모든 동아리의 회계 관리에 대한 불편함을 해결하려고 합니다. + +
+
+ +## 온보딩 & 로그인 +![47](https://github.com/MONEYMONG/Android-Moneymong/assets/64366488/7307d8ae-cf69-45ff-8d8c-57cbd71002b6) + +
+
+ +## 소속 등록 & 가입 +![48](https://github.com/MONEYMONG/Android-Moneymong/assets/64366488/8e1c9750-53ba-4300-bb14-2daf57cd0931) +![49](https://github.com/MONEYMONG/Android-Moneymong/assets/64366488/a246e125-290b-4ac5-9b0a-7f3b00b0d3c5) + +
+
+ +## 장부 확인 +![50](https://github.com/MONEYMONG/Android-Moneymong/assets/64366488/bfcb6e1d-1018-4741-8d32-fd44b39b2545) + +
+
+ +## 장부 등록 +![51](https://github.com/MONEYMONG/Android-Moneymong/assets/64366488/57d6b7a9-4088-4f3c-90b6-8fbfc827a21c) +![52](https://github.com/MONEYMONG/Android-Moneymong/assets/64366488/274245ce-fc7b-4df7-ad12-f19ca6d75216) + +
+
+ +## 멤버 & 마이페이지 +![53](https://github.com/MONEYMONG/Android-Moneymong/assets/64366488/ad0c3373-2e78-498d-865e-91d4cb2c89e4) +![54](https://github.com/MONEYMONG/Android-Moneymong/assets/64366488/3c6c57ea-a9de-4b43-a4ef-a4990e784319) From 7b68ac3d9c059e978b5935ad26b90bab569e292a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=88=EB=B3=91=ED=97=8C?= <64366488+Heonbyeong@users.noreply.github.com> Date: Thu, 27 Jun 2024 18:04:31 +0900 Subject: [PATCH 02/76] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3a2a759d..8c78613e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![cover](https://github.com/MONEYMONG/Android-Moneymong/assets/64366488/d8d0ddcd-3eae-453d-87d0-b9138353fb71) +![cover](https://github.com/MONEYMONG/Android-Moneymong/assets/64366488/034a0bf6-f3fd-446d-a35d-35808ab4b7a9)
From 55851473ca5d17d8ba642fb6fd05e46db7102ec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=88=EB=B3=91=ED=97=8C?= <64366488+Heonbyeong@users.noreply.github.com> Date: Wed, 3 Jul 2024 18:07:16 +0900 Subject: [PATCH 03/76] Create android-ci.yml --- .github/workflows/android-ci.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/android-ci.yml diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml new file mode 100644 index 00000000..a2a373db --- /dev/null +++ b/.github/workflows/android-ci.yml @@ -0,0 +1,26 @@ +name: Android CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + cache: gradle + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build From f6db51c04bfa4d494f512a7e3f4ce375e8c35763 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 14:24:55 +0900 Subject: [PATCH 04/76] =?UTF-8?q?chore:=20ci/cd=20yaml=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=20(=EC=B4=88=EC=95=88)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-ci.yml | 41 +++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index a2a373db..53c49f3c 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -2,25 +2,50 @@ name: Android CI on: push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] + branches: [ "release/release" ] jobs: build: - runs-on: ubuntu-latest + runs-on: macos-latest steps: - uses: actions/checkout@v4 - - name: set up JDK 11 + - name: set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' cache: gradle - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew build + + - name: Clean Build + run: ./gradlew clean + + - name: Check Code Convention + run: ./gradlew ktlintCheck + + - name: Decode Service Account Key + env: + SERVICE_ACCOUNT_KEY_BASE64: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_KEY }} + run: | + echo $SERVICE_ACCOUNT_KEY_BASE64 | base64 --decode > service_account_key.json + + - name: Decode Keystore File + env: + KEY_STORE_BASE64: ${{ secrets.KEYSTORE_FILE }} + run: | + echo $KEY_STORE_BASE64 | base64 --decode > moneymong_keystore.keystore + + - name: Build & Deploy Android release + env: + SERVICE_ACCOUNT_KEY: service_account_key.json + KEYSTORE_FILE: moneymong_keystore.keystore + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + KEYSTORE_KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + run: bundle exec fastlane deploy + + - name: Remove Credential + run: rm service_account_key.json moneymong_keystore.keystore From 2c466e9fafc5edd5662096ec0b40b13f253f3f48 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 14:27:52 +0900 Subject: [PATCH 05/76] test: workflow --- .github/workflows/android-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 53c49f3c..e3430343 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -2,7 +2,10 @@ name: Android CI on: push: - branches: [ "release/release" ] + branches: + - 'release/release' + - 'feature/moneymong-500-ci-cd-구축' + jobs: build: From e38028e14ddcc9b749cc3e876f4cc42b0845bae8 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 14:32:11 +0900 Subject: [PATCH 06/76] test: workflow --- .github/workflows/android-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index e3430343..b3538622 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -6,7 +6,6 @@ on: - 'release/release' - 'feature/moneymong-500-ci-cd-구축' - jobs: build: From 60c9541a7140c5ab89d11796abea4e4ace0e3f98 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 15:04:28 +0900 Subject: [PATCH 07/76] =?UTF-8?q?chore:=20local.properties=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-ci.yml | 9 ++++++++- app/build.gradle.kts | 10 ---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index b3538622..56ad35ca 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -23,6 +23,13 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Create API Certificate + run: | + echo "sdk.dir=$ANDROID_SDK_ROOT" > ./local.properties + echo "native_app_key=\"${{ secrets.NATIVE_APP_KEY }}\"" >> ./local.properties + echo "CLOVA_OCR_DOCUMENT_SECRET=\"${{ secrets.CLOVA_OCR_DOCUMENT_SECRET }}\"" >> ./local.properties + echo "CLOVA_OCR_DOCUMENT_BASEURL=\"${{ secrets.CLOVA_OCR_DOCUMENT_BASEURL }}\"" >> ./local.properties + - name: Clean Build run: ./gradlew clean @@ -50,4 +57,4 @@ jobs: run: bundle exec fastlane deploy - name: Remove Credential - run: rm service_account_key.json moneymong_keystore.keystore + run: rm service_account_key.json moneymong_keystore.keystore local.properties diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6af56666..916e7cf0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,15 +14,6 @@ plugins { } android { - signingConfigs { - create("release") { - storeFile = - file(getApiKey("storeFile")) - storePassword = getApiKey("storePassword") - keyAlias = getApiKey("keyAlias") - keyPassword = getApiKey("keyPassword") - } - } namespace = "com.moneymong.moneymong" compileSdk = 34 @@ -50,7 +41,6 @@ android { getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" ) - signingConfig = signingConfigs.getByName("release") } } packaging { From fe2186de1889b42a11f7eb0b19f75ad1b82ab5b7 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 15:09:12 +0900 Subject: [PATCH 08/76] =?UTF-8?q?test:=20lint=20=ED=8C=8C=EC=9D=B4?= =?UTF-8?q?=ED=94=84=EB=9D=BC=EC=9D=B8=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 56ad35ca..0e532d23 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -33,9 +33,6 @@ jobs: - name: Clean Build run: ./gradlew clean - - name: Check Code Convention - run: ./gradlew ktlintCheck - - name: Decode Service Account Key env: SERVICE_ACCOUNT_KEY_BASE64: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_KEY }} From f555ccfe7dce6dd6e3b64f6ff23fc9365e3bec49 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 16:04:50 +0900 Subject: [PATCH 09/76] =?UTF-8?q?test:=20fastfile=20=EC=9E=90=EA=B2=A9=20?= =?UTF-8?q?=EC=A6=9D=EB=AA=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-ci.yml | 1 + fastlane/Fastfile | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 0e532d23..bd9f82db 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -51,6 +51,7 @@ jobs: KEYSTORE_FILE: moneymong_keystore.keystore KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEYSTORE_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} run: bundle exec fastlane deploy - name: Remove Credential diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 19c557cc..7f248f74 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -32,7 +32,17 @@ platform :android do desc "Deploy a new version to the Google Play" lane :deploy do - gradle(task: "clean assembleRelease") + gradle( + task: 'bundle', + flavor: "live" + build_type: 'Release' + properties: { + "android.injected.signing.store.file" => ENV["KEYSTORE_FILE"], + "android.injected.signing.store.password" => ENV["KEYSTORE_PASSWORD"], + "android.injected.signing.key.alias" => ENV["KEYSTORE_KEY_ALIAS"], + "android.injected.signing.key.password" => ENV["KEYSTORE_KEY_PASSWORD"], + } + ) upload_to_play_store end end From 9e5c828541b045d7acfb95dbfd15fd225fe08886 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 16:08:46 +0900 Subject: [PATCH 10/76] =?UTF-8?q?test:=20,=20=EB=88=84=EB=9D=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 7f248f74..f538af0f 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -34,7 +34,7 @@ platform :android do lane :deploy do gradle( task: 'bundle', - flavor: "live" + flavor: "live", build_type: 'Release' properties: { "android.injected.signing.store.file" => ENV["KEYSTORE_FILE"], From c3f1e55fd0e579b2b05d9d9164227896b639256f Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 16:11:03 +0900 Subject: [PATCH 11/76] =?UTF-8?q?test:=20,=20=EB=88=84=EB=9D=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastlane/Fastfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index f538af0f..a4683a96 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -35,13 +35,13 @@ platform :android do gradle( task: 'bundle', flavor: "live", - build_type: 'Release' + build_type: 'Release', properties: { "android.injected.signing.store.file" => ENV["KEYSTORE_FILE"], "android.injected.signing.store.password" => ENV["KEYSTORE_PASSWORD"], "android.injected.signing.key.alias" => ENV["KEYSTORE_KEY_ALIAS"], "android.injected.signing.key.password" => ENV["KEYSTORE_KEY_PASSWORD"], - } + }, ) upload_to_play_store end From 21d9c612e72b6b53b1558e905acf6526cb9058ab Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 16:23:51 +0900 Subject: [PATCH 12/76] =?UTF-8?q?test:=20=ED=99=98=EA=B2=BD=EB=B3=80?= =?UTF-8?q?=EC=88=98=20=EB=AC=B8=EC=9E=90=EC=97=B4=20=EC=B2=A0;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastlane/Fastfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index a4683a96..64754702 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -37,10 +37,10 @@ platform :android do flavor: "live", build_type: 'Release', properties: { - "android.injected.signing.store.file" => ENV["KEYSTORE_FILE"], - "android.injected.signing.store.password" => ENV["KEYSTORE_PASSWORD"], - "android.injected.signing.key.alias" => ENV["KEYSTORE_KEY_ALIAS"], - "android.injected.signing.key.password" => ENV["KEYSTORE_KEY_PASSWORD"], + "android.injected.signing.store.file" => "#{ENV["KEYSTORE_FILE"]}", + "android.injected.signing.store.password" => "#{ENV["KEYSTORE_PASSWORD"]}", + "android.injected.signing.key.alias" => "#{ENV["KEYSTORE_KEY_ALIAS"]}", + "android.injected.signing.key.password" => "#{ENV["KEYSTORE_KEY_PASSWORD"]}", }, ) upload_to_play_store From f0062408de3fc6840ab6be7f03f6de197e66ea2f Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 16:35:52 +0900 Subject: [PATCH 13/76] test: keystore path fix --- .github/workflows/android-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index bd9f82db..7b9516c0 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -43,7 +43,7 @@ jobs: env: KEY_STORE_BASE64: ${{ secrets.KEYSTORE_FILE }} run: | - echo $KEY_STORE_BASE64 | base64 --decode > moneymong_keystore.keystore + echo $KEY_STORE_BASE64 | base64 --decode > app/moneymong_keystore.keystore - name: Build & Deploy Android release env: @@ -55,4 +55,4 @@ jobs: run: bundle exec fastlane deploy - name: Remove Credential - run: rm service_account_key.json moneymong_keystore.keystore local.properties + run: rm service_account_key.json app/moneymong_keystore.keystore local.properties From c45df99e49182049168b96e2e5be2d90ef53f7a6 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 16:56:22 +0900 Subject: [PATCH 14/76] =?UTF-8?q?test:=20keystore=20=ED=99=95=EC=9E=A5?= =?UTF-8?q?=EC=9E=90=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 7b9516c0..5e99460f 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -43,7 +43,7 @@ jobs: env: KEY_STORE_BASE64: ${{ secrets.KEYSTORE_FILE }} run: | - echo $KEY_STORE_BASE64 | base64 --decode > app/moneymong_keystore.keystore + echo $KEY_STORE_BASE64 | base64 --decode > moneymong_keystore.jks - name: Build & Deploy Android release env: @@ -55,4 +55,4 @@ jobs: run: bundle exec fastlane deploy - name: Remove Credential - run: rm service_account_key.json app/moneymong_keystore.keystore local.properties + run: rm service_account_key.json moneymong_keystore.jks local.properties From ed7c6557cf6f82fe0ec35a800f9d51e69d5e6cab Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 17:01:13 +0900 Subject: [PATCH 15/76] =?UTF-8?q?test:=20keystore=20=ED=99=95=EC=9E=A5?= =?UTF-8?q?=EC=9E=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 5e99460f..0893530d 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -48,7 +48,7 @@ jobs: - name: Build & Deploy Android release env: SERVICE_ACCOUNT_KEY: service_account_key.json - KEYSTORE_FILE: moneymong_keystore.keystore + KEYSTORE_FILE: moneymong_keystore.jks KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEYSTORE_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} From a33f882c946798f33edbb356bdc8d20b8c0e522a Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 17:26:17 +0900 Subject: [PATCH 16/76] =?UTF-8?q?test:=20working=20directory=20=EC=A7=80?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 0893530d..509d1586 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -52,7 +52,8 @@ jobs: KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEYSTORE_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + working-directory: ${{ github.workspace }} run: bundle exec fastlane deploy - name: Remove Credential - run: rm service_account_key.json moneymong_keystore.jks local.properties + run: rm service_account_key.json moneymong_keystore.jks ./local.properties From 1fc373e6673ae5492e0610bb0f0ef7ff9feef52d Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 17:37:57 +0900 Subject: [PATCH 17/76] test: path fix --- .github/workflows/android-ci.yml | 11 +++++------ fastlane/Fastfile | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 509d1586..da1168be 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -37,23 +37,22 @@ jobs: env: SERVICE_ACCOUNT_KEY_BASE64: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_KEY }} run: | - echo $SERVICE_ACCOUNT_KEY_BASE64 | base64 --decode > service_account_key.json + echo $SERVICE_ACCOUNT_KEY_BASE64 | base64 --decode > $GITHUB_WORKSPACE/service_account_key.json - name: Decode Keystore File env: KEY_STORE_BASE64: ${{ secrets.KEYSTORE_FILE }} run: | - echo $KEY_STORE_BASE64 | base64 --decode > moneymong_keystore.jks + echo $KEY_STORE_BASE64 | base64 --decode > $GITHUB_WORKSPACE/moneymong_keystore.jks - name: Build & Deploy Android release env: - SERVICE_ACCOUNT_KEY: service_account_key.json - KEYSTORE_FILE: moneymong_keystore.jks + SERVICE_ACCOUNT_KEY: $GITHUB_WORKSPACE/service_account_key.json + KEYSTORE_FILE: $GITHUB_WORKSPACE/moneymong_keystore.jks KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEYSTORE_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - working-directory: ${{ github.workspace }} run: bundle exec fastlane deploy - name: Remove Credential - run: rm service_account_key.json moneymong_keystore.jks ./local.properties + run: rm $GITHUB_WORKSPACE/service_account_key.json $GITHUB_WORKSPACE/moneymong_keystore.jks ./local.properties diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 64754702..4655047a 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -37,7 +37,7 @@ platform :android do flavor: "live", build_type: 'Release', properties: { - "android.injected.signing.store.file" => "#{ENV["KEYSTORE_FILE"]}", + "android.injected.signing.store.file" => "#{ENV["GITHUB_WORKSPACE"]}/moneymong_keystore.jks", "android.injected.signing.store.password" => "#{ENV["KEYSTORE_PASSWORD"]}", "android.injected.signing.key.alias" => "#{ENV["KEYSTORE_KEY_ALIAS"]}", "android.injected.signing.key.password" => "#{ENV["KEYSTORE_KEY_PASSWORD"]}", From 2a5c0aacdf5f4a060190230ad44c1bd315a5f30a Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 17:50:49 +0900 Subject: [PATCH 18/76] test: add json key --- fastlane/Fastfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 4655047a..f20f699b 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -43,6 +43,9 @@ platform :android do "android.injected.signing.key.password" => "#{ENV["KEYSTORE_KEY_PASSWORD"]}", }, ) - upload_to_play_store + upload_to_play_store( + track: "internal", + json_key: "#{ENV["SERVICE_ACCOUNT_KEY"]}" + ) end end From eefbf535f22411e35a2ee5dfd7af41d4be98b45a Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 17:58:58 +0900 Subject: [PATCH 19/76] test: json key path fix --- fastlane/Fastfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index f20f699b..a4450c44 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -37,7 +37,7 @@ platform :android do flavor: "live", build_type: 'Release', properties: { - "android.injected.signing.store.file" => "#{ENV["GITHUB_WORKSPACE"]}/moneymong_keystore.jks", + "android.injected.signing.store.file" => "#{ENV["KEYSTORE_FILE"]}", "android.injected.signing.store.password" => "#{ENV["KEYSTORE_PASSWORD"]}", "android.injected.signing.key.alias" => "#{ENV["KEYSTORE_KEY_ALIAS"]}", "android.injected.signing.key.password" => "#{ENV["KEYSTORE_KEY_PASSWORD"]}", @@ -45,7 +45,7 @@ platform :android do ) upload_to_play_store( track: "internal", - json_key: "#{ENV["SERVICE_ACCOUNT_KEY"]}" + json_key: ENV["SERVICE_ACCOUNT_KEY"] ) end end From 5ffc407f1370e36377a935d86a3be590812aa76f Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 18:18:14 +0900 Subject: [PATCH 20/76] =?UTF-8?q?test:=20env=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/android-ci.yml | 1 + fastlane/Fastfile | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index da1168be..a0609afc 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -52,6 +52,7 @@ jobs: KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEYSTORE_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + working-directory: $GITHUB_WORKSPACE/app run: bundle exec fastlane deploy - name: Remove Credential diff --git a/fastlane/Fastfile b/fastlane/Fastfile index a4450c44..57043631 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -37,10 +37,10 @@ platform :android do flavor: "live", build_type: 'Release', properties: { - "android.injected.signing.store.file" => "#{ENV["KEYSTORE_FILE"]}", - "android.injected.signing.store.password" => "#{ENV["KEYSTORE_PASSWORD"]}", - "android.injected.signing.key.alias" => "#{ENV["KEYSTORE_KEY_ALIAS"]}", - "android.injected.signing.key.password" => "#{ENV["KEYSTORE_KEY_PASSWORD"]}", + "android.injected.signing.store.file" => ENV["KEYSTORE_FILE"], + "android.injected.signing.store.password" => ENV["KEYSTORE_PASSWORD"], + "android.injected.signing.key.alias" => ENV["KEYSTORE_KEY_ALIAS"], + "android.injected.signing.key.password" => ENV["KEYSTORE_KEY_PASSWORD"], }, ) upload_to_play_store( From 600bd1b1a43ca97b73f685ec50fa0938ff46cf2b Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 18:21:36 +0900 Subject: [PATCH 21/76] test: working directory remove --- .github/workflows/android-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index a0609afc..da1168be 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -52,7 +52,6 @@ jobs: KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEYSTORE_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - working-directory: $GITHUB_WORKSPACE/app run: bundle exec fastlane deploy - name: Remove Credential From 786b6da75ddaf7a250ae6aa7c00ac6a597eaa938 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 18:36:16 +0900 Subject: [PATCH 22/76] test: app file fix --- .github/workflows/android-ci.yml | 14 +++++--------- fastlane/Appfile | 2 +- fastlane/Fastfile | 5 +---- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index da1168be..d55da2a6 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -34,25 +34,21 @@ jobs: run: ./gradlew clean - name: Decode Service Account Key - env: - SERVICE_ACCOUNT_KEY_BASE64: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_KEY }} run: | - echo $SERVICE_ACCOUNT_KEY_BASE64 | base64 --decode > $GITHUB_WORKSPACE/service_account_key.json + echo "${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_KEY }}" | base64 --decode > app/service_account_key.json - name: Decode Keystore File - env: - KEY_STORE_BASE64: ${{ secrets.KEYSTORE_FILE }} run: | - echo $KEY_STORE_BASE64 | base64 --decode > $GITHUB_WORKSPACE/moneymong_keystore.jks + echo "${{ secrets.KEYSTORE_FILE }}" | base64 --decode > app/moneymong_keystore.jks - name: Build & Deploy Android release env: - SERVICE_ACCOUNT_KEY: $GITHUB_WORKSPACE/service_account_key.json - KEYSTORE_FILE: $GITHUB_WORKSPACE/moneymong_keystore.jks + SERVICE_ACCOUNT_KEY: app/service_account_key.json + KEYSTORE_FILE: app/moneymong_keystore.jks KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEYSTORE_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} run: bundle exec fastlane deploy - name: Remove Credential - run: rm $GITHUB_WORKSPACE/service_account_key.json $GITHUB_WORKSPACE/moneymong_keystore.jks ./local.properties + run: rm app/service_account_key.json app/moneymong_keystore.jks ./local.properties diff --git a/fastlane/Appfile b/fastlane/Appfile index bc0d61c2..d749722b 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1,2 +1,2 @@ -json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one +json_key_file ENV['SERVICE_ACCOUNT_KEY'] # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one package_name("com.moneymong.moneymong") # e.g. com.krausefx.app diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 57043631..a4683a96 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -43,9 +43,6 @@ platform :android do "android.injected.signing.key.password" => ENV["KEYSTORE_KEY_PASSWORD"], }, ) - upload_to_play_store( - track: "internal", - json_key: ENV["SERVICE_ACCOUNT_KEY"] - ) + upload_to_play_store end end From 7be78761c9b89abdfe585a4a67bf2a479f6f62fe Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 18:58:49 +0900 Subject: [PATCH 23/76] test: fix --- .github/workflows/android-ci.yml | 11 ++++++----- fastlane/Appfile | 2 +- fastlane/Fastfile | 12 +++++++----- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index d55da2a6..25ccf51b 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -35,20 +35,21 @@ jobs: - name: Decode Service Account Key run: | - echo "${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_KEY }}" | base64 --decode > app/service_account_key.json + echo "${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_KEY }}" | base64 --decode > ./app/service_account_key.json - name: Decode Keystore File run: | - echo "${{ secrets.KEYSTORE_FILE }}" | base64 --decode > app/moneymong_keystore.jks + echo "${{ secrets.KEYSTORE_FILE }}" | base64 --decode > ./app/moneymong_keystore.jks - name: Build & Deploy Android release env: - SERVICE_ACCOUNT_KEY: app/service_account_key.json - KEYSTORE_FILE: app/moneymong_keystore.jks + SERVICE_ACCOUNT_KEY: ./app/service_account_key.json + KEYSTORE_FILE: ./app/moneymong_keystore.jks KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEYSTORE_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + CWD: ${{ github.workspace }} run: bundle exec fastlane deploy - name: Remove Credential - run: rm app/service_account_key.json app/moneymong_keystore.jks ./local.properties + run: rm ./app/${SERVICE_ACCOUNT_KEY} && rm ./app/${KEYSTORE_FILE} && rm ./local.properties diff --git a/fastlane/Appfile b/fastlane/Appfile index d749722b..d60ec01f 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1,2 +1,2 @@ -json_key_file ENV['SERVICE_ACCOUNT_KEY'] # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one +json_key_file("./service_account_key.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one package_name("com.moneymong.moneymong") # e.g. com.krausefx.app diff --git a/fastlane/Fastfile b/fastlane/Fastfile index a4683a96..375c90d5 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -30,6 +30,8 @@ platform :android do # You can also use other beta testing services here end + keystore = File.join(Dir.pwd, “my_keystore.jks”) + json_file = File.join(Dir.pwd, “my_json_key.json”) desc "Deploy a new version to the Google Play" lane :deploy do gradle( @@ -37,11 +39,11 @@ platform :android do flavor: "live", build_type: 'Release', properties: { - "android.injected.signing.store.file" => ENV["KEYSTORE_FILE"], - "android.injected.signing.store.password" => ENV["KEYSTORE_PASSWORD"], - "android.injected.signing.key.alias" => ENV["KEYSTORE_KEY_ALIAS"], - "android.injected.signing.key.password" => ENV["KEYSTORE_KEY_PASSWORD"], - }, + "android.injected.signing.store.file" => "#{ENV["CWD"]}/app/#{ENV["KEYSTORE_FILE"]}", + "android.injected.signing.store.password" => "#{ENV["KEYSTORE_PASSWORD"]}", + "android.injected.signing.key.alias" => "#{ENV["KEYSTORE_KEY_ALIAS"]}", + "android.injected.signing.key.password" => "#{ENV["KEYSTORE_KEY_PASSWORD"]}", + }, ) upload_to_play_store end From a67f85a8269bbe6b5510f3959e693ff5bfc307bd Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Tue, 23 Jul 2024 19:16:47 +0900 Subject: [PATCH 24/76] test: env --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 375c90d5..e8d7ac7a 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -39,7 +39,7 @@ platform :android do flavor: "live", build_type: 'Release', properties: { - "android.injected.signing.store.file" => "#{ENV["CWD"]}/app/#{ENV["KEYSTORE_FILE"]}", + "android.injected.signing.store.file" => "#{ENV["KEYSTORE_FILE"]}", "android.injected.signing.store.password" => "#{ENV["KEYSTORE_PASSWORD"]}", "android.injected.signing.key.alias" => "#{ENV["KEYSTORE_KEY_ALIAS"]}", "android.injected.signing.key.password" => "#{ENV["KEYSTORE_KEY_PASSWORD"]}", From c5871580e1c40c579f66dc10ad8cafb954a2d861 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Wed, 24 Jul 2024 10:49:12 +0900 Subject: [PATCH 25/76] test: path --- .github/workflows/android-ci.yml | 4 ++-- fastlane/Fastfile | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 25ccf51b..4bff2380 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -43,8 +43,8 @@ jobs: - name: Build & Deploy Android release env: - SERVICE_ACCOUNT_KEY: ./app/service_account_key.json - KEYSTORE_FILE: ./app/moneymong_keystore.jks + SERVICE_ACCOUNT_KEY: ${{ github.workspace }}/app/service_account_key.json + KEYSTORE_FILE: ${{ github.workspace }}/app/moneymong_keystore.jks KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEYSTORE_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} diff --git a/fastlane/Fastfile b/fastlane/Fastfile index e8d7ac7a..d5151135 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -30,8 +30,6 @@ platform :android do # You can also use other beta testing services here end - keystore = File.join(Dir.pwd, “my_keystore.jks”) - json_file = File.join(Dir.pwd, “my_json_key.json”) desc "Deploy a new version to the Google Play" lane :deploy do gradle( From be520d89c5b5c793e102abe48c64f9585773e11c Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Wed, 24 Jul 2024 11:30:03 +0900 Subject: [PATCH 26/76] test: appfile path --- fastlane/Appfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Appfile b/fastlane/Appfile index d60ec01f..d4dcdac8 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1,2 +1,2 @@ -json_key_file("./service_account_key.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one +json_key_file("./app/service_account_key.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one package_name("com.moneymong.moneymong") # e.g. com.krausefx.app From 6b23a03fbc7ae43a3d0bf254e8d3059581f22c69 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Wed, 24 Jul 2024 14:10:04 +0900 Subject: [PATCH 27/76] test: package name refactor --- fastlane/Appfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Appfile b/fastlane/Appfile index d4dcdac8..ee1194d6 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1,2 +1,2 @@ json_key_file("./app/service_account_key.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one -package_name("com.moneymong.moneymong") # e.g. com.krausefx.app +package_name("com.moneymong.moneymong.live") # e.g. com.krausefx.app From e8773757067f5910e729deca762f2b1c04479f52 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Wed, 24 Jul 2024 14:50:19 +0900 Subject: [PATCH 28/76] test: increment version code --- fastlane/Fastfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index d5151135..cddeecc1 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -16,6 +16,20 @@ default_platform(:android) platform :android do + desc "Increment the Version Code" + lane :increment_version_code do + increment_version_code( + gradle_file_path: './app/build.gradle' + ) + + git_commit( + path: ["./app/build.gradle"], + message: "RELEASE INCREMENT VERSION CODE" + ) + + push_to_git_remote + end + desc "Runs all the tests" lane :test do gradle(task: "test") @@ -32,6 +46,8 @@ platform :android do desc "Deploy a new version to the Google Play" lane :deploy do + increment_version_code + gradle( task: 'bundle', flavor: "live", From d7845c61a79a33b62b26722f722f881b7910bd72 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Wed, 24 Jul 2024 14:54:48 +0900 Subject: [PATCH 29/76] test: lane --- fastlane/Fastfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index cddeecc1..96015c2a 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -17,7 +17,7 @@ default_platform(:android) platform :android do desc "Increment the Version Code" - lane :increment_version_code do + lane :increment_code do increment_version_code( gradle_file_path: './app/build.gradle' ) @@ -46,7 +46,7 @@ platform :android do desc "Deploy a new version to the Google Play" lane :deploy do - increment_version_code + increment_code gradle( task: 'bundle', From f5b789428af1b77eb9485e5626bf27b9bade2298 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Wed, 24 Jul 2024 15:07:13 +0900 Subject: [PATCH 30/76] test: version code --- fastlane/Fastfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 96015c2a..27ebbc6a 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -18,8 +18,11 @@ default_platform(:android) platform :android do desc "Increment the Version Code" lane :increment_code do + latest_release = google_play_track_version_code()[0] + new_release = latest_release + 1 + increment_version_code( - gradle_file_path: './app/build.gradle' + version_code: new_release ) git_commit( From e4c6f9f9f97928b0401bd8b4841e68ea0d19e0e3 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Wed, 24 Jul 2024 15:09:51 +0900 Subject: [PATCH 31/76] test: version code --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 27ebbc6a..9be77e8c 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -18,7 +18,7 @@ default_platform(:android) platform :android do desc "Increment the Version Code" lane :increment_code do - latest_release = google_play_track_version_code()[0] + latest_release = google_play_track_version_codes()[0] new_release = latest_release + 1 increment_version_code( From 12a951c4c5a733941a8a937628fcab16c386e236 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Wed, 24 Jul 2024 15:34:30 +0900 Subject: [PATCH 32/76] test: add plugin --- Gemfile | 3 + Gemfile.lock | 222 ++++++++++++++++++++++++++++++++++++++++++++ fastlane/Pluginfile | 5 + 3 files changed, 230 insertions(+) create mode 100644 Gemfile.lock create mode 100644 fastlane/Pluginfile diff --git a/Gemfile b/Gemfile index 7a118b49..cdd3a6b3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,6 @@ source "https://rubygems.org" gem "fastlane" + +plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') +eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..1a0d306c --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,222 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.7) + base64 + nkf + rexml + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) + atomos (0.1.3) + aws-eventstream (1.3.0) + aws-partitions (1.957.0) + aws-sdk-core (3.201.3) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.8) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.88.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.156.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.9.0) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + base64 (0.2.0) + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.6.5) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.111.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) + fastimage (2.3.1) + fastlane (2.221.1) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored (~> 1.2) + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.5) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-plugin-increment_version_code (0.4.3) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.7.0) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.6) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.6.2) + json (2.7.2) + jwt (2.8.2) + base64 + mini_magick (4.13.2) + mini_mime (1.1.5) + multi_json (1.15.0) + multipart-post (2.4.1) + nanaimo (0.3.0) + naturally (2.2.1) + nkf (0.2.0) + optparse (0.5.0) + os (1.1.4) + plist (3.7.1) + public_suffix (6.0.1) + rake (13.2.1) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.9) + strscan + rouge (2.0.7) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.5) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + strscan (3.1.0) + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unicode-display_width (2.5.0) + word_wrap (1.0.0) + xcodeproj (1.24.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + arm64-darwin-23 + ruby + +DEPENDENCIES + fastlane + fastlane-plugin-increment_version_code + +BUNDLED WITH + 2.5.3 diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile new file mode 100644 index 00000000..412c2ff9 --- /dev/null +++ b/fastlane/Pluginfile @@ -0,0 +1,5 @@ +# Autogenerated by fastlane +# +# Ensure this file is checked in to source control! + +gem 'fastlane-plugin-increment_version_code' From a7c89df90bd857d1b45b585a8373dec32af397a0 Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Wed, 24 Jul 2024 15:48:12 +0900 Subject: [PATCH 33/76] test: install dependency --- .github/workflows/android-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 4bff2380..9b7cfe2c 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -41,6 +41,11 @@ jobs: run: | echo "${{ secrets.KEYSTORE_FILE }}" | base64 --decode > ./app/moneymong_keystore.jks + - name: Install Dependencies + run: | + gem install bundler + bundle install + - name: Build & Deploy Android release env: SERVICE_ACCOUNT_KEY: ${{ github.workspace }}/app/service_account_key.json @@ -52,4 +57,7 @@ jobs: run: bundle exec fastlane deploy - name: Remove Credential - run: rm ./app/${SERVICE_ACCOUNT_KEY} && rm ./app/${KEYSTORE_FILE} && rm ./local.properties + run: | + rm ./app/${SERVICE_ACCOUNT_KEY} + rm ./app/${KEYSTORE_FILE} + rm ./local.properties From 65ea10112ab9d4a2fdfebb3c94617ca3297e70cc Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Wed, 24 Jul 2024 15:57:50 +0900 Subject: [PATCH 34/76] test: git path --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 9be77e8c..9904d1db 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -26,7 +26,7 @@ platform :android do ) git_commit( - path: ["./app/build.gradle"], + path: ["./app/build.gradle.kts"], message: "RELEASE INCREMENT VERSION CODE" ) From d46f5c0b3b09d14182d99fdd0b7a30540eb87c7e Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Wed, 24 Jul 2024 16:02:07 +0900 Subject: [PATCH 35/76] test: git add --- fastlane/Fastfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 9904d1db..4c98c89b 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -25,6 +25,9 @@ platform :android do version_code: new_release ) + git_add( + path: "./app/build.gradle.kts" + ) git_commit( path: ["./app/build.gradle.kts"], message: "RELEASE INCREMENT VERSION CODE" From 6ee1fd014d5e8d21c7c29e56ceeddde2dea0512f Mon Sep 17 00:00:00 2001 From: Heonbyeong Date: Wed, 24 Jul 2024 16:18:20 +0900 Subject: [PATCH 36/76] test: gradle path --- fastlane/Fastfile | 3 ++- fastlane/README.md | 8 ++++++++ fastlane/report.xml | 9 +-------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 4c98c89b..475a0b0e 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -22,11 +22,12 @@ platform :android do new_release = latest_release + 1 increment_version_code( + gradle_file_path: './app/build.gradle.kts', version_code: new_release ) git_add( - path: "./app/build.gradle.kts" + path: ["./app/build.gradle.kts"] ) git_commit( path: ["./app/build.gradle.kts"], diff --git a/fastlane/README.md b/fastlane/README.md index 7ec1207f..7088ba08 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -15,6 +15,14 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do ## Android +### android increment_code + +```sh +[bundle exec] fastlane android increment_code +``` + +Increment the Version Code + ### android test ```sh diff --git a/fastlane/report.xml b/fastlane/report.xml index c5951ce4..51ae580b 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,14 +5,7 @@ - - - - - - - - + From dc323fb3e2bd52a284bbcc73bf7a41b380befbbe Mon Sep 17 00:00:00 2001 From: Heon Date: Thu, 25 Jul 2024 11:40:07 +0900 Subject: [PATCH 37/76] test: add permission --- .github/workflows/android-ci.yml | 2 ++ .idea/deploymentTargetSelector.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 9b7cfe2c..9478b9b9 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -10,6 +10,8 @@ jobs: build: runs-on: macos-latest + permissions: + contents: write steps: - uses: actions/checkout@v4 diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 101ad3e8..67b5f25d 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,10 +4,10 @@