Inject crash report logger from platforms

androidApp/build.gradle.kts

@@ -135,6 +135,7 @@ dependencies {
 
     "googlePlayImplementation"(platform(libs.firebase.bom))
     "googlePlayImplementation"(libs.firebase.crashlytics)
+    "googlePlayImplementation"(libs.touchlab.kermit.crash)
 
     debugImplementation(compose.uiTooling)
 

androidApp/src/fdroid/kotlin/com/prof18/feedflow/android/CrashlyticsHelper.kt

@@ -1,7 +1,18 @@
 package com.prof18.feedflow.android
 
+import co.touchlab.kermit.LogWriter
+import co.touchlab.kermit.Severity
+
 class CrashlyticsHelper {
     fun initCrashlytics() {
         // no-op
     }
+
+    fun crashReportingLogWriter(): LogWriter = object : LogWriter() {
+        override fun isLoggable(tag: String, severity: Severity): Boolean = false
+
+        override fun log(severity: Severity, message: String, tag: String, throwable: Throwable?) {
+            // no-op
+        }
+    }
 }

androidApp/src/googlePlay/kotlin/com/prof18/feedflow/android/CrashlyticsHelper.kt

@@ -1,5 +1,8 @@
 package com.prof18.feedflow.android
 
+import co.touchlab.kermit.ExperimentalKermitApi
+import co.touchlab.kermit.LogWriter
+import co.touchlab.kermit.crashlytics.CrashlyticsLogWriter
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import com.prof18.feedflow.shared.utils.enableKmpCrashlytics
@@ -9,4 +12,7 @@ class CrashlyticsHelper {
         Firebase.crashlytics.setCrashlyticsCollectionEnabled(true)
         enableKmpCrashlytics()
     }
+
+    @OptIn(ExperimentalKermitApi::class)
+    fun crashReportingLogWriter(): LogWriter = CrashlyticsLogWriter()
 }

androidApp/src/main/kotlin/com/prof18/feedflow/android/FeedFlowApp.kt

@@ -39,8 +39,8 @@ class FeedFlowApp : Application() {
             isDropboxSyncEnabled = isGooglePlayFlavor,
         )
 
+        val crashlyticsHelper = CrashlyticsHelper()
         if (isGooglePlayFlavor && appEnvironment.isRelease()) {
-            val crashlyticsHelper = CrashlyticsHelper()
             crashlyticsHelper.initCrashlytics()
         }
 
@@ -49,6 +49,7 @@ class FeedFlowApp : Application() {
             platformSetup = {
                 workManagerFactory()
             },
+            crashReportingLogWriter = crashlyticsHelper.crashReportingLogWriter(),
             modules = listOf(
                 module {
                     single<Context> { this@FeedFlowApp }

shared/build.gradle.kts

@@ -100,11 +100,6 @@ kotlin {
 
         val commonMobileMain by creating {
             dependsOn(commonMain.get())
-
-            dependencies {
-                implementation(libs.crashk.ios)
-                implementation(libs.touchlab.kermit.crash)
-            }
         }
 
         androidMain {
@@ -113,7 +108,6 @@ kotlin {
 
             dependencies {
                 implementation(libs.koin.android)
-                implementation(libs.crashk.ios)
                 implementation(libs.touchlab.kermit.crash)
                 implementation(libs.workmanager)
                 implementation(libs.koin.workmanager)
@@ -135,6 +129,7 @@ kotlin {
 
             dependencies {
                 api(libs.touchlab.kermit.simple)
+                implementation(libs.touchlab.kermit.crash)
                 implementation(libs.ktor.client.darwin)
             }
         }

shared/src/commonMain/kotlin/com/prof18/feedflow/shared/di/Koin.kt

@@ -1,6 +1,7 @@
 package com.prof18.feedflow.shared.di
 
 import androidx.lifecycle.ViewModel
+import co.touchlab.kermit.LogWriter
 import co.touchlab.kermit.Logger
 import co.touchlab.kermit.StaticConfig
 import co.touchlab.kermit.platformLogWriter
@@ -24,7 +25,6 @@ import com.prof18.feedflow.shared.domain.feedsync.FeedSyncRepository
 import com.prof18.feedflow.shared.domain.feedsync.FeedSyncer
 import com.prof18.feedflow.shared.domain.mappers.RssChannelMapper
 import com.prof18.feedflow.shared.domain.settings.SettingsRepository
-import com.prof18.feedflow.shared.logging.crashReportingLogWriter
 import com.prof18.feedflow.shared.presentation.AccountsViewModel
 import com.prof18.feedflow.shared.presentation.AddFeedViewModel
 import com.prof18.feedflow.shared.presentation.FeedSourceListViewModel
@@ -49,6 +49,7 @@ import org.koin.dsl.module
 
 fun initKoin(
     appConfig: AppConfig,
+    crashReportingLogWriter: LogWriter,
     modules: List<Module>,
     platformSetup: KoinApplication.() -> Unit = {},
 ): KoinApplication {
@@ -57,19 +58,22 @@ fun initKoin(
             modules +
                 coreModule +
                 dropboxModule +
-                getLoggingModule(appConfig) +
+                getLoggingModule(appConfig, crashReportingLogWriter) +
                 getPlatformModule(appConfig.appEnvironment) +
                 getFeedSyncModule(appConfig.appEnvironment),
         )
         platformSetup()
     }
 }
 
-private fun getLoggingModule(appConfig: AppConfig): Module =
+private fun getLoggingModule(
+    appConfig: AppConfig,
+    crashReportingLogWriter: LogWriter,
+): Module =
     module {
         val loggers = mutableListOf(platformLogWriter())
         if (appConfig.appEnvironment.isRelease() && appConfig.isLoggingEnabled) {
-            loggers.add(crashReportingLogWriter())
+            loggers.add(crashReportingLogWriter)
         }
 
         val baseLogger = Logger(

shared/src/iosMain/kotlin/com/prof18/feedflow/shared/di/KoinIOS.kt

@@ -1,7 +1,9 @@
 package com.prof18.feedflow.shared.di
 
 import app.cash.sqldelight.db.SqlDriver
+import co.touchlab.kermit.ExperimentalKermitApi
 import co.touchlab.kermit.Logger
+import co.touchlab.kermit.crashlytics.CrashlyticsLogWriter
 import com.prof18.feedflow.core.utils.AppConfig
 import com.prof18.feedflow.core.utils.AppEnvironment
 import com.prof18.feedflow.core.utils.DispatcherProvider
@@ -40,6 +42,7 @@ import org.koin.core.module.Module
 import org.koin.core.parameter.parametersOf
 import org.koin.dsl.module
 
+@OptIn(ExperimentalKermitApi::class)
 fun initKoinIos(
     htmlParser: HtmlParser,
     appEnvironment: AppEnvironment,
@@ -52,6 +55,7 @@ fun initKoinIos(
         isLoggingEnabled = true,
         isDropboxSyncEnabled = true,
     ),
+    crashReportingLogWriter = CrashlyticsLogWriter(),
     modules = listOf(
         module {
             factory { htmlParser }

shared/src/jvmMain/kotlin/com/prof18/feedflow/shared/di/KoinDesktop.kt

@@ -12,6 +12,7 @@ import com.prof18.feedflow.shared.domain.feedsync.FeedSyncJvmWorker
 import com.prof18.feedflow.shared.domain.feedsync.FeedSyncWorker
 import com.prof18.feedflow.shared.domain.model.CurrentOS
 import com.prof18.feedflow.shared.domain.opml.OpmlFeedHandler
+import com.prof18.feedflow.shared.logging.SentryLogWriter
 import com.prof18.feedflow.shared.presentation.DropboxSyncViewModel
 import com.russhwolf.settings.PreferencesSettings
 import com.russhwolf.settings.Settings
@@ -32,6 +33,7 @@ fun initKoinDesktop(
         isLoggingEnabled = true,
         isDropboxSyncEnabled = true,
     ),
+    crashReportingLogWriter = SentryLogWriter(),
     modules = modules + getDatabaseModule(appEnvironment),
 )