review fixes

Author: Dorofeev

README.md

@@ -42,7 +42,7 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-commonMainApi("dev.icerock.moko:crash-reporting-core:0.1.0")
+    commonMainApi("dev.icerock.moko:crash-reporting-core:0.1.0")
     commonMainApi("dev.icerock.moko:crash-reporting-crashlytics:0.1.0") // for CrashlyticsLogger
     commonMainApi("dev.icerock.moko:crash-reporting-napier:0.1.0") // for CrashReportingAntilog
     commonMainImplementation("com.github.aakira:napier:1.4.1") // for CrashReportingAntilog

buildSrc/src/main/kotlin/Deps.kt

@@ -31,7 +31,6 @@ object Deps {
 
         val kotlinMultiplatform = GradlePlugin(id = "org.jetbrains.kotlin.multiplatform")
         val kotlinAndroid = GradlePlugin(id = "kotlin-android")
-        val kotlinAndroidExtensions = GradlePlugin(id = "kotlin-android-extensions")
 
         val mobileMultiplatform = GradlePlugin(id = "dev.icerock.mobile.multiplatform")
         val mavenPublish = GradlePlugin(id = "org.gradle.maven-publish")

crash-reporting-core/build.gradle.kts

@@ -5,7 +5,6 @@
 plugins {
     plugin(Deps.Plugins.androidLibrary)
     plugin(Deps.Plugins.kotlinMultiplatform)
-    plugin(Deps.Plugins.kotlinAndroidExtensions)
     plugin(Deps.Plugins.mobileMultiplatform)
     plugin(Deps.Plugins.mavenPublish)
 }

crash-reporting-core/src/androidMain/kotlin/dev/icerock/moko/crashreporting/core/noReflectionSimpleName.kt

@@ -4,17 +4,25 @@
 
 package dev.icerock.moko.crashreporting.core
 
-class CrashReportingCore {
+object CrashReportingCore {
 
     fun getLogText(logLevel: String? = null, tag: String? = null, message: String? = null): String {
-        var logText = logLevel?.let { "$it:" }.orEmpty()
 
-        tag?.let { logText = logText.plus(" $tag - ") }
-        message?.let { logText = logText.plus(message) }
-        return logText
+        return buildString {
+            logLevel?.let {
+                append(it)
+                append(": ")
+            }
+
+            tag?.let {
+                append(it)
+                append(" - ")
+            }
+            message?.let { append(message) }
+        }
     }
 
-    fun getExceptionName(throwable: Throwable): String? {
-        return throwable.noReflectionSimpleName
+    fun getExceptionName(throwable: Throwable): String {
+        return throwable::class.simpleName ?: "Unknown"
     }
 }

crash-reporting-core/src/commonMain/kotlin/dev/icerock/moko/crashreporting/core/CrashReportingCore.kt

@@ -5,5 +5,22 @@
 package dev.icerock.moko.crashreporting.core
 
 fun CrashReportingCore.getStackTrace(throwable: Throwable): List<Long> {
-    return throwable.getStackTraceAddresses()
+
+    val addresses: List<Long> = throwable.getStackTraceAddresses()
+
+    var index = 0
+
+    val stackTrace = throwable.getStackTrace()
+    for (element in stackTrace) {
+        if (throwableBoilerplate(element, "Exception") || throwableBoilerplate(element, "Throwable")) {
+            index++
+        } else {
+            break
+        }
+    }
+    return addresses.subList(index, addresses.size)
+}
+
+private fun throwableBoilerplate(frameString: String, lookFor: String): Boolean {
+    return frameString.contains("kotlin.$lookFor") || frameString.contains("$lookFor.<init>")
 }

crash-reporting-core/src/commonMain/kotlin/dev/icerock/moko/crashreporting/core/noReflectionSimpleName.kt

@@ -5,7 +5,6 @@
 plugins {
     plugin(Deps.Plugins.androidLibrary)
     plugin(Deps.Plugins.kotlinMultiplatform)
-    plugin(Deps.Plugins.kotlinAndroidExtensions)
     plugin(Deps.Plugins.mobileMultiplatform)
     plugin(Deps.Plugins.mavenPublish)
 }

crash-reporting-core/src/iosMain/kotlin/dev/icerock/moko/crashreporting/core/getStackTrace.kt

@@ -9,19 +9,19 @@ import dev.icerock.moko.crashreporting.core.ExceptionLogger
 
 @Suppress("EmptyDefaultConstructor")
 actual class CrashlyticsLogger actual constructor() : ExceptionLogger {
-    actual override fun log(message: String) {
+    override fun log(message: String) {
         FirebaseCrashlytics.getInstance().log(message)
     }
 
-    actual override fun recordException(throwable: Throwable) {
+    override fun recordException(throwable: Throwable) {
         FirebaseCrashlytics.getInstance().recordException(throwable)
     }
 
-    actual override fun setCustomValue(value: String, forKey: String) {
+    override fun setCustomValue(value: String, forKey: String) {
         FirebaseCrashlytics.getInstance().setCustomKey(value, forKey)
     }
 
-    actual override fun setUserId(userId: String) {
+    override fun setUserId(userId: String) {
         FirebaseCrashlytics.getInstance().setUserId(userId)
     }
 }