From 88283988491b32a5952f480f031cbeb85893b3c3 Mon Sep 17 00:00:00 2001 From: Jiaxiang Chen Date: Tue, 19 Dec 2023 18:02:00 -0800 Subject: [PATCH] UPDATE_KOTLIN_VERSION: 2.0.0-dev-10501 --- gradle.properties | 4 ++-- .../ksp/standalone/IncrementalKotlinDeclarationProvider.kt | 7 ++++--- kotlin-analysis-api/testData/parent.kt | 2 -- kotlin-analysis-api/testData/signatureMapper.kt | 1 - 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index a99ac41f33..2f3a234a64 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-9013 +kotlinBaseVersion=2.0.0-dev-10501 agpBaseVersion=7.2.0 intellijVersion=213.7172.25 junitVersion=4.13.1 @@ -9,7 +9,7 @@ junit5Version=5.8.2 junitPlatformVersion=1.8.2 googleTruthVersion=1.1 -aaKotlinBaseVersion=2.0.0-dev-9013 +aaKotlinBaseVersion=2.0.0-dev-10501 aaIntellijVersion=213.7172.25 aaGuavaVersion=29.0-jre aaAsmVersion=9.0 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 ef87ae8398..a840c5edb5 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,9 +19,10 @@ import org.jetbrains.kotlin.psi.KtScript import org.jetbrains.kotlin.psi.KtTypeAlias class IncrementalKotlinDeclarationProvider(var del: KotlinDeclarationProvider) : KotlinDeclarationProvider() { - override fun computePackageSetWithTopLevelCallableDeclarations(): Set? { - return del.computePackageSetWithTopLevelCallableDeclarations() - } + override val hasSpecificCallablePackageNamesComputation: Boolean + get() = del.hasSpecificCallablePackageNamesComputation + override val hasSpecificClassifierPackageNamesComputation: Boolean + get() = del.hasSpecificClassifierPackageNamesComputation override fun findFilesForFacade(facadeFqName: FqName): Collection { return del.findFilesForFacade(facadeFqName) diff --git a/kotlin-analysis-api/testData/parent.kt b/kotlin-analysis-api/testData/parent.kt index b6aec87d70..6bedc552a4 100644 --- a/kotlin-analysis-api/testData/parent.kt +++ b/kotlin-analysis-api/testData/parent.kt @@ -52,8 +52,6 @@ // parent of Enum: Enum<(RGB..RGB?)> // parent of Enum<(RGB..RGB?)>: RGB // parent of RGB: File: B.java -// parent of RGB: synthetic constructor for RGB -// parent of synthetic constructor for RGB: RGB // parent of R: RGB // parent of G: RGB // parent of B: RGB diff --git a/kotlin-analysis-api/testData/signatureMapper.kt b/kotlin-analysis-api/testData/signatureMapper.kt index c5a976646d..5b69ff8e24 100644 --- a/kotlin-analysis-api/testData/signatureMapper.kt +++ b/kotlin-analysis-api/testData/signatureMapper.kt @@ -29,7 +29,6 @@ // intParam: I // : (I)V // LJavaEnum; -// : ()V // VAL1: LJavaEnum; // VAL2: LJavaEnum; // DEFAULT: LJavaEnum;