Merge pull request #246 from Team-Clody/develop

MoonsuKang · web-flow · commit f3fb8c0333b7 · 2025-04-06T02:05:24.000+09:00
[TEST] 테스트 앱 배포를 진행합니다.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,6 @@
 ## 📌 ISSUE
 <!--이슈 번호 및 제목을 적어주세요!-->
+closed #<issue_number>
 
 ## 📄 Work Description
 <!--어떤 작업을 했는지 작성해주세요!-->
diff --git a/.github/workflows/android_cd.yml b/.github/workflows/android_cd.yml
@@ -41,12 +41,24 @@ jobs:
             - name: Change gradlew permissions
               run: chmod +x gradlew
 
+            # Install Firebase CLI
+            - name: Install Firebase CLI
+              run: curl -sL https://firebase.tools | bash
+
             # google-services.json
             - name: Decode google-services.json
               env:
                   FIREBASE_SECRET: ${{ secrets.FIREBASE_SECRET }}
               run: echo $FIREBASE_SECRET | base64 --decode > app/google-services.json
 
+            # keystore 복호화
+            - name: Decode keystore file
+              env:
+                  STORE_FILE: ${{ secrets.STORE_FILE }}
+              run: |
+                  mkdir -p app/keystore
+                  echo "$STORE_FILE" | base64 --decode > app/keystore/clody_release.jks
+
             # local.properties
             - name: Generate local.properties
               env:
@@ -55,33 +67,68 @@ jobs:
                   AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }}
                   GOOGLE_ADMOB_APP_ID: ${{ secrets.GOOGLE_ADMOB_APP_ID }}
                   GOOGLE_ADMOB_UNIT_ID: ${{ secrets.GOOGLE_ADMOB_UNIT_ID }}
+                  STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
+                  KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+                  KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
               run: |
                   echo "baseUrl=$BASE_URL" >> local.properties
                   echo "kakao.api.key=$KAKAO_API_KEY" >> local.properties
                   echo "amplitude.api.key=$AMPLITUDE_API_KEY" >> local.properties
                   echo "googleAdmob.app.id=$GOOGLE_ADMOB_APP_ID" >> local.properties
                   echo "googleAdmob.unit.id=$GOOGLE_ADMOB_UNIT_ID" >> local.properties
+                  echo "storeFile=keystore/clody_release.jks" >> local.properties
+                  echo "storePassword=$STORE_PASSWORD" >> local.properties
+                  echo "keyAlias=$KEY_ALIAS" >> local.properties
+                  echo "keyPassword=$KEY_PASSWORD" >> local.properties
 
-            # Release AAB 빌드
-            - name: Build Release AAB
-              run: ./gradlew bundleRelease --stacktrace
+            # Release APK 빌드
+            - name: Build Release APK
+              run: ./gradlew assembleRelease --stacktrace
 
-            # Firebase 인증
+            # Set up Firebase Service Account Credentials
             - name: Set up Firebase Service Account Credentials
               env:
                   GOOGLE_APPLICATION_CREDENTIALS_JSON: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS_JSON }}
               run: |
                   echo "$GOOGLE_APPLICATION_CREDENTIALS_JSON" | base64 --decode > $HOME/firebase-credentials.json
+                  echo "🔥 Firebase Credentials JSON 생성 완료!"
+                  ls -l $HOME/firebase-credentials.json
+                  export GOOGLE_APPLICATION_CREDENTIALS=$HOME/firebase-credentials.json
+                  echo "GOOGLE_APPLICATION_CREDENTIALS=$GOOGLE_APPLICATION_CREDENTIALS"
+
+            # Firebase CLI 인증 확인
+            - name: Check Firebase CLI Authentication
+              run: |
                   export GOOGLE_APPLICATION_CREDENTIALS=$HOME/firebase-credentials.json
 
-            # Firebase App Distribution
-            - name: Upload AAB to Firebase App Distribution
+                  echo "📌 GOOGLE_APPLICATION_CREDENTIALS 설정 값:"
+                  echo $GOOGLE_APPLICATION_CREDENTIALS
+                  ls -l $GOOGLE_APPLICATION_CREDENTIALS
+
+                  echo "📌 현재 Firebase 프로젝트 목록 확인:"
+                  firebase projects:list || (echo "❌ Firebase 인증 실패!"; exit 1)
+
+            # Firebase App Distribution Upload
+            - name: Upload APK to Firebase App Distribution
               env:
+                  GOOGLE_APPLICATION_CREDENTIALS: $HOME/firebase-credentials.json
                   FIREBASE_APP_ID: ${{ secrets.FIREBASE_APP_ID }}
               run: |
-                  firebase appdistribution:distribute app/build/outputs/bundle/release/app-release.aab \
+                  echo "🔥 FIREBASE_APP_ID 확인: $FIREBASE_APP_ID"
+
+                  # 만약 FIREBASE_APP_ID가 없으면 에러 출력 후 종료
+                  if [ -z "$FIREBASE_APP_ID" ]; then
+                    echo "❌ ERROR: FIREBASE_APP_ID가 설정되지 않았습니다. GitHub Secrets에서 확인하세요."
+                    exit 1
+                  fi
+
+                  # GOOGLE_APPLICATION_CREDENTIALS 재 설정
+                  export GOOGLE_APPLICATION_CREDENTIALS=$HOME/firebase-credentials.json
+                  echo "GOOGLE_APPLICATION_CREDENTIALS=$GOOGLE_APPLICATION_CREDENTIALS"
+
+                  firebase appdistribution:distribute app/build/outputs/apk/release/app-release.apk \
                   --app "$FIREBASE_APP_ID" \
-                  --release-notes "🍀 새로운 테스트 버전이 업로드되었습니다!" \
+                  --release-notes "🍀 새로운 테스트 버전이 업로드되었습니다~" \
                   --groups "clody-tester-group"
 
             # Discord Notification
@@ -91,5 +138,5 @@ jobs:
               run: |
                   curl -H "Content-Type: application/json" \
                   -X POST \
-                  -d '{"content": "🍀 새로운 테스트 버전이 업로드되었습니다!"}' \
+                  -d '{"content": "🍀 새로운 테스트 버전이 업로드되었습니다~\nAPK 다운로드: https://appdistribution.firebase.google.com"}' \
                   $DISCORD_WEBHOOK_URL
diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml
@@ -63,6 +63,14 @@ jobs:
                   FIREBASE_SECRET: ${{ secrets.FIREBASE_SECRET }}   # base64로 암호화된 json 사용
               run: echo $FIREBASE_SECRET | base64 --decode > app/google-services.json
 
+            # keystore 복호화
+            - name: Decode keystore file
+              env:
+                  STORE_FILE_BASE: ${{ secrets.STORE_FILE }}
+              run: |
+                  mkdir -p keystore
+                  echo "$STORE_FILE" | base64 --decode > keystore/clody_release.jks
+
             # local.properties 생성
             - name: Generate local.properties
               env:
@@ -71,13 +79,19 @@ jobs:
                   AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }}
                   GOOGLE_ADMOB_APP_ID: ${{ secrets.GOOGLE_ADMOB_APP_ID }}
                   GOOGLE_ADMOB_UNIT_ID: ${{ secrets.GOOGLE_ADMOB_UNIT_ID }}
+                  STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
+                  KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+                  KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
               run: |
                   echo "baseUrl=$BASE_URL" >> local.properties
                   echo "kakao.api.key=$KAKAO_API_KEY" >> local.properties
                   echo "amplitude.api.key=$AMPLITUDE_API_KEY" >> local.properties
                   echo "googleAdmob.app.id=$GOOGLE_ADMOB_APP_ID" >> local.properties
                   echo "googleAdmob.unit.id=$GOOGLE_ADMOB_UNIT_ID" >> local.properties
-
+                  echo "storeFile=keystore/clody_release.jks" >> local.properties
+                  echo "storePassword=$STORE_PASSWORD" >> local.properties
+                  echo "keyAlias=$KEY_ALIAS" >> local.properties
+                  echo "keyPassword=$KEY_PASSWORD" >> local.properties
 
             # ------- Build & Lint -------
             - name: Run Lint and Build
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -25,8 +25,8 @@ android {
         applicationId = "com.sopt.clody"
         minSdk = 28
         targetSdk = 35
-        versionCode = 18
-        versionName = "1.0.6"
+        versionCode = 23
+        versionName = "1.1.0"
         val kakaoApiKey: String = properties.getProperty("kakao.api.key")
         val amplitudeApiKey: String = properties.getProperty("amplitude.api.key")
         val googleAdmobAppId: String = properties.getProperty("GOOGLE_ADMOB_APP_ID", "")
@@ -40,6 +40,15 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    signingConfigs {
+        create("release") {
+            storeFile = file(properties.getProperty("storeFile") ?: "")
+            storePassword = properties.getProperty("storePassword") ?: ""
+            keyAlias = properties.getProperty("keyAlias") ?: ""
+            keyPassword = properties.getProperty("keyPassword") ?: ""
+        }
+    }
+
     buildTypes {
         debug {
             isMinifyEnabled = false
@@ -54,6 +63,7 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
             )
+            signingConfig = signingConfigs.getByName("release")
         }
     }
     compileOptions {
@@ -70,7 +80,6 @@ android {
 }
 
 dependencies {
-
     // Test
     testImplementation(libs.junit)
     androidTestImplementation(platform(libs.compose.bom))
@@ -99,6 +108,7 @@ dependencies {
     // FireBase
     implementation(platform(libs.firebase.bom))
     implementation(libs.bundles.firebase)
+    implementation(libs.firebase.config.ktx)
 
     // Amplitude
     implementation(libs.amplitude)
diff --git a/app/src/main/java/com/sopt/clody/data/remote/appupdate/AppUpdateCheckerImpl.kt b/app/src/main/java/com/sopt/clody/data/remote/appupdate/AppUpdateCheckerImpl.kt
@@ -0,0 +1,33 @@
+package com.sopt.clody.data.remote.appupdate
+
+import com.sopt.clody.data.remote.datasource.RemoteConfigDataSource
+import com.sopt.clody.domain.appupdate.AppUpdateChecker
+import com.sopt.clody.domain.model.AppUpdateState
+import com.sopt.clody.domain.util.VersionComparator
+import javax.inject.Inject
+
+class AppUpdateCheckerImpl @Inject constructor(
+    private val remoteConfigDataSource: RemoteConfigDataSource,
+) : AppUpdateChecker {
+
+    override suspend fun getAppUpdateState(currentVersion: String): AppUpdateState {
+        remoteConfigDataSource.fetch()
+
+        val latestVersion = remoteConfigDataSource.getLatestVersion()
+        val minimumVersion = remoteConfigDataSource.getMinimumVersion()
+
+        return when {
+            VersionComparator.compare(currentVersion, minimumVersion) < 0 -> {
+                AppUpdateState.HardUpdate(latestVersion)
+            }
+
+            VersionComparator.compare(currentVersion, latestVersion) < 0 -> {
+                AppUpdateState.SoftUpdate(latestVersion)
+            }
+
+            else -> {
+                AppUpdateState.Latest
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/sopt/clody/data/remote/datasource/RemoteConfigDataSource.kt b/app/src/main/java/com/sopt/clody/data/remote/datasource/RemoteConfigDataSource.kt
@@ -0,0 +1,27 @@
+package com.sopt.clody.data.remote.datasource
+
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import com.sopt.clody.BuildConfig
+import kotlinx.coroutines.tasks.await
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RemoteConfigDataSource @Inject constructor(
+    private val remoteConfig: FirebaseRemoteConfig,
+) {
+    suspend fun fetch() {
+        remoteConfig.fetchAndActivate().await()
+    }
+
+    fun getLatestVersion(): String =
+        remoteConfig.getString(KEY_LATEST_VERSION).ifEmpty { BuildConfig.VERSION_NAME }
+
+    fun getMinimumVersion(): String =
+        remoteConfig.getString(KEY_MINIMUM_VERSION).ifEmpty { BuildConfig.VERSION_NAME }
+
+    companion object {
+        private const val KEY_LATEST_VERSION = "latest_version"
+        private const val KEY_MINIMUM_VERSION = "min_required_version"
+    }
+}
diff --git a/app/src/main/java/com/sopt/clody/di/AppUpdateModule.kt b/app/src/main/java/com/sopt/clody/di/AppUpdateModule.kt
@@ -0,0 +1,27 @@
+package com.sopt.clody.di
+
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import com.sopt.clody.data.remote.appupdate.AppUpdateCheckerImpl
+import com.sopt.clody.data.remote.datasource.RemoteConfigDataSource
+import com.sopt.clody.domain.appupdate.AppUpdateChecker
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object AppUpdateModule {
+
+    @Provides
+    @Singleton
+    fun provideFirebaseRemoteConfig(): FirebaseRemoteConfig =
+        FirebaseRemoteConfig.getInstance()
+
+    @Provides
+    @Singleton
+    fun provideAppUpdateChecker(
+        remoteConfigDataSource: RemoteConfigDataSource,
+    ): AppUpdateChecker = AppUpdateCheckerImpl(remoteConfigDataSource)
+}
diff --git a/app/src/main/java/com/sopt/clody/domain/appupdate/AppUpdateChecker.kt b/app/src/main/java/com/sopt/clody/domain/appupdate/AppUpdateChecker.kt
@@ -0,0 +1,7 @@
+package com.sopt.clody.domain.appupdate
+
+import com.sopt.clody.domain.model.AppUpdateState
+
+interface AppUpdateChecker {
+    suspend fun getAppUpdateState(currentVersion: String): AppUpdateState
+}
diff --git a/app/src/main/java/com/sopt/clody/domain/model/AppUpdateState.kt b/app/src/main/java/com/sopt/clody/domain/model/AppUpdateState.kt
@@ -0,0 +1,7 @@
+package com.sopt.clody.domain.model
+
+sealed interface AppUpdateState {
+    data object Latest : AppUpdateState
+    data class SoftUpdate(val latestVersion: String) : AppUpdateState
+    data class HardUpdate(val latestVersion: String) : AppUpdateState
+}
diff --git a/app/src/main/java/com/sopt/clody/domain/util/VersionComparator.kt b/app/src/main/java/com/sopt/clody/domain/util/VersionComparator.kt
@@ -0,0 +1,16 @@
+package com.sopt.clody.domain.util
+
+object VersionComparator {
+    fun compare(current: String, latest: String): Int {
+        val currentParts = current.split(".").map { it.toIntOrNull() ?: 0 }
+        val latestParts = latest.split(".").map { it.toIntOrNull() ?: 0 }
+
+        for (i in 0 until maxOf(currentParts.size, latestParts.size)) {
+            val c = currentParts.getOrNull(i) ?: 0
+            val l = latestParts.getOrNull(i) ?: 0
+            if (c < l) return -1
+            if (c > l) return 1
+        }
+        return 0
+    }
+}
diff --git a/app/src/main/java/com/sopt/clody/presentation/ui/splash/SplashScreen.kt b/app/src/main/java/com/sopt/clody/presentation/ui/splash/SplashScreen.kt
diff --git a/app/src/main/java/com/sopt/clody/presentation/ui/splash/SplashViewModel.kt b/app/src/main/java/com/sopt/clody/presentation/ui/splash/SplashViewModel.kt
diff --git a/app/src/main/java/com/sopt/clody/presentation/utils/appupdate/AppUpdateUtils.kt b/app/src/main/java/com/sopt/clody/presentation/utils/appupdate/AppUpdateUtils.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
