K2 compatibility

.gitignore

@@ -15,6 +15,7 @@ out/
 
 # Gradle files
 .gradle/
+.kotlin/
 build/
 
 # Local configuration file (sdk path, etc)

bugsnag-ios-link/build.gradle.kts

@@ -13,7 +13,6 @@
 
 plugins {
     `kotlin-dsl`
-    kotlin("jvm")
     id("java-gradle-plugin")
     id("com.vanniktech.maven.publish.base")
     id("com.gradle.plugin-publish")

bugsnag-ios-link/src/main/kotlin/co/touchlab/crashkios/BugsnagLinkPlugin.kt

@@ -64,7 +64,9 @@ private fun KotlinMultiplatformExtension.crashLinkerConfig(linkerOpts: String) {
         val hasDynamicFrameworks = binaries.any { it is Framework && !it.isStatic }
 
         if (hasDynamicFrameworks) {
-            compilations.getByName("main").kotlinOptions.freeCompilerArgs += listOf("-linker-options", linkerOpts)
+            compilations.getByName("main").compileTaskProvider.configure {
+                compilerOptions.freeCompilerArgs.addAll("-linker-options", linkerOpts)
+            }
         }
     }
 }

bugsnag/build.gradle.kts

@@ -11,7 +11,6 @@
  * the License.
  */
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("com.android.library")
@@ -106,7 +105,3 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 }
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
-}

bugsnag/src/androidMain/kotlin/co/touchlab/crashkios/bugsnag/BugsnagCallsActual.kt

@@ -3,19 +3,19 @@ package co.touchlab.crashkios.bugsnag
 import com.bugsnag.android.Bugsnag
 
 actual class BugsnagCallsActual : BugsnagCalls {
-    override fun logMessage(message: String) {
+    actual override fun logMessage(message: String) {
         Bugsnag.leaveBreadcrumb(message)
     }
 
-    override fun sendHandledException(throwable: Throwable) {
+    actual override fun sendHandledException(throwable: Throwable) {
         Bugsnag.notify(throwable)
     }
 
-    override fun sendFatalException(throwable: Throwable) {
+    actual override fun sendFatalException(throwable: Throwable) {
         Bugsnag.notify(throwable)
     }
 
-    override fun setCustomValue(section: String, key: String, value: Any) {
+    actual override fun setCustomValue(section: String, key: String, value: Any) {
         Bugsnag.addMetadata(section, key, value)
     }
 }

bugsnag/src/appleMain/kotlin/co/touchlab/crashkios/bugsnag/BugsnagCallsActual.kt

@@ -6,19 +6,19 @@ import kotlinx.cinterop.ExperimentalForeignApi
 
 @OptIn(ExperimentalForeignApi::class)
 actual class BugsnagCallsActual : BugsnagCalls {
-    override fun logMessage(message: String) {
+    actual override fun logMessage(message: String) {
         Bugsnag.leaveBreadcrumbWithMessage(message)
     }
 
-    override fun sendHandledException(throwable: Throwable) {
+    actual override fun sendHandledException(throwable: Throwable) {
         sendException(throwable, true)
     }
 
-    override fun sendFatalException(throwable: Throwable) {
+    actual override fun sendFatalException(throwable: Throwable) {
         sendException(throwable, false)
     }
 
-    override fun setCustomValue(section: String, key: String, value: Any) {
+    actual override fun setCustomValue(section: String, key: String, value: Any) {
         Bugsnag.addMetadata(value, key, section)
     }
 

bugsnag/src/commonMain/kotlin/co/touchlab/crashkios/bugsnag/BugsnagCalls.kt

@@ -10,4 +10,9 @@ interface BugsnagCalls {
     fun setCustomValue(section: String, key: String, value: Any)
 }
 
-expect class BugsnagCallsActual() : BugsnagCalls
+expect class BugsnagCallsActual() : BugsnagCalls {
+    override fun logMessage(message: String)
+    override fun sendHandledException(throwable: Throwable)
+    override fun sendFatalException(throwable: Throwable)
+    override fun setCustomValue(section: String, key: String, value: Any)
+}

build.gradle.kts

@@ -2,7 +2,6 @@ plugins {
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.maven.publish) apply false
     alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.touchlab.docusaurus.template)
     alias(libs.plugins.gradle.publish) apply false
     id("org.jlleitschuh.gradle.ktlint") version "12.2.0" apply false
 }
@@ -31,4 +30,4 @@ subprojects {
             dependsOn(tasks.getByName("ktlintCheck"))
         }
     }
-}
+}

core/build.gradle.kts

@@ -11,7 +11,6 @@
  * the License.
  */
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("com.android.library")
@@ -79,8 +78,4 @@ android {
     }
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
-}
-
 apply(plugin = "com.vanniktech.maven.publish")

core/src/appleMain/kotlin/co/touchlab/crashkios/core/ThreadSafeVar.kt

@@ -1,20 +1,14 @@
 package co.touchlab.crashkios.core
 
 import kotlin.concurrent.AtomicReference
-import kotlin.experimental.ExperimentalNativeApi
-import kotlin.native.concurrent.freeze
 import kotlin.reflect.KProperty
 
-@OptIn(FreezingIsDeprecated::class, ExperimentalNativeApi::class)
 actual class ThreadSafeVar<T> actual constructor(target: T) {
     private val atom = AtomicReference(target)
 
     actual operator fun getValue(thisRef: Any?, property: KProperty<*>): T = atom.value
 
     actual operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
-        if (Platform.memoryModel == MemoryModel.STRICT) {
-            value.freeze()
-        }
         atom.value = value
     }
 }

crashlytics-ios-link/build.gradle.kts

@@ -12,7 +12,6 @@
  */
 plugins {
     `kotlin-dsl`
-    kotlin("jvm")
     id("java-gradle-plugin")
     id("com.vanniktech.maven.publish.base")
     id("com.gradle.plugin-publish")

crashlytics-ios-link/src/main/kotlin/co/touchlab/crashkios/CrashlyticsLinkPlugin.kt

@@ -59,7 +59,9 @@ private fun KotlinMultiplatformExtension.crashLinkerConfig(linkerOpts: String) {
         val hasDynamicFrameworks = binaries.any { it is Framework && !it.isStatic }
 
         if (hasDynamicFrameworks) {
-            compilations.getByName("main").kotlinOptions.freeCompilerArgs += listOf("-linker-options", linkerOpts)
+            compilations.getByName("main").compileTaskProvider.configure {
+                compilerOptions.freeCompilerArgs.addAll("-linker-options", linkerOpts)
+            }
         }
     }
 }

crashlytics/build.gradle.kts

@@ -11,7 +11,6 @@
  * the License.
  */
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("com.android.library")
@@ -104,7 +103,3 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 }
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
-}

crashlytics/src/androidMain/kotlin/co/touchlab/crashkios/crashlytics/CrashlyticsCallsActual.kt

@@ -3,19 +3,19 @@ package co.touchlab.crashkios.crashlytics
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 
 actual class CrashlyticsCallsActual : CrashlyticsCalls {
-    override fun logMessage(message: String) {
+    actual override fun logMessage(message: String) {
         FirebaseCrashlytics.getInstance().log(message)
     }
 
-    override fun sendHandledException(throwable: Throwable) {
+    actual override fun sendHandledException(throwable: Throwable) {
         FirebaseCrashlytics.getInstance().recordException(throwable)
     }
 
-    override fun sendFatalException(throwable: Throwable) {
+    actual override fun sendFatalException(throwable: Throwable) {
         FirebaseCrashlytics.getInstance().recordException(throwable)
     }
 
-    override fun setCustomValue(key: String, value: Any) {
+    actual override fun setCustomValue(key: String, value: Any) {
         when (value) {
             is Boolean -> FirebaseCrashlytics.getInstance().setCustomKey(key, value)
             is Double -> FirebaseCrashlytics.getInstance().setCustomKey(key, value)
@@ -29,7 +29,7 @@ actual class CrashlyticsCallsActual : CrashlyticsCalls {
         }
     }
 
-    override fun setUserId(identifier: String) {
+    actual override fun setUserId(identifier: String) {
         FirebaseCrashlytics.getInstance().setUserId(identifier)
     }
 }

crashlytics/src/appleMain/kotlin/co/touchlab/crashkios/crashlytics/CrashlyticsCallsActual.kt

@@ -12,12 +12,12 @@ actual class CrashlyticsCallsActual : CrashlyticsCalls {
         FIRCheckLinkDependencies()
     }
 
-    override fun logMessage(message: String) {
+    actual override fun logMessage(message: String) {
         FIRCrashlyticsLog(message)
     }
 
     @OptIn(UnsafeNumber::class)
-    override fun sendHandledException(throwable: Throwable) {
+    actual override fun sendHandledException(throwable: Throwable) {
         val exceptionClassName = throwable::class.qualifiedName ?: throwable::class.simpleName ?: "kotlin.Throwable"
         FIRCrashlyticsRecordHandledException(
             exceptionClassName,
@@ -28,18 +28,18 @@ actual class CrashlyticsCallsActual : CrashlyticsCalls {
         )
     }
 
-    override fun sendFatalException(throwable: Throwable) {
+    actual override fun sendFatalException(throwable: Throwable) {
         val exception = throwable.asNSException(true)
         // The recorded exception is persisted, so we can safely terminate afterwards.
         // https://github.com/firebase/firebase-ios-sdk/blob/82f163bd86566f83c5d7572a1c2c0024a04eb4dc/Crashlytics/Crashlytics/Handlers/FIRCLSException.mm#L227
         tryFIRCLSExceptionRecordNSException(exception)
     }
 
-    override fun setCustomValue(key: String, value: Any) {
+    actual override fun setCustomValue(key: String, value: Any) {
         FIRCrashlyticsSetCustomValue(key, value)
     }
 
-    override fun setUserId(identifier: String) {
+    actual override fun setUserId(identifier: String) {
         FIRCrashlyticsSetUserID(identifier)
     }
 }

crashlytics/src/commonMain/kotlin/co/touchlab/crashkios/crashlytics/CrashlyticsCalls.kt

@@ -8,4 +8,10 @@ interface CrashlyticsCalls {
     fun setUserId(identifier: String)
 }
 
-expect class CrashlyticsCallsActual() : CrashlyticsCalls
+expect class CrashlyticsCallsActual() : CrashlyticsCalls {
+    override fun logMessage(message: String)
+    override fun sendHandledException(throwable: Throwable)
+    override fun sendFatalException(throwable: Throwable)
+    override fun setCustomValue(key: String, value: Any)
+    override fun setUserId(identifier: String)
+}

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
 ## SDK Versions
 minSdk = "21"
-targetSdk = "34"
-compileSdk = "34"
+targetSdk = "35"
+compileSdk = "35"
 
 # Dependencies
-kotlin = "1.9.24"
-android-gradle-plugin = "8.2.1"
+kotlin = "2.2.10"
+android-gradle-plugin = "8.10.0"
 mavenPublish = "0.29.0"
 touchlab-docusaurus-template = "0.1.10"
 gradlePublish = "1.2.1"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -1,8 +1,8 @@
 include(":core")
 include(":bugsnag")
-include(":bugsnag-ios-link")
 include(":crashlytics")
-include(":crashlytics-ios-link")
+include("bugsnag-ios-link")
+include("crashlytics-ios-link")
 
 pluginManagement {
     repositories {
@@ -14,5 +14,5 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+    id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
 }