From fe6d462a34ec79bb35ca55271b9c7cfffe2d49f4 Mon Sep 17 00:00:00 2001
From: Ting-Yuan Huang <laszio@google.com>
Date: Tue, 19 Jul 2022 10:32:57 -0700
Subject: [PATCH] UPDATE_KOTLIN_VERSION: 1.8.0-dev-446

---
 .../com/google/devtools/ksp/KotlinSymbolProcessingExtension.kt | 2 +-
 .../com/google/devtools/ksp/KotlinSymbolProcessingPlugin.kt    | 3 +++
 .../kotlin/com/google/devtools/ksp/gradle/KspConfigurations.kt | 2 +-
 gradle.properties                                              | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingExtension.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingExtension.kt
index f7f23a5aef..bd0dc8d4d2 100644
--- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingExtension.kt
+++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingExtension.kt
@@ -42,7 +42,6 @@ import com.intellij.psi.PsiJavaFile
 import com.intellij.psi.PsiManager
 import org.jetbrains.kotlin.analyzer.AnalysisResult
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
-import org.jetbrains.kotlin.cli.jvm.plugins.ServiceLoaderLite
 import org.jetbrains.kotlin.container.ComponentProvider
 import org.jetbrains.kotlin.context.ProjectContext
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
@@ -54,6 +53,7 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.BindingTrace
 import org.jetbrains.kotlin.resolve.extensions.AnalysisHandlerExtension
+import org.jetbrains.kotlin.util.ServiceLoaderLite
 import java.io.File
 import java.io.PrintWriter
 import java.io.StringWriter
diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingPlugin.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingPlugin.kt
index faf1ff1e5e..d170ea8f7d 100644
--- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingPlugin.kt
+++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingPlugin.kt
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption
 import org.jetbrains.kotlin.compiler.plugin.CliOptionProcessingException
 import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
 import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
+import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.CompilerConfigurationKey
@@ -38,6 +39,7 @@ import org.jetbrains.kotlin.resolve.extensions.AnalysisHandlerExtension
 
 private val KSP_OPTIONS = CompilerConfigurationKey.create<KspOptions.Builder>("Ksp options")
 
+@ExperimentalCompilerApi
 class KotlinSymbolProcessingCommandLineProcessor : CommandLineProcessor {
     override val pluginId = "com.google.devtools.ksp.symbol-processing"
 
@@ -59,6 +61,7 @@ class KotlinSymbolProcessingCommandLineProcessor : CommandLineProcessor {
 //
 // Third party libraries:
 //   https://github.com/tschuchortdev/kotlin-compile-testing
+@ExperimentalCompilerApi
 class KotlinSymbolProcessingComponentRegistrar : ComponentRegistrar {
     override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
         val contentRoots = configuration[CLIConfigurationKeys.CONTENT_ROOTS] ?: emptyList()
diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspConfigurations.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspConfigurations.kt
index b87983bc1e..bf16812d6c 100644
--- a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspConfigurations.kt
+++ b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspConfigurations.kt
@@ -86,7 +86,7 @@ class KspConfigurations(private val project: Project) {
 
     private fun decorateKotlinProject(kotlin: KotlinProjectExtension, project: Project) {
         when (kotlin) {
-            is KotlinSingleTargetExtension -> decorateKotlinTarget(kotlin.target)
+            is KotlinSingleTargetExtension<*> -> decorateKotlinTarget(kotlin.target)
             is KotlinMultiplatformExtension -> {
                 kotlin.targets.configureEach(::decorateKotlinTarget)
 
diff --git a/gradle.properties b/gradle.properties
index 723a19b168..6ffdefed6b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 # Copied from kotlinc
 org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx2200m -Dfile.encoding=UTF-8
 
-kotlinBaseVersion=1.7.20-dev-2726
+kotlinBaseVersion=1.8.0-dev-446
 agpBaseVersion=7.0.0
 intellijVersion=203.8084.24
 junitVersion=4.12