From cc268eeec3fa86784f94e19b47aa51ae7cc591e9 Mon Sep 17 00:00:00 2001
From: Ting-Yuan Huang <laszio@google.com>
Date: Mon, 6 Nov 2023 22:26:33 -0800
Subject: [PATCH] UPDATE_KOTLIN_VERSION: 2.0.0-dev-6573

(cherry picked from commit 36751997ffe0ece0efd347582a7595d8f337b9c8)
---
 build.gradle.kts                                       |  4 ++++
 .../main/kotlin/com/google/devtools/ksp/Incremental.kt | 10 +++++-----
 gradle.properties                                      |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 53a737c69a..43ba936dc5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -121,4 +121,8 @@ subprojects {
             }
         )
     }
+
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+        compilerOptions.freeCompilerArgs.add("-Xskip-prerelease-check")
+    }
 }
diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/Incremental.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/Incremental.kt
index fb20321428..f7cc473348 100644
--- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/Incremental.kt
+++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/Incremental.kt
@@ -411,7 +411,7 @@ class IncrementalContext(
 
         logSourceToOutputs(outputs, sourceToOutputs)
 
-        sourceToOutputsMap.flush(false)
+        sourceToOutputsMap.flush()
     }
 
     private fun updateOutputs(outputs: Set<File>, cleanOutputs: Collection<File>) {
@@ -474,15 +474,15 @@ class IncrementalContext(
             update(symbolsMap, updatedSymbols)
             remove(symbolsMap, removed)
         } else {
-            symbolsMap.clean()
+            symbolsMap.clear()
             update(symbolsMap, updatedSymbols)
 
-            sealedMap.clean()
+            sealedMap.clear()
             update(sealedMap, updatedSealed)
         }
-        symbolsMap.flush(false)
+        symbolsMap.flush()
         symbolsMap.close()
-        sealedMap.flush(false)
+        sealedMap.flush()
         sealedMap.close()
     }
 
diff --git a/gradle.properties b/gradle.properties
index 702717f109..465631c58d 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=2.0.0-dev-4562
+kotlinBaseVersion=2.0.0-dev-6573
 agpBaseVersion=7.0.0
 intellijVersion=213.7172.25
 junitVersion=4.13.1