Merge pull request #66 from YAPP-Github/feature/tgyuu/PC-588

.github/workflows/android_cd.yml

@@ -37,6 +37,9 @@ jobs:
           echo "PIECE_PROD_BASE_URL=${{ secrets.PIECE_PROD_BASE_URL }}" >> local.properties
           echo "GOOGLE_WEB_CLIENT_ID=${{ secrets.GOOGLE_WEB_CLIENT_ID }}" >> local.properties
 
+      - name: Create google-services.json
+        run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
+
       - name: Build with Gradle
         run: ./gradlew assembleDebug --build-cache --stacktrace
 

.github/workflows/android_ci.yml

@@ -40,6 +40,9 @@ jobs:
         echo "PIECE_PROD_BASE_URL=${{ secrets.PIECE_PROD_BASE_URL }}" >> local.properties
         echo "GOOGLE_WEB_CLIENT_ID=${{ secrets.GOOGLE_WEB_CLIENT_ID }}" >> local.properties
 
+    - name: Create google-services.json
+      run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
+
     - name: Build with Gradle
       run: ./gradlew assembleDebug --build-cache --stacktrace
 

app/.gitignore

@@ -1 +1,2 @@
-/build
+/build
+google-services.json

app/build.gradle.kts

@@ -3,6 +3,7 @@ import java.util.Properties
 plugins {
     id("piece.android.application")
     id("piece.android.compose")
+    id("com.google.firebase.crashlytics")
 }
 
 android {

build-logic/src/main/java/com/puzzle/build/logic/KotlinAndroid.kt

@@ -2,13 +2,17 @@ package com.puzzle.build.logic
 
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.provideDelegate
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 internal fun Project.configureKotlinAndroid() {
-    pluginManager.apply("org.jetbrains.kotlin.android")
+    with(plugins) {
+        apply("org.jetbrains.kotlin.android")
+        apply("com.google.gms.google-services")
+    }
 
     androidExtension.apply {
         compileSdk = 35
@@ -40,6 +44,14 @@ internal fun Project.configureKotlinAndroid() {
         }
     }
 
+    val libs = extensions.libs
+    dependencies {
+        val bom = libs.findLibrary("firebase-bom").get()
+        add("implementation", platform(bom))
+        add("implementation", libs.findLibrary("firebase-analytics").get())
+        add("implementation", libs.findLibrary("firebase-crashlytics").get())
+    }
+
     configureKotlin()
 }
 

build.gradle.kts

@@ -9,4 +9,6 @@ plugins {
     alias(libs.plugins.android.test) apply false
     alias(libs.plugins.ktlint)
     alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.google.services) apply false
+    alias(libs.plugins.firebase.crashlytics) apply false
 }

core/data/src/main/java/com/puzzle/data/di/DataModule.kt

@@ -4,11 +4,13 @@ import com.puzzle.data.repository.TokenManagerImpl
 import com.puzzle.data.image.ImageResizer
 import com.puzzle.data.image.ImageResizerImpl
 import com.puzzle.data.repository.AuthRepositoryImpl
+import com.puzzle.data.repository.ErrorRepositoryImpl
 import com.puzzle.data.repository.MatchingRepositoryImpl
 import com.puzzle.data.repository.ProfileRepositoryImpl
 import com.puzzle.data.repository.TermsRepositoryImpl
 import com.puzzle.data.repository.UserRepositoryImpl
 import com.puzzle.domain.repository.AuthRepository
+import com.puzzle.domain.repository.ErrorRepository
 import com.puzzle.domain.repository.MatchingRepository
 import com.puzzle.domain.repository.ProfileRepository
 import com.puzzle.domain.repository.TermsRepository
@@ -54,6 +56,12 @@ abstract class DataModule {
         matchingRepositoryImpl: MatchingRepositoryImpl,
     ): MatchingRepository
 
+    @Binds
+    @Singleton
+    abstract fun bindsErrorRepository(
+        errorRepositoryImpl: ErrorRepositoryImpl,
+    ): ErrorRepository
+
     @Binds
     @Singleton
     abstract fun bindsTokenManager(

core/data/src/main/java/com/puzzle/data/repository/ErrorRepositoryImpl.kt

@@ -0,0 +1,11 @@
+package com.puzzle.data.repository
+
+import com.puzzle.domain.repository.ErrorRepository
+import com.puzzle.network.source.error.ErrorDataSource
+import javax.inject.Inject
+
+class ErrorRepositoryImpl @Inject constructor(
+    private val errorDataSource: ErrorDataSource,
+) : ErrorRepository {
+    override suspend fun logError(exception: Throwable) = errorDataSource.logError(exception)
+}

core/domain/src/main/java/com/puzzle/domain/model/error/ErrorHelper.kt

@@ -1,16 +1,20 @@
 package com.puzzle.domain.model.error
 
+import com.puzzle.domain.repository.ErrorRepository
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.receiveAsFlow
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class ErrorHelper @Inject constructor() {
+class ErrorHelper @Inject constructor(
+    private val errorRepository: ErrorRepository,
+) {
     private val _errorEvent = Channel<Throwable>(DEFAULT_BUFFER_SIZE)
     val errorEvent = _errorEvent.receiveAsFlow()
 
-    fun sendError(error: Throwable) {
-        _errorEvent.trySend(error)
+    suspend fun sendError(error: Throwable) {
+        _errorEvent.send(error)
+        errorRepository.logError(error)
     }
 }

core/domain/src/main/java/com/puzzle/domain/repository/ErrorRepository.kt

@@ -0,0 +1,5 @@
+package com.puzzle.domain.repository
+
+interface ErrorRepository {
+    suspend fun logError(exception: Throwable)
+}

core/network/src/main/java/com/puzzle/network/di/NetworkModule.kt

@@ -1,7 +1,12 @@
 package com.puzzle.network.di
 
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.puzzle.network.BuildConfig.BUILD_TYPE
 import com.puzzle.network.source.auth.AuthDataSource
 import com.puzzle.network.source.auth.AuthDataSourceImpl
+import com.puzzle.network.source.error.DebugErrorDataSourceImpl
+import com.puzzle.network.source.error.ErrorDataSource
+import com.puzzle.network.source.error.ErrorDataSourceImpl
 import com.puzzle.network.source.matching.MatchingDataSource
 import com.puzzle.network.source.matching.MatchingDataSourceImpl
 import com.puzzle.network.source.profile.ProfileDataSource
@@ -10,13 +15,15 @@ import com.puzzle.network.source.term.TermDataSource
 import com.puzzle.network.source.term.TermDataSourceImpl
 import dagger.Binds
 import dagger.Module
+import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Qualifier
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-abstract class NetworkModule {
+abstract class NetworkBindsModule {
 
     @Binds
     @Singleton
@@ -42,3 +49,44 @@ abstract class NetworkModule {
         matchingDataSourceImpl: MatchingDataSourceImpl,
     ): MatchingDataSource
 }
+
+@Module
+@InstallIn(SingletonComponent::class)
+object NetworkProvidesModule {
+    @Provides
+    @Singleton
+    fun provideFirebaseCrashlytics(): FirebaseCrashlytics =
+        FirebaseCrashlytics.getInstance()
+
+    @Provides
+    @Singleton
+    @Debug
+    fun provideDebugErrorDataSource(
+        debugErrorDataSourceImpl: DebugErrorDataSourceImpl
+    ): ErrorDataSource = debugErrorDataSourceImpl
+
+    @Provides
+    @Singleton
+    @Release
+    fun provideReleaseErrorDataSource(
+        errorDataSourceImpl: ErrorDataSourceImpl
+    ): ErrorDataSource = errorDataSourceImpl
+
+    @Provides
+    @Singleton
+    fun provideErrorDataSource(
+        @Debug debugErrorDataSource: ErrorDataSource,
+        @Release releaseErrorDataSource: ErrorDataSource,
+    ): ErrorDataSource {
+        return if (BUILD_TYPE == "RELEASE") releaseErrorDataSource
+        else debugErrorDataSource
+    }
+}
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class Debug
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class Release

core/network/src/main/java/com/puzzle/network/source/error/DebugErrorDataSourceImpl.kt

@@ -0,0 +1,10 @@
+package com.puzzle.network.source.error
+
+import android.util.Log
+import javax.inject.Inject
+
+class DebugErrorDataSourceImpl @Inject constructor() : ErrorDataSource {
+    override suspend fun logError(exception: Throwable) {
+        Log.e("DebugErrorDataSource", exception.stackTraceToString())
+    }
+}

core/network/src/main/java/com/puzzle/network/source/error/ErrorDataSource.kt

@@ -0,0 +1,5 @@
+package com.puzzle.network.source.error
+
+interface ErrorDataSource {
+    suspend fun logError(exception: Throwable)
+}

core/network/src/main/java/com/puzzle/network/source/error/ErrorDataSourceImpl.kt

@@ -0,0 +1,12 @@
+package com.puzzle.network.source.error
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import javax.inject.Inject
+
+class ErrorDataSourceImpl @Inject constructor(
+    private val firebaseCrashlytics: FirebaseCrashlytics,
+) : ErrorDataSource {
+    override suspend fun logError(exception: Throwable) {
+        firebaseCrashlytics.recordException(exception)
+    }
+}

feature/auth/src/main/java/com/puzzle/auth/graph/login/LoginViewModel.kt

@@ -72,7 +72,7 @@ class LoginViewModel @AssistedInject constructor(
             .also { setState { copy(isLoading = false) } }
     }
 
-    internal fun loginFailure(throwable: Throwable) {
+    internal fun loginFailure(throwable: Throwable) = viewModelScope.launch {
         setState { copy(isLoading = false) }
         errorHelper.sendError(throwable)
     }

gradle/libs.versions.toml

@@ -72,9 +72,8 @@ androidxEspresso = "3.6.1"
 
 ## firebase
 googleServices = "4.4.2"
-firebaseBom = "33.7.0"
-crashlytics = "3.0.2"
-messaging = "24.1.0"
+firebaseBom = "33.9.0"
+crashlytics = "3.0.3"
 
 ## OAuth
 # https://developer.android.com/jetpack/androidx/releases/credentials
@@ -180,7 +179,7 @@ firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.r
 firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" }
 firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" }
 firebase-config = { group = "com.google.firebase", name = "firebase-config-ktx" }
-firebase-messaging = { module = "com.google.firebase:firebase-messaging", version.ref = "messaging" }
+firebase-messaging = { module = "com.google.firebase:firebase-messaging" }
 
 [bundles]