#2 remove linkage of static libs into kotlin lib

Alex009 · Alex009 · commit 2006ba79ea6f · 2020-12-23T00:14:10.000+07:00
diff --git a/MCRCDynamicProxy.podspec b/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
diff --git a/MCRCStaticReporter.podspec b/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
diff --git a/buildSrc/src/main/kotlin/Deps.kt b/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 {
diff --git a/crash-reporting-crashlytics/build.gradle.kts b/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")
 }
diff --git a/crash-reporting-crashlytics/src/iosMain/swift/DynamicProxy/FirebaseDynamicProxy.swift b/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)
+}
diff --git a/crash-reporting-crashlytics/src/iosMain/swift/StaticReporter/FirebaseStaticReporter.swift b/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()
+  }
+}
diff --git a/crash-reporting-crashlytics/src/iosX64Main/kotlin/dev/icerock/moko/crashreporting/crashlytics/CrashlyticsLogger.kt b/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)
     }
 }
diff --git a/sample/ios-app/Podfile b/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
diff --git a/sample/ios-app/Podfile.lock b/sample/ios-app/Podfile.lock
@@ -1,112 +1,81 @@
 PODS:
-  - Firebase (6.33.0):
-    - Firebase/Core (= 6.33.0)
-  - Firebase/Core (6.33.0):
-    - Firebase/CoreOnly
-    - FirebaseAnalytics (= 6.8.3)
-  - Firebase/CoreOnly (6.33.0):
-    - FirebaseCore (= 6.10.3)
-  - FirebaseAnalytics (6.8.3):
-    - FirebaseCore (~> 6.10)
-    - FirebaseInstallations (~> 1.6)
-    - GoogleAppMeasurement (= 6.8.3)
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
-    - GoogleUtilities/MethodSwizzler (~> 6.7)
-    - GoogleUtilities/Network (~> 6.7)
-    - "GoogleUtilities/NSData+zlib (~> 6.7)"
-    - nanopb (~> 1.30906.0)
-  - FirebaseCore (6.10.3):
-    - FirebaseCoreDiagnostics (~> 1.6)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/Logger (~> 6.7)
-  - FirebaseCoreDiagnostics (1.7.0):
-    - GoogleDataTransport (~> 7.4)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/Logger (~> 6.7)
-    - nanopb (~> 1.30906.0)
-  - FirebaseCrashlytics (4.6.1):
-    - FirebaseCore (~> 6.10)
-    - FirebaseInstallations (~> 1.6)
-    - GoogleDataTransport (~> 7.2)
-    - nanopb (~> 1.30906.0)
+  - FirebaseCore (7.3.0):
+    - FirebaseCoreDiagnostics (~> 7.0)
+    - GoogleUtilities/Environment (~> 7.0)
+    - GoogleUtilities/Logger (~> 7.0)
+  - FirebaseCoreDiagnostics (7.3.0):
+    - GoogleDataTransport (~> 8.0)
+    - GoogleUtilities/Environment (~> 7.0)
+    - GoogleUtilities/Logger (~> 7.0)
+    - nanopb (~> 2.30906.0)
+  - FirebaseCrashlytics (7.3.0):
+    - FirebaseCore (~> 7.0)
+    - FirebaseInstallations (~> 7.0)
+    - GoogleDataTransport (~> 8.0)
+    - nanopb (~> 2.30906.0)
     - PromisesObjC (~> 1.2)
-  - FirebaseInstallations (1.7.0):
-    - FirebaseCore (~> 6.10)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/UserDefaults (~> 6.7)
+  - FirebaseInstallations (7.3.0):
+    - FirebaseCore (~> 7.0)
+    - GoogleUtilities/Environment (~> 7.0)
+    - GoogleUtilities/UserDefaults (~> 7.0)
     - PromisesObjC (~> 1.2)
-  - GoogleAppMeasurement (6.8.3):
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
-    - GoogleUtilities/MethodSwizzler (~> 6.7)
-    - GoogleUtilities/Network (~> 6.7)
-    - "GoogleUtilities/NSData+zlib (~> 6.7)"
-    - nanopb (~> 1.30906.0)
-  - GoogleDataTransport (7.5.1):
-    - nanopb (~> 1.30906.0)
-  - GoogleUtilities/AppDelegateSwizzler (6.7.2):
-    - GoogleUtilities/Environment
-    - GoogleUtilities/Logger
-    - GoogleUtilities/Network
-  - GoogleUtilities/Environment (6.7.2):
+  - GoogleDataTransport (8.1.0):
+    - nanopb (~> 2.30906.0)
+  - GoogleUtilities/Environment (7.1.1):
     - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Logger (6.7.2):
+  - GoogleUtilities/Logger (7.1.1):
     - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (6.7.2):
-    - GoogleUtilities/Logger
-  - GoogleUtilities/Network (6.7.2):
-    - GoogleUtilities/Logger
-    - "GoogleUtilities/NSData+zlib"
-    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (6.7.2)"
-  - GoogleUtilities/Reachability (6.7.2):
-    - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (6.7.2):
+  - GoogleUtilities/UserDefaults (7.1.1):
     - GoogleUtilities/Logger
+  - MCRCDynamicProxy (0.1.0)
+  - MCRCStaticReporter (0.1.0):
+    - FirebaseCrashlytics (~> 7.3)
+    - MCRCDynamicProxy
   - MultiPlatformLibrary (0.1.0)
-  - nanopb (1.30906.0):
-    - nanopb/decode (= 1.30906.0)
-    - nanopb/encode (= 1.30906.0)
-  - nanopb/decode (1.30906.0)
-  - nanopb/encode (1.30906.0)
+  - nanopb (2.30906.0):
+    - nanopb/decode (= 2.30906.0)
+    - nanopb/encode (= 2.30906.0)
+  - nanopb/decode (2.30906.0)
+  - nanopb/encode (2.30906.0)
   - PromisesObjC (1.2.11)
 
 DEPENDENCIES:
-  - Firebase (= 6.33.0)
-  - FirebaseCrashlytics (= 4.6.1)
+  - MCRCDynamicProxy (from `../..`)
+  - MCRCStaticReporter (from `../..`)
   - MultiPlatformLibrary (from `../mpp-library`)
 
 SPEC REPOS:
   trunk:
-    - Firebase
-    - FirebaseAnalytics
     - FirebaseCore
     - FirebaseCoreDiagnostics
     - FirebaseCrashlytics
     - FirebaseInstallations
-    - GoogleAppMeasurement
     - GoogleDataTransport
     - GoogleUtilities
     - nanopb
     - PromisesObjC
 
 EXTERNAL SOURCES:
+  MCRCDynamicProxy:
+    :path: "../.."
+  MCRCStaticReporter:
+    :path: "../.."
   MultiPlatformLibrary:
     :path: "../mpp-library"
 
 SPEC CHECKSUMS:
-  Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
-  FirebaseAnalytics: 5dd088bd2e67bb9d13dbf792d1164ceaf3052193
-  FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
-  FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
-  FirebaseCrashlytics: 5777d3462fb8c3ab9e80a2473bd7d667a2e8411c
-  FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
-  GoogleAppMeasurement: 966e88df9d19c15715137bb2ddaf52373f111436
-  GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
-  GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
+  FirebaseCore: 4d3c72622ce0e2106aaa07bb4b2935ba2c370972
+  FirebaseCoreDiagnostics: d50e11039e5984d92c8a512be2395f13df747350
+  FirebaseCrashlytics: d31325312c92e2cb2f0386d589b9aa44e303d99b
+  FirebaseInstallations: 971df89b48ae5ee4cc2bf6935f3857a525d28550
+  GoogleDataTransport: 116c84c4bdeb76be2a7a46de51244368f9794eab
+  GoogleUtilities: 3dc4ff0d5e4840e2fa8eef0889620e8c33d4218c
+  MCRCDynamicProxy: 973f00896869b2a42b627e25e1273637144e0458
+  MCRCStaticReporter: cd86088a80da448449d07eb8d1f7c63420570ca2
   MultiPlatformLibrary: 176fb8ade516666cd47e93de1b71ba0441a541bb
-  nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
+  nanopb: 1bf24dd71191072e120b83dd02d08f3da0d65e53
   PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f
 
-PODFILE CHECKSUM: 2970c0b3f8e435e7af3f0ed0ce420e36de247e27
+PODFILE CHECKSUM: 9c08445bae18c42fcf489e55c88ebb7626bc02b8
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.10.0
diff --git a/sample/mpp-library/build.gradle.kts b/sample/mpp-library/build.gradle.kts
@@ -25,6 +25,5 @@ framework {
 cocoaPods {
     podsProject = file("../ios-app/Pods/Pods.xcodeproj")
 
-    pod("GoogleUtilities", onlyLink = false)
-    pod("FirebaseCrashlytics", onlyLink = true)
+    pod("MCRCDynamicProxy", onlyLink = true)
 }

Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,5 @@ publishing {`
`35`	`35`	`cocoaPods {`
`36`	`36`	`podsProject = file("../sample/ios-app/Pods/Pods.xcodeproj")`
`37`	`37`
`38`		`- pod("FirebaseCrashlytics", onlyLink = false)`
	`38`	`+ pod("MCRCDynamicProxy")`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,5 @@ framework {`
`25`	`25`	`cocoaPods {`
`26`	`26`	`podsProject = file("../ios-app/Pods/Pods.xcodeproj")`
`27`	`27`
`28`		`- pod("GoogleUtilities", onlyLink = false)`
`29`		`- pod("FirebaseCrashlytics", onlyLink = true)`
	`28`	`+ pod("MCRCDynamicProxy", onlyLink = true)`
`30`	`29`	`}`