fix(compiler): Fix compatibility with Kotlin 2.3.0 (#1046)

* fix(compiler): Fix compatibility with Kotlin 2.3.0

* Changelog

Author: romtsn

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixes
+
+- Fix compatibility with Kotlin 2.3.0 ([#1046](https://github.com/getsentry/sentry-android-gradle-plugin/pull/1046))
+
 ### Dependencies
 
 - Bump CLI from v3.0.0 to v3.0.1 ([#1043](https://github.com/getsentry/sentry-android-gradle-plugin/pull/1043))

sentry-kotlin-compiler-plugin/src/main/kotlin/io/sentry/Const.kt

@@ -0,0 +1,3 @@
+package io.sentry
+
+public const val PLUGIN_ID = "io.sentry.kotlin.compiler"

sentry-kotlin-compiler-plugin/src/main/kotlin/io/sentry/SentryKotlinCompilerPlugin.kt

@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.config.messageCollector
 
 @OptIn(ExperimentalCompilerApi::class)
 @AutoService(CompilerPluginRegistrar::class)
@@ -19,10 +20,9 @@ class SentryKotlinCompilerPlugin : CompilerPluginRegistrar() {
   override val supportsK2: Boolean
     get() = true
 
-  override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
-    val messageCollector =
-      configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE)
+  val pluginId: String = PLUGIN_ID
 
+  override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
     val versionString = KotlinCompilerVersion.getVersion()
     val version =
       if (versionString != null) {
@@ -33,13 +33,17 @@ class SentryKotlinCompilerPlugin : CompilerPluginRegistrar() {
 
     val extension: IrGenerationExtension =
       if (version >= SimpleSemVer(2, 2, 0)) {
+        val messageCollector = configuration.messageCollector
         JetpackComposeTracingIrExtension22(messageCollector)
       } else if (version >= SimpleSemVer(2, 1, 20)) {
+        val messageCollector = configuration.messageCollector
         // 2.1.20 removed some optional parameters, causing API incompatibility
         // e.g. java.lang.NoSuchMethodError
         // see https://github.com/JetBrains/kotlin/commit/dd508452c414a0ee8082aa6f76d664271cb38f2f
         JetpackComposeTracingIrExtension21(messageCollector)
       } else {
+        val messageCollector =
+          configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE)
         JetpackComposeTracingIrExtension19(messageCollector)
       }
 

sentry-kotlin-compiler-plugin/src/main/kotlin/io/sentry/SentryKotlinCompilerPluginCommandLineProcessor.kt

@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 @AutoService(CommandLineProcessor::class)
 class SentryKotlinCompilerPluginCommandLineProcessor : CommandLineProcessor {
 
-  override val pluginId: String = "io.sentry.kotlin.compiler"
+  override val pluginId: String = PLUGIN_ID
 
   override val pluginOptions: Collection<CliOption> = emptyList()
 }