aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiaxiang Chen <jiaxiang@google.com>2023-12-19 18:02:00 -0800
committerJiaxiang Chen <roaringacw@gmail.com>2024-01-18 15:54:29 -0800
commit3fa43cd9c8a2b23c89baf8a9a6c54a9334c0e8fb (patch)
treeb3fdfdfb9a7799ac0708a20b1464e08fcd4ebabd
parentc14a671bdf01fb54def39bedd8f3b3065dfdac95 (diff)
downloadksp-3fa43cd9c8a2b23c89baf8a9a6c54a9334c0e8fb.tar.gz
UPDATE_KOTLIN_VERSION: 2.0.0-dev-10501
(cherry picked from commit 88283988491b32a5952f480f031cbeb85893b3c3)
-rw-r--r--gradle.properties4
-rw-r--r--kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/standalone/IncrementalKotlinDeclarationProvider.kt7
-rw-r--r--kotlin-analysis-api/testData/parent.kt2
-rw-r--r--kotlin-analysis-api/testData/signatureMapper.kt1
4 files changed, 6 insertions, 8 deletions
diff --git a/gradle.properties b/gradle.properties
index a99ac41f..2f3a234a 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 ef87ae83..a840c5ed 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<String>? {
- return del.computePackageSetWithTopLevelCallableDeclarations()
- }
+ override val hasSpecificCallablePackageNamesComputation: Boolean
+ get() = del.hasSpecificCallablePackageNamesComputation
+ override val hasSpecificClassifierPackageNamesComputation: Boolean
+ get() = del.hasSpecificClassifierPackageNamesComputation
override fun findFilesForFacade(facadeFqName: FqName): Collection<KtFile> {
return del.findFilesForFacade(facadeFqName)
diff --git a/kotlin-analysis-api/testData/parent.kt b/kotlin-analysis-api/testData/parent.kt
index b6aec87d..6bedc552 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 c5a97664..5b69ff8e 100644
--- a/kotlin-analysis-api/testData/signatureMapper.kt
+++ b/kotlin-analysis-api/testData/signatureMapper.kt
@@ -29,7 +29,6 @@
// intParam: I
// <init>: (I)V
// LJavaEnum;
-// <init>: ()V
// VAL1: LJavaEnum;
// VAL2: LJavaEnum;
// DEFAULT: LJavaEnum;