From ea17eeaaa53a79272beeff3851bdf2c3e644fe13 Mon Sep 17 00:00:00 2001
From: Ting-Yuan Huang <laszio@google.com>
Date: Tue, 7 Nov 2023 10:49:16 -0800
Subject: [PATCH] UPDATE AA VERSION: 2.0.0-dev-6573

(cherry picked from commit 3a702e39b84042b5d7b1d75bdbc6c3d147aa923e)
---
 gradle.properties                                            | 2 +-
 kotlin-analysis-api/build.gradle.kts                         | 5 ++++-
 .../ksp/standalone/IncrementalKotlinDeclarationProvider.kt   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 643fb4e51d..ade3a0eb14 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ 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
diff --git a/kotlin-analysis-api/build.gradle.kts b/kotlin-analysis-api/build.gradle.kts
index 4f6c0b52fd..4f4354bf21 100644
--- a/kotlin-analysis-api/build.gradle.kts
+++ b/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 }
     }
diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalKotlinDeclarationProvider.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalKotlinDeclarationProvider.kt
index b481e86ab5..ef87ae8398 100644
--- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalKotlinDeclarationProvider.kt
+++ b/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()
     }