From e915b4aed3e8b00fa603028076ada1600cebfa58 Mon Sep 17 00:00:00 2001 From: Ting-Yuan Huang Date: Tue, 5 Nov 2024 11:03:59 -0800 Subject: [PATCH] UPDATE_AA_VERSION: 2.1.20-dev-2637 --- gradle.properties | 2 +- kotlin-analysis-api/build.gradle.kts | 3 +-- .../com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index d9dd5f472e..80f059e7f6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ junit5Version=5.8.2 junitPlatformVersion=1.8.2 googleTruthVersion=1.1 -aaKotlinBaseVersion=2.1.20-dev-1729 +aaKotlinBaseVersion=2.1.20-dev-2637 aaIntellijVersion=233.13135.128 aaGuavaVersion=33.2.0-jre aaAsmVersion=9.0 diff --git a/kotlin-analysis-api/build.gradle.kts b/kotlin-analysis-api/build.gradle.kts index 32eabdb649..37160860cb 100644 --- a/kotlin-analysis-api/build.gradle.kts +++ b/kotlin-analysis-api/build.gradle.kts @@ -114,8 +114,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter:junit-jupiter-params:$junit5Version") testRuntimeOnly("org.junit.platform:junit-platform-suite:$junitPlatformVersion") testImplementation("org.jetbrains.kotlin:kotlin-compiler:$aaKotlinBaseVersion") - // FIXME: use aaKotlinBaseVersion after the dependency is fixed. - testImplementation("org.jetbrains.kotlin:kotlin-compiler-internal-test-framework:2.1.20-dev-201") + testImplementation("org.jetbrains.kotlin:kotlin-compiler-internal-test-framework:$aaKotlinBaseVersion") testImplementation(project(":common-deps")) testImplementation(project(":test-utils")) diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt index 4c5f0bc312..b226345d07 100644 --- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt +++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt @@ -653,14 +653,14 @@ internal val DEAR_SHADOW_JAR_PLEASE_DO_NOT_REMOVE_THESE = listOf( org.jetbrains.kotlin.analysis.api.standalone.base.declarations.KotlinStandaloneFirDirectInheritorsProvider::class.java, org.jetbrains.kotlin.analysis.low.level.api.fir.services.LLRealFirElementByPsiElementChooser::class.java, org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSessionInvalidationService::class.java, - org.jetbrains.kotlin.analysis.low.level.api.fir.stubBased - .deserialization.LLStubBasedLibrarySymbolProviderFactory::class.java, + org.jetbrains.kotlin.analysis.low.level.api.fir.stubBased.deserialization.LLStubBasedLibrarySymbolProviderFactory::class.java, org.jetbrains.kotlin.analysis.api.impl.base.permissions.KaBaseAnalysisPermissionChecker::class.java, org.jetbrains.kotlin.analysis.api.platform.KotlinProjectMessageBusProvider::class.java, org.jetbrains.kotlin.analysis.api.platform.permissions.KaAnalysisPermissionChecker::class.java, org.jetbrains.kotlin.analysis.api.platform.projectStructure.KotlinSimpleGlobalSearchScopeMerger::class.java, org.jetbrains.kotlin.analysis.api.fir.modification.KaFirSourceModificationService::class.java, org.jetbrains.kotlin.analysis.api.fir.references.KotlinFirReferenceContributor::class.java, + org.jetbrains.kotlin.analysis.api.fir.statistics.KaFirStatisticsService::class.java, org.jetbrains.kotlin.light.classes.symbol.SymbolKotlinAsJavaSupport::class.java, org.jetbrains.kotlin.load.java.ErasedOverridabilityCondition::class.java, org.jetbrains.kotlin.load.java.FieldOverridabilityCondition::class.java,