Merge pull request #3 from icerockdev/#2-ios-crash-at-init

#2 ios crash at init

Author: Alex009

MCRCDynamicProxy.podspec

@@ -0,0 +1,15 @@
+Pod::Spec.new do |spec|
+    spec.name                     = 'MCRCDynamicProxy'
+    spec.version                  = '0.1.0'
+    spec.homepage                 = 'https://github.com/icerockdev/moko-crash-reporting'
+    spec.source                   = { :git => "https://github.com/icerockdev/moko-crash-reporting.git", :tag => "release/#{spec.version}" }
+    spec.authors                  = 'IceRock Development'
+    spec.license                  = { :type => 'Apache 2', :file => 'LICENSE.md' }
+    spec.summary                  = 'summary'
+    spec.module_name              = "#{spec.name}"
+
+    spec.ios.deployment_target  = '11.0'
+    spec.swift_version = '5'
+
+    spec.source_files = "crash-reporting-crashlytics/src/iosMain/swift/DynamicProxy/**/*.{h,m,swift}"
+end

MCRCStaticReporter.podspec

@@ -0,0 +1,19 @@
+Pod::Spec.new do |spec|
+    spec.name                     = 'MCRCStaticReporter'
+    spec.version                  = '0.1.0'
+    spec.homepage                 = 'https://github.com/icerockdev/moko-crash-reporting'
+    spec.source                   = { :git => "https://github.com/icerockdev/moko-crash-reporting.git", :tag => "release/#{spec.version}" }
+    spec.authors                  = 'IceRock Development'
+    spec.license                  = { :type => 'Apache 2', :file => 'LICENSE.md' }
+    spec.summary                  = 'summary'
+    spec.module_name              = "#{spec.name}"
+
+    spec.ios.deployment_target  = '11.0'
+    spec.swift_version = '5'
+    spec.static_framework = true
+
+    spec.dependency 'FirebaseCrashlytics', '~> 7.3'
+    spec.dependency 'MCRCDynamicProxy'
+
+    spec.source_files = "crash-reporting-crashlytics/src/iosMain/swift/StaticReporter/**/*.{h,m,swift}"
+end

README.md

@@ -1,6 +1,6 @@
 ![moko-crash-reporting](https://user-images.githubusercontent.com/701307/98216339-818ef400-1f7b-11eb-9273-083389b0f3b9.png)  
 [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download]
-![kotlin-version](https://img.shields.io/badge/kotlin-1.4.10-orange)
+![kotlin-version](https://img.shields.io/badge/kotlin-1.4.21-orange)
 
 # Mobile Kotlin crash report
 
@@ -29,6 +29,8 @@ This is a Kotlin MultiPlatform library that provides reporting fatal and non-fat
 ## Versions
 - kotlin 1.4.10
   - 0.1.0
+- kotlin 1.4.21
+  - 0.1.1
 
 ## Installation
 root build.gradle  
@@ -43,9 +45,8 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    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("dev.icerock.moko:crash-reporting-crashlytics:0.1.1") // for CrashlyticsLogger
+    commonMainImplementation("dev.icerock.moko:crash-reporting-napier:0.1.1") // for CrashReportingAntilog
     commonMainImplementation("com.github.aakira:napier:1.4.1") // for CrashReportingAntilog
 }
 ```
@@ -56,34 +57,29 @@ With [mobile-multiplatform-gradle-plugin](https://github.com/icerockdev/mobile-m
 cocoaPods {
     podsProject = file("ios-app/Pods/Pods.xcodeproj")
 
-    pod("GoogleUtilities", onlyLink = false)
-    pod("FirebaseCrashlytics", onlyLink = true)
+    pod("MCRCDynamicProxy", onlyLink = true)
 }
 ```
 project Podfile
 ```ruby
-pod 'Firebase', '6.33.0'
-pod 'FirebaseCrashlytics', '4.6.1'
+pod 'MCRCDynamicProxy', :git => 'https://github.com/icerockdev/moko-crash-reporting.git', :tag => 'release/0.1.1'
+pod 'MCRCStaticReporter', :git => 'https://github.com/icerockdev/moko-crash-reporting.git', :tag => 'release/0.1.1'
+```
 
-# Firebase libraries already linked in moko-crash-reporting. Remove duplicated linking.
-post_install do |installer|
-    host_targets = installer.aggregate_targets.select { |aggregate_target|
-        aggregate_target.name.include? "Pods-"
-}
+On iOS side add to `AppDelegate`:
+```swift
+import FirebaseCore
+import MCRCStaticReporter
+
+...
 
-host_targets.each do |host_target|
-    host_target.xcconfigs.each do |config_name, config_file|
-        config_file.frameworks.delete("FirebaseCore")
-        config_file.frameworks.delete("FirebaseCrashlytics")
-        config_file.frameworks.delete("FirebaseInstallations")
-        config_file.frameworks.delete("GoogleDataTransport")
-
-        xcconfig_path = host_target.xcconfig_path(config_name)
-        config_file.save_as(xcconfig_path)
-        end
-    end
-end
+func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
+    FirebaseApp.configure()
+    MokoFirebaseCrashlytics.setup()
+    ...
+}
 ```
+
 ## Usage
 
 ### CrashlyticsLogger

buildSrc/build.gradle.kts

@@ -3,7 +3,7 @@
  */
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version("1.4.10")
+    id("org.jetbrains.kotlin.jvm") version("1.4.21")
 }
 
 repositories {
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    implementation("dev.icerock:mobile-multiplatform:0.8.0")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10")
+    implementation("dev.icerock:mobile-multiplatform:0.9.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21")
     implementation("com.android.tools.build:gradle:4.0.1")
 }

buildSrc/src/main/kotlin/Deps.kt

@@ -3,8 +3,6 @@
  */
 
 object Deps {
-
-    private const val kotlinVersion = "1.4.10"
     private const val detektVersion = "1.7.4"
 
     private const val androidAppCompatVersion = "1.1.0"
@@ -16,7 +14,7 @@ object Deps {
     private const val firebaseCoreVersion = "17.4.3"
     private const val firebaseCrashlyticsVersion = "17.1.0"
 
-    const val mokoCrashReportingVersion = "0.1.0"
+    const val mokoCrashReportingVersion = "0.1.1"
 
 
     object Android {

crash-reporting-crashlytics/build.gradle.kts

@@ -35,5 +35,5 @@ publishing {
 cocoaPods {
     podsProject = file("../sample/ios-app/Pods/Pods.xcodeproj")
 
-    pod("FirebaseCrashlytics", onlyLink = false)
+    pod("MCRCDynamicProxy")
 }

crash-reporting-crashlytics/src/iosMain/swift/DynamicProxy/FirebaseDynamicProxy.swift

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+import Foundation
+
+@objc
+public class FirebaseDynamicProxy: NSObject {
+  @objc
+  public static var reporter: FirebaseCrashlyticsReporter? = nil
+}
+
+@objc
+public protocol FirebaseCrashlyticsReporter {
+  func setUserId(userId: String)
+  func setCustomValue(value: String, forKey: String)
+  func recordException(name: String, reason: String, stackTrace: [UInt])
+  func log(message: String)
+}

crash-reporting-crashlytics/src/iosMain/swift/StaticReporter/FirebaseStaticReporter.swift

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+import FirebaseCrashlytics
+import MCRCDynamicProxy
+
+public class MokoFirebaseCrashlytics: FirebaseCrashlyticsReporter {
+  public func setUserId(userId: String) {
+    Crashlytics.crashlytics().setUserID(userId)
+  }
+  
+  public func setCustomValue(value: String, forKey: String) {
+    Crashlytics.crashlytics().setCustomValue(value, forKey: forKey)
+  }
+  
+  public func recordException(name: String, reason: String, stackTrace: [UInt]) {
+    let exceptionModel = ExceptionModel(
+      name: name,
+      reason: reason
+    )
+    let stackFrames = stackTrace.map {
+      StackFrame(address: $0)
+    }
+    
+    exceptionModel.stackTrace = stackFrames
+    
+    Crashlytics.crashlytics().record(exceptionModel: exceptionModel)
+  }
+  
+  public func log(message: String) {
+    Crashlytics.crashlytics().log(message)
+  }
+  
+  public static func setup() {
+    FirebaseDynamicProxy.reporter = MokoFirebaseCrashlytics()
+  }
+}

crash-reporting-crashlytics/src/iosX64Main/kotlin/dev/icerock/moko/crashreporting/crashlytics/CrashlyticsLogger.kt

@@ -1,40 +1,40 @@
 package dev.icerock.moko.crashreporting.crashlytics
 
-import cocoapods.FirebaseCrashlytics.FIRCrashlytics
-import cocoapods.FirebaseCrashlytics.FIRExceptionModel
-import cocoapods.FirebaseCrashlytics.FIRStackFrame
+import cocoapods.MCRCDynamicProxy.FirebaseCrashlyticsReporterProtocol
+import cocoapods.MCRCDynamicProxy.FirebaseDynamicProxy
 import dev.icerock.moko.crashreporting.core.CrashReportingCore
 import dev.icerock.moko.crashreporting.core.ExceptionLogger
 import dev.icerock.moko.crashreporting.core.getStackTrace
 
 actual class CrashlyticsLogger actual constructor() : ExceptionLogger {
+    private val reporter: FirebaseCrashlyticsReporterProtocol = FirebaseDynamicProxy.reporter()
+        ?: throw IllegalStateException("MokoFirebaseCrashlytics.setup() should be called in swift before creating CrashlyticsLogger")
+
     override fun log(message: String) {
-        FIRCrashlytics.crashlytics().log(message)
+        reporter.logWithMessage(message)
     }
 
     @ExperimentalUnsignedTypes
     override fun recordException(throwable: Throwable) {
         val crashReportingCore = CrashReportingCore
         val name = crashReportingCore.getExceptionName(throwable)
         val stackTrace = crashReportingCore.getStackTrace(throwable)
-        val exceptionModel = FIRExceptionModel.exceptionModelWithName(
+
+        reporter.recordExceptionWithName(
             name = name,
-            reason = throwable.message.orEmpty()
+            reason = throwable.message.orEmpty(),
+            stackTrace = stackTrace
         )
-        val stackFrames = stackTrace.map {
-            FIRStackFrame.stackFrameWithAddress(address = it.toULong())
-        }
-
-        exceptionModel.stackTrace = stackFrames
-
-        FIRCrashlytics.crashlytics().recordExceptionModel(exceptionModel)
     }
 
     override fun setCustomValue(value: String, forKey: String) {
-        FIRCrashlytics.crashlytics().setCustomValue(value = value, forKey = forKey)
+        reporter.setCustomValueWithValue(
+            value = value,
+            forKey = forKey
+        )
     }
 
     override fun setUserId(userId: String) {
-        FIRCrashlytics.crashlytics().setUserID(userId)
+        reporter.setUserIdWithUserId(userId)
     }
 }

sample/ios-app/Podfile

@@ -12,25 +12,7 @@ install! 'cocoapods', :disable_input_output_paths => true
 
 target 'TestProj' do
   pod 'MultiPlatformLibrary', :path => '../mpp-library'
-  pod 'Firebase', '6.33.0'
-  pod 'FirebaseCrashlytics', '4.6.1'
-  
-  # Firebase libraries already linked in moko-crash-reporting. Remove duplicated linking.
-  post_install do |installer|
-    host_targets = installer.aggregate_targets.select { |aggregate_target|
-      aggregate_target.name.include? "Pods-"
-    }
-    
-    host_targets.each do |host_target|
-      host_target.xcconfigs.each do |config_name, config_file|
-        config_file.frameworks.delete("FirebaseCore")
-        config_file.frameworks.delete("FirebaseCrashlytics")
-        config_file.frameworks.delete("FirebaseInstallations")
-        config_file.frameworks.delete("GoogleDataTransport")
-        
-        xcconfig_path = host_target.xcconfig_path(config_name)
-        config_file.save_as(xcconfig_path)
-      end
-    end
-  end
+
+  pod 'MCRCDynamicProxy', :path => '../..'
+  pod 'MCRCStaticReporter', :path => '../..'
 end