Merge pull request #313 from Team-Clody/develop

[TEST] 5차 스프린트 테스트 앱을 배포합니다.

Author: SYAAINN

.github/workflows/android_cd.yml

@@ -45,12 +45,18 @@ jobs:
             - name: Install Firebase CLI
               run: curl -sL https://firebase.tools | bash
 
-            # google-services.json
-            - name: Decode google-services.json
+            # google-services.json (prod)
+            - name: Decode Prod google-services.json
               env:
                   FIREBASE_SECRET: ${{ secrets.FIREBASE_SECRET }}
               run: echo $FIREBASE_SECRET | base64 --decode > app/google-services.json
 
+            # google-services.json (debug)
+            -   name: Decode Debug google-services.json
+                env:
+                    FIREBASE_DEBUG_SECRET: ${{ secrets.FIREBASE_DEBUG_SECRET }}
+                run: echo $FIREBASE_DEBUG_SECRET | base64 --decode > app/src/debug/google-services.json
+
             # keystore 복호화
             - name: Decode keystore file
               env:
@@ -62,28 +68,32 @@ jobs:
             # local.properties
             - name: Generate local.properties
               env:
-                  BASE_URL: ${{ secrets.BASE_URL }}
+                  CLODY_BASE_URL: ${{ secrets.CLODY_BASE_URL }}
+                  CLODY_TEST_URL: ${{ secrets.CLODY_TEST_URL }}
                   KAKAO_API_KEY: ${{ secrets.KAKAO_API_KEY }}
                   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 }}
+                  GOOGLE_AUTH_WEB_CLIENT_ID: ${{ secrets.GOOGLE_AUTH_WEB_CLIENT_ID }}
                   STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
                   KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
                   KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
               run: |
-                  echo "baseUrl=$BASE_URL" >> local.properties
+                  echo "clody.base.url=$CLODY_BASE_URL" >> local.properties
+                  echo "clody.test.url=$CLODY_TEST_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 "GOOGLE_ADMOB_APP_ID=$GOOGLE_ADMOB_APP_ID" >> local.properties
+                  echo "GOOGLE_ADMOB_UNIT_ID=$GOOGLE_ADMOB_UNIT_ID" >> local.properties
+                  echo "GOOGLE_AUTH_WEB_CLIENT_ID=$GOOGLE_AUTH_WEB_CLIENT_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 APK 빌드
-            - name: Build Release APK
-              run: ./gradlew assembleRelease --stacktrace
+            # Debug APK 빌드
+            - name: Build Debug APK
+              run: ./gradlew assembleDebug --stacktrace
 
             # Set up Firebase Service Account Credentials
             - name: Set up Firebase Service Account Credentials
@@ -112,22 +122,22 @@ jobs:
             - name: Upload APK to Firebase App Distribution
               env:
                   GOOGLE_APPLICATION_CREDENTIALS: $HOME/firebase-credentials.json
-                  FIREBASE_APP_ID: ${{ secrets.FIREBASE_APP_ID }}
+                  FIREBASE_DEBUG_APP_ID: ${{ secrets.FIREBASE_DEBUG_APP_ID }}
               run: |
-                  echo "🔥 FIREBASE_APP_ID 확인: $FIREBASE_APP_ID"
+                  echo "🔥 FIREBASE_DEBUG_APP_ID 확인: $FIREBASE_DEBUG_APP_ID"
 
-                  # 만약 FIREBASE_APP_ID가 없으면 에러 출력 후 종료
-                  if [ -z "$FIREBASE_APP_ID" ]; then
-                    echo "❌ ERROR: FIREBASE_APP_ID가 설정되지 않았습니다. GitHub Secrets에서 확인하세요."
+                  # 만약 FIREBASE_DEBUG_APP_ID가 없으면 에러 출력 후 종료
+                  if [ -z "$FIREBASE_DEBUG_APP_ID" ]; then
+                    echo "❌ ERROR: FIREBASE_DEBUG_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" \
+                  firebase appdistribution:distribute app/build/outputs/apk/debug/app-debug.apk \
+                  --app "$FIREBASE_DEBUG_APP_ID" \
                   --release-notes "🍀 새로운 테스트 버전이 업로드되었습니다~" \
                   --groups "clody-tester-group"
 

.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
 
+            # Firebase dubug google-services.json 복호화 및 설정
+            -   name: Decode debug google-services.json
+                env:
+                    FIREBASE_DEBUG_SECRET: ${{ secrets.FIREBASE_DEBUG_SECRET }}
+                run: |
+                    mkdir -p app/src/debug
+                    echo "$FIREBASE_DEBUG_SECRET" | base64 --decode > app/src/debug/google-services.json
+
             # keystore 복호화
             - name: Decode keystore file
               env:

app/build.gradle.kts

@@ -25,16 +25,19 @@ android {
         applicationId = "com.sopt.clody"
         minSdk = 28
         targetSdk = 35
-        versionCode = 25
-        versionName = "1.1.1"
+        versionCode = 28
+        versionName = "1.4.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", "")
         val googleAdmobUnitId: String = properties.getProperty("GOOGLE_ADMOB_UNIT_ID", "")
+        val googleAuthWebClientId: String = properties.getProperty("GOOGLE_AUTH_WEB_CLIENT_ID", "")
+
         buildConfigField("String", "GOOGLE_ADMOB_APP_ID", "\"$googleAdmobAppId\"")
         buildConfigField("String", "GOOGLE_ADMOB_UNIT_ID", "\"$googleAdmobUnitId\"")
         buildConfigField("String", "KAKAO_API_KEY", "\"$kakaoApiKey\"")
         buildConfigField("String", "AMPLITUDE_API_KEY", "\"$amplitudeApiKey\"")
+        buildConfigField("String", "GOOGLE_AUTH_WEB_CLIENT_ID", "\"$googleAuthWebClientId\"")
         manifestPlaceholders["kakaoRedirectUri"] = "kakao$kakaoApiKey"
         manifestPlaceholders["GOOGLE_ADMOB_APP_ID"] = googleAdmobAppId
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -51,8 +54,13 @@ android {
 
     buildTypes {
         debug {
+            applicationIdSuffix = ".dev"
+
             isMinifyEnabled = false
-            buildConfigField("String", "CLODY_BASE_URL", properties["clody.base.url"].toString())
+            buildConfigField("String", "CLODY_BASE_URL", properties["clody.test.url"].toString())
+
+            manifestPlaceholders["appLabel"] = "@string/app_name_dev"
+            manifestPlaceholders["appIcon"] = "@mipmap/ic_launcher_dev"
         }
 
         release {
@@ -64,6 +72,9 @@ android {
                 "proguard-rules.pro",
             )
             signingConfig = signingConfigs.getByName("release")
+
+            manifestPlaceholders["appLabel"] = "@string/app_name"
+            manifestPlaceholders["appIcon"] = "@mipmap/ic_launcher"
         }
     }
     compileOptions {
@@ -77,6 +88,11 @@ android {
         buildConfig = true
         compose = true
     }
+    testOptions {
+        unitTests.all {
+            it.useJUnitPlatform()
+        }
+    }
 }
 
 dependencies {
@@ -120,10 +136,26 @@ dependencies {
     implementation(libs.accompanist.systemuicontroller)
     implementation(libs.accompanist.insets)
 
+    // Mavericks
+    implementation(libs.bundles.mavericks)
+
+    // Kotest
+    testImplementation(libs.bundles.kotest)
+    testImplementation(libs.mockk)
+    testImplementation(libs.coroutines.test)
+
+    // Play Store
+    implementation(libs.bundles.plays)
+
     // ETC
     implementation(libs.timber)
     implementation(libs.lottie.compose)
     implementation(libs.coil)
     implementation(libs.kakao.user)
     implementation(libs.kotlinx.datetime)
+
+    implementation(libs.androidx.credentials.play.services.auth)
+    implementation(libs.google.auth)
+    implementation(libs.androidx.datastore.preferences)
+    implementation(libs.airbridge)
 }

app/src/debug/res/values-ko/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name_dev">돈키</string>
+</resources>

app/src/debug/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name_dev">Donkey</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -3,22 +3,24 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
     <application
-        android:name=".ClodyApp"
+        android:name=".ClodyApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:hardwareAccelerated="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:icon="${appIcon}"
+        android:label="${appLabel}"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.CLODY"
         android:usesCleartextTraffic="true"
+        tools:replace="android:icon,android:label,android:dataExtractionRules,android:fullBackupContent"
         tools:targetApi="31">
 
         <meta-data
@@ -37,7 +39,6 @@
         <activity
             android:name=".presentation.ui.main.MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.CLODY"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>

app/src/main/ic_launcher_dev-playstore.png

@@ -1,23 +1,33 @@
 package com.sopt.clody
 
 import android.app.Application
+import co.ab180.airbridge.Airbridge
+import co.ab180.airbridge.AirbridgeOptionBuilder
+import com.airbnb.mvrx.Mavericks
 import com.google.firebase.FirebaseApp
 import com.kakao.sdk.common.KakaoSdk
 import com.sopt.clody.presentation.utils.amplitude.AmplitudeUtils.initAmplitude
 import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
 
 @HiltAndroidApp
-class ClodyApp : Application() {
+class ClodyApplication : Application() {
     override fun onCreate() {
         super.onCreate()
         Timber.plant(Timber.DebugTree())
         initKakaoSdk()
         FirebaseApp.initializeApp(this)
+        Mavericks.initialize(this)
         initAmplitude(applicationContext)
+        initAirBridge()
     }
 
     private fun initKakaoSdk() {
         KakaoSdk.init(this, BuildConfig.KAKAO_API_KEY)
     }
+
+    private fun initAirBridge() {
+        val option = AirbridgeOptionBuilder("clody", "3ba2277abcd044f29356dc0ee32165ff").build()
+        Airbridge.initializeSDK(this, option)
+    }
 }

…src/main/java/com/sopt/clody/ClodyApp.kt …/java/com/sopt/clody/ClodyApplication.ktapp/src/main/java/com/sopt/clody/ClodyApp.kt renamed to app/src/main/java/com/sopt/clody/ClodyApplication.kt app/src/main/java/com/sopt/clody/ClodyApp.kt renamed to app/src/main/java/com/sopt/clody/ClodyApplication.kt

@@ -1,4 +1,4 @@
-package com.sopt.clody.core
+package com.sopt.clody.core.ad
 
 import android.app.Activity
 

…va/com/sopt/clody/core/RewardAdShower.kt …com/sopt/clody/core/ad/RewardAdShower.ktapp/src/main/java/com/sopt/clody/core/RewardAdShower.kt renamed to app/src/main/java/com/sopt/clody/core/ad/RewardAdShower.kt app/src/main/java/com/sopt/clody/core/RewardAdShower.kt renamed to app/src/main/java/com/sopt/clody/core/ad/RewardAdShower.kt

@@ -0,0 +1,18 @@
+package com.sopt.clody.core.fcm
+
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.messaging.ktx.messaging
+import kotlinx.coroutines.tasks.await
+import timber.log.Timber
+import javax.inject.Inject
+
+class FcmTokenProvider @Inject constructor() {
+    suspend fun getToken(): String? {
+        return try {
+            Firebase.messaging.token.await()
+        } catch (e: Exception) {
+            Timber.e("FCM 토큰 수신 실패: ${e.message}")
+            null
+        }
+    }
+}