From 3620f623dde780cdb2f6addd123bd3d2cd83e49b Mon Sep 17 00:00:00 2001
From: Zac Sweers <pandanomic@gmail.com>
Date: Sat, 22 Jun 2024 11:51:45 -0400
Subject: [PATCH] Prep for Kotlin 2.0.20

---
 gradle/libs.versions.toml                                     | 4 ++--
 .../zacsweers/moshix/ir/compiler/MoshiComponentRegistrar.kt   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b877a54e..ed61d9fa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,10 +19,10 @@ gjf = "1.17.0"
 incap = "1.0.0"
 jdk = "21"
 jvmTarget = "11"
-kotlin = "2.0.0"
+kotlin = "2.0.20-Beta1"
 kotlinCompileTesting = "0.5.0"
 kotlinpoet = "1.17.0"
-ksp = "2.0.0-1.0.22"
+ksp = "2.0.20-Beta1-1.0.22"
 ktfmt = "0.51"
 moshi = "1.15.1"
 okhttp = "4.12.0"
diff --git a/moshi-ir/moshi-compiler-plugin/src/main/kotlin/dev/zacsweers/moshix/ir/compiler/MoshiComponentRegistrar.kt b/moshi-ir/moshi-compiler-plugin/src/main/kotlin/dev/zacsweers/moshix/ir/compiler/MoshiComponentRegistrar.kt
index 26635b64..2a9adaa9 100644
--- a/moshi-ir/moshi-compiler-plugin/src/main/kotlin/dev/zacsweers/moshix/ir/compiler/MoshiComponentRegistrar.kt
+++ b/moshi-ir/moshi-compiler-plugin/src/main/kotlin/dev/zacsweers/moshix/ir/compiler/MoshiComponentRegistrar.kt
@@ -17,9 +17,9 @@ package dev.zacsweers.moshix.ir.compiler
 
 import com.google.auto.service.AutoService
 import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
-import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
+import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.name.ClassId
 
@@ -34,7 +34,7 @@ public class MoshiComponentRegistrar : CompilerPluginRegistrar() {
     val enableSealed = configuration[KEY_ENABLE_SEALED] ?: false
 
     val messageCollector =
-      configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE)
+      configuration.get(CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE)
     val fqGeneratedAnnotation = configuration[KEY_GENERATED_ANNOTATION]?.let(ClassId::fromString)
 
     IrGenerationExtension.registerExtension(