Merge changes from main branch

.github/workflows/Android-release CD.yml

@@ -55,17 +55,31 @@ jobs:
         echo '${{ secrets.SENTRY_PROPERTIES }}' > ./app/src/main/resources/sentry.properties
 
     # Build AAB Release
-    - name: Build release Bundle
+    - name: Build release Bundle (1.x.x)
       run: ./gradlew clean bundleRelease
+      if: startsWith(github.ref, 'refs/heads/release/1.')
+
+    - name: Build prodRelease Bundle (2.x.x+)
+      run: ./gradlew clean bundleProdRelease
+      if: startsWith(github.ref, 'refs/heads/release/') && !startsWith(github.ref, 'refs/heads/release/1.')
 
     # Upload Google Play
-    - name: Deploy to Play Store 🚀
+    - name: Deploy to Play Store 🚀 (1.x.x)
+      uses: r0adkll/upload-google-play@v1
+      with:
+        serviceAccountJsonPlainText: ${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }}
+        packageName: ${{ secrets.AOS_PACKAGE_NAME }}
+        releaseFiles: app/build/outputs/bundle/release/app-release.aab
+        track: production
+        status: draft
+      if: startsWith(github.ref, 'refs/heads/release/1.')
+
+    - name: Deploy to Play Store 🚀 (2.0.0+)
       uses: r0adkll/upload-google-play@v1
       with:
         serviceAccountJsonPlainText: ${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }}
-        packageName: ${{secrets.AOS_PACKAGE_NAME}}
-        releaseFiles: ./app/build/outputs/bundle/release/app-release.aab
+        packageName: ${{ secrets.AOS_PACKAGE_NAME }}
+        releaseFiles: app/build/outputs/bundle/prodRelease/app-prod-release.aab
         track: production
         status: draft
-      if: github.ref != 'refs/heads/main'
-
+      if: startsWith(github.ref, 'refs/heads/release/') && !startsWith(github.ref, 'refs/heads/release/1.')

README.md

@@ -16,7 +16,7 @@
 - Clean Architecture With MVVM Pattern
 
 ## Team Members for Android
-- 주윤겸(<a href="https://github.com/gemiJ">@gemiJ</a>)
+- 주윤겸(<a href="https://github.com/yuni-ju">@yuni-ju</a>)
 - 허동준(<a href="https://github.com/DongJun-H">@DongJun-H</a>)
 
 ## Installation
@@ -68,4 +68,4 @@ git clone git@github.com:Daily-DAYO/DAYO_Android.git
   e.g. border_white_fill_12
 
 ## Copyright
-Copyrightⓒ 2021-2023 DAYO, All rights reserved.
+Copyrightⓒ 2021- DAYO, All rights reserved.