UPDATE_KOTLIN_VERSION: 2.0.0-dev-6573

build.gradle.kts

@@ -121,4 +121,8 @@ subprojects {
             }
         )
     }
+
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+        compilerOptions.freeCompilerArgs.add("-Xskip-prerelease-check")
+    }
 }

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()
     }
 

gradle.properties

@@ -1,15 +1,15 @@
 # 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
 junit5Version=5.8.2
 junitPlatformVersion=1.8.2
 googleTruthVersion=1.1
 
-aaKotlinBaseVersion=2.0.0-dev-4562
+aaKotlinBaseVersion=2.0.0-dev-6573
 aaIntellijVersion=213.7172.25
 aaGuavaVersion=29.0-jre
 aaAsmVersion=9.0

kotlin-analysis-api/build.gradle.kts

@@ -48,7 +48,10 @@ dependencies {
         "org.jetbrains.kotlin:symbol-light-classes-for-ide",
         "org.jetbrains.kotlin:analysis-api-standalone-for-ide",
         "org.jetbrains.kotlin:high-level-api-impl-base-for-ide",
-        "org.jetbrains.kotlin:kotlin-compiler-for-ide",
+        "org.jetbrains.kotlin:kotlin-compiler-common-for-ide",
+        "org.jetbrains.kotlin:kotlin-compiler-fir-for-ide",
+        "org.jetbrains.kotlin:kotlin-compiler-fe10-for-ide",
+        "org.jetbrains.kotlin:kotlin-compiler-ir-for-ide",
     ).forEach {
         implementation("$it:$aaKotlinBaseVersion") { isTransitive = false }
     }

kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalKotlinDeclarationProvider.kt

@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.psi.KtScript
 import org.jetbrains.kotlin.psi.KtTypeAlias
 
 class IncrementalKotlinDeclarationProvider(var del: KotlinDeclarationProvider) : KotlinDeclarationProvider() {
-    override fun computePackageSetWithTopLevelCallableDeclarations(): Set<String> {
+    override fun computePackageSetWithTopLevelCallableDeclarations(): Set<String>? {
         return del.computePackageSetWithTopLevelCallableDeclarations()
     }
 

kotlin-analysis-api/testData/parent.kt

@@ -132,6 +132,8 @@
 // parent of <set-?>: b.setter()
 // parent of b.setter(): b
 // parent of b: topClass
+// parent of topClass: synthetic constructor for topClass
+// parent of synthetic constructor for topClass: topClass
 // parent of Any: InnerClass
 // parent of Any?: P
 // parent of P: InnerClass
@@ -145,14 +147,14 @@
 // parent of InnerClass<*>: synthetic constructor for InnerClass
 // parent of Any?: P
 // parent of synthetic constructor for InnerClass: InnerClass
-// parent of topClass: synthetic constructor for topClass
-// parent of synthetic constructor for topClass: topClass
 // parent of CMYK: CMYK
 // parent of CMYK: INVARIANT CMYK
 // parent of INVARIANT CMYK: Enum
 // parent of Enum: Enum<CMYK>
 // parent of Enum<CMYK>: CMYK
 // parent of CMYK: File: a.kt
+// parent of CMYK: synthetic constructor for CMYK
+// parent of synthetic constructor for CMYK: CMYK
 // parent of C: CMYK
 // parent of M: CMYK
 // parent of Y: CMYK
@@ -167,14 +169,15 @@
 // parent of EnumEntries<CMYK>: entries.getter()
 // parent of entries.getter(): entries
 // parent of entries: CMYK
-// parent of CMYK: synthetic constructor for CMYK
-// parent of synthetic constructor for CMYK: CMYK
 // parent of YUV: YUV
 // parent of YUV: INVARIANT YUV
 // parent of INVARIANT YUV: Enum
 // parent of Enum: Enum<YUV>
 // parent of Enum<YUV>: YUV
 // parent of YUV: null
+// parent of YUV: YUV
+// parent of YUV: <init>
+// parent of <init>: YUV
 // parent of Y: YUV
 // parent of U: YUV
 // parent of V: YUV
@@ -202,9 +205,6 @@
 // parent of EnumEntries<YUV>: entries.getter()
 // parent of entries.getter(): entries
 // parent of entries: YUV
-// parent of YUV: YUV
-// parent of YUV: <init>
-// parent of <init>: YUV
 // parent of HSV: (HSV..HSV?)
 // parent of (HSV..HSV?): INVARIANT (HSV..HSV?)
 // parent of INVARIANT (HSV..HSV?): Enum

kotlin-analysis-api/testData/visibilities.kt

@@ -29,18 +29,18 @@
 // LibEnumJava: <init>: PRIVATE
 // LibEnumJava: values: PUBLIC
 // LibEnumJava: valueOf: PUBLIC
+// LibEnum: <init>: PRIVATE
 // LibEnum: values: PUBLIC
 // LibEnum: valueOf: PUBLIC
-// LibEnum: <init>: PRIVATE
 // Enum: <init>: PRIVATE
 // Enum: values: PUBLIC
 // Enum: valueOf: PUBLIC
+// KtEnum: <init>: PRIVATE
 // KtEnum: values: PUBLIC
 // KtEnum: valueOf: PUBLIC
-// KtEnum: <init>: PRIVATE
+// KtEnumWithVal: <init>: PRIVATE
 // KtEnumWithVal: values: PUBLIC
 // KtEnumWithVal: valueOf: PUBLIC
-// KtEnumWithVal: <init>: PRIVATE
 // END
 
 // MODULE: lib