Merge pull request #27 from icerockdev/develop

Alex009 · web-flow · commit 4849cd2b0ebf · 2022-12-18T16:50:09.000+06:00
Release 0.4.0
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,3 @@ build
 Pods
 xcuserdata
 local.properties
-local.gradle
diff --git a/MCRCDynamicProxy.podspec b/MCRCDynamicProxy.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'MCRCDynamicProxy'
-    spec.version                  = '0.1.0'
+    spec.version                  = '0.4.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'
diff --git a/MCRCStaticReporter.podspec b/MCRCStaticReporter.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'MCRCStaticReporter'
-    spec.version                  = '0.1.0'
+    spec.version                  = '0.4.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'
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ This is a Kotlin MultiPlatform library that provides reporting fatal and non-fat
 
 ## Requirements
 - Gradle version 6.8+
-- Android API 16+
+- Android API 19+
 - iOS version 11.0+
 
 ## Installation
@@ -36,8 +36,8 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainImplementation("dev.icerock.moko:crash-reporting-crashlytics:0.3.0") // for CrashlyticsLogger
-    commonMainImplementation("dev.icerock.moko:crash-reporting-napier:0.3.0") // for CrashReportingAntilog
+    commonMainImplementation("dev.icerock.moko:crash-reporting-crashlytics:0.4.0") // for CrashlyticsLogger
+    commonMainImplementation("dev.icerock.moko:crash-reporting-napier:0.4.0") // for CrashReportingAntilog
 }
 ```
 For CrashlyticsLogger need to add FirebaseCrashlytics cocoapod
@@ -52,8 +52,8 @@ cocoaPods {
 ```
 project Podfile
 ```ruby
-pod 'MCRCDynamicProxy', :git => 'https://github.com/icerockdev/moko-crash-reporting.git', :tag => 'release/0.3.0'
-pod 'MCRCStaticReporter', :git => 'https://github.com/icerockdev/moko-crash-reporting.git', :tag => 'release/0.3.0'
+pod 'MCRCDynamicProxy', :git => 'https://github.com/icerockdev/moko-crash-reporting.git', :tag => 'release/0.4.0'
+pod 'MCRCStaticReporter', :git => 'https://github.com/icerockdev/moko-crash-reporting.git', :tag => 'release/0.4.0'
 ```
 
 On iOS side add to `AppDelegate`:
diff --git a/crash-reporting-crashlytics/build.gradle.kts b/crash-reporting-crashlytics/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
     commonMainApi(projects.crashReportingCore)
 
     androidMainImplementation(libs.appCompat)
-    androidMainApi(libs.firebaseCore)
+    androidMainApi(libs.firebaseAnalytics)
     androidMainApi(libs.firebaseCrashlytics)
 }
 
diff --git a/crash-reporting-crashlytics/src/androidMain/kotlin/dev/icerock/moko/crashreporting/crashlytics/CrashlyticsLogger.kt b/crash-reporting-crashlytics/src/androidMain/kotlin/dev/icerock/moko/crashreporting/crashlytics/CrashlyticsLogger.kt
@@ -18,7 +18,7 @@ actual class CrashlyticsLogger actual constructor() : ExceptionLogger {
     }
 
     override fun setCustomValue(value: String, forKey: String) {
-        FirebaseCrashlytics.getInstance().setCustomKey(value, forKey)
+        FirebaseCrashlytics.getInstance().setCustomKey(forKey, value)
     }
 
     override fun setUserId(userId: String) {
diff --git a/gradle.properties b/gradle.properties
@@ -10,9 +10,9 @@ kotlin.mpp.enableCInteropCommonization=true
 
 android.useAndroidX=true
 
-moko.android.targetSdk=30
-moko.android.compileSdk=30
-moko.android.minSdk=16
+moko.android.targetSdk=33
+moko.android.compileSdk=33
+moko.android.minSdk=19
 
 moko.publish.name=MOKO crash reporting
 moko.publish.description=Fatal and Non-Fatal reporting to Crashlytics for Kotlin Multiplatform Mobile
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,23 +1,23 @@
 [versions]
-kotlinVersion = "1.6.10"
+kotlinVersion = "1.7.20"
 
 # android
 androidAppCompatVersion = "1.2.0"
-googleServicesVersion = "4.3.8"
-firebaseCoreVersion = "17.4.3"
-firebaseCrashlyticsVersion = "17.1.0"
+googleServicesVersion = "4.3.14"
+firebaseAnalyticsVersion = "21.1.1"
+firebaseCrashlyticsVersion = "18.2.3"
 
 # kotlin multiplatform
-napierVersion = "2.4.0"
+napierVersion = "2.6.1"
 
 # moko
-mokoCrashReportingVersion = "0.3.0"
+mokoCrashReportingVersion = "0.4.0"
 
 
 [libraries]
 # android
 appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }
-firebaseCore = { module = "com.google.firebase:firebase-core", version.ref = "firebaseCoreVersion" }
+firebaseAnalytics = { module = "com.google.firebase:firebase-analytics", version.ref = "firebaseAnalyticsVersion" }
 firebaseCrashlytics = { module = "com.google.firebase:firebase-crashlytics", version.ref = "firebaseCrashlyticsVersion" }
 googleServices = { module = "com.google.gms:google-services", version.ref = "googleServicesVersion" }
 
@@ -31,8 +31,8 @@ mokoCrashReportingNapier = { module = "dev.icerock.moko:crash-reporting-napier",
 
 # gradle plugins
 kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
-androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "7.0.4" }
-googleServicesGradlePlugin = { module = "com.google.gms:google-services", version = "4.3.8" }
-firebaseGradlePlugin = { module = "com.google.firebase:firebase-crashlytics-gradle", version = "2.2.0" }
-mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.1.0" }
-mobileMultiplatformGradlePlugin = { module = "dev.icerock:mobile-multiplatform", version = "0.14.0" }
+androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "7.2.2" }
+googleServicesGradlePlugin = { module = "com.google.gms:google-services", version = "4.3.14" }
+firebaseGradlePlugin = { module = "com.google.firebase:firebase-crashlytics-gradle", version = "2.9.2" }
+mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.2.0" }
+mobileMultiplatformGradlePlugin = { module = "dev.icerock:mobile-multiplatform", version = "0.14.2" }
diff --git a/sample/android-app/build.gradle.kts b/sample/android-app/build.gradle.kts
@@ -27,7 +27,7 @@ android {
 dependencies {
     implementation(libs.googleServices)
     implementation(libs.appCompat)
-    implementation(libs.firebaseCore)
+    implementation(libs.firebaseAnalytics)
     implementation(libs.firebaseCrashlytics)
     implementation(projects.sample.mppLibrary)
 }
diff --git a/sample/android-app/src/main/AndroidManifest.xml b/sample/android-app/src/main/AndroidManifest.xml
@@ -9,9 +9,11 @@
         android:label="moko-crash-report test app"
         android:theme="@style/Theme.AppCompat.DayNight"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="GoogleAppIndexingWarning"
+        tools:targetApi="m">
 
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/sample/android-app/src/main/java/com/icerockdev/MainActivity.kt b/sample/android-app/src/main/java/com/icerockdev/MainActivity.kt
@@ -11,7 +11,7 @@ import com.icerockdev.library.Testing
 
 class MainActivity : AppCompatActivity() {
 
-    lateinit var testing: Testing
+    private lateinit var testing: Testing
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/sample/ios-app/Podfile.lock b/sample/ios-app/Podfile.lock
@@ -81,4 +81,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 9c08445bae18c42fcf489e55c88ebb7626bc02b8
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3
diff --git a/sample/mpp-library/build.gradle.kts b/sample/mpp-library/build.gradle.kts
@@ -29,4 +29,10 @@ cocoaPods {
     podsProject = file("../ios-app/Pods/Pods.xcodeproj")
 
     pod("MCRCDynamicProxy", onlyLink = true)
-}
+}
+
+kotlin.targets.withType<org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget>().configureEach {
+    binaries.withType<org.jetbrains.kotlin.gradle.plugin.mpp.Framework>().configureEach {
+        embedBitcode = org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.DISABLE
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ dependencies {`
`14`	`14`	`commonMainApi(projects.crashReportingCore)`
`15`	`15`
`16`	`16`	`androidMainImplementation(libs.appCompat)`
`17`		`- androidMainApi(libs.firebaseCore)`
	`17`	`+ androidMainApi(libs.firebaseAnalytics)`
`18`	`18`	`androidMainApi(libs.firebaseCrashlytics)`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ actual class CrashlyticsLogger actual constructor() : ExceptionLogger {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`override fun setCustomValue(value: String, forKey: String) {`
`21`		`- FirebaseCrashlytics.getInstance().setCustomKey(value, forKey)`
	`21`	`+ FirebaseCrashlytics.getInstance().setCustomKey(forKey, value)`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`override fun setUserId(userId: String) {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ android {`
`27`	`27`	`dependencies {`
`28`	`28`	`implementation(libs.googleServices)`
`29`	`29`	`implementation(libs.appCompat)`
`30`		`- implementation(libs.firebaseCore)`
	`30`	`+ implementation(libs.firebaseAnalytics)`
`31`	`31`	`implementation(libs.firebaseCrashlytics)`
`32`	`32`	`implementation(projects.sample.mppLibrary)`
`33`	`33`	`}`