Revert "UPDATE_KOTLIN_VERSION: 2.0.0-dev-6573"

This reverts commit cc268ee.
google · Dec 14, 2023 · 0858a43 · 0858a43
1 parent cd83901
commit 0858a43
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -121,8 +121,4 @@ 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
@@ -411,7 +411,7 @@ class IncrementalContext(
 
         logSourceToOutputs(outputs, sourceToOutputs)
 
-        sourceToOutputsMap.flush()
+        sourceToOutputsMap.flush(false)
     }
 
     private fun updateOutputs(outputs: Set<File>, cleanOutputs: Collection<File>) {
@@ -474,15 +474,15 @@ class IncrementalContext(
             update(symbolsMap, updatedSymbols)
             remove(symbolsMap, removed)
         } else {
-            symbolsMap.clear()
+            symbolsMap.clean()
             update(symbolsMap, updatedSymbols)
 
-            sealedMap.clear()
+            sealedMap.clean()
             update(sealedMap, updatedSealed)
         }
-        symbolsMap.flush()
+        symbolsMap.flush(false)
         symbolsMap.close()
-        sealedMap.flush()
+        sealedMap.flush(false)
         sealedMap.close()
     }
 

diff --git 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-6573
+kotlinBaseVersion=2.0.0-dev-4562
 agpBaseVersion=7.0.0
 intellijVersion=213.7172.25
 junitVersion=4.13.1
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,8 +121,4 @@ subprojects { @@
                 }
             )
         }
-        tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-            compilerOptions.freeCompilerArgs.add("-Xskip-prerelease-check")
-        }
     }