Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UPDATE_KOTLIN_VERSION: 1.9.20-dev-9102 #1498

Merged
merged 1 commit into from
Aug 19, 2023
Merged

UPDATE_KOTLIN_VERSION: 1.9.20-dev-9102 #1498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Copied from kotlinc
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx2200m -Dfile.encoding=UTF-8

kotlinBaseVersion=1.9.20-dev-6963
kotlinBaseVersion=1.9.20-dev-9102
agpBaseVersion=7.0.0
intellijVersion=213.7172.25
junitVersion=4.13.1
junit5Version=5.8.2
junitPlatformVersion=1.8.2
googleTruthVersion=1.1

aaKotlinBaseVersion=1.9.20-dev-6963
aaKotlinBaseVersion=1.9.20-dev-9102
aaIntellijVersion=213.7172.25
aaGuavaVersion=29.0-jre
aaAsmVersion=9.0
Expand Down
32 changes: 13 additions & 19 deletions kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,8 @@ import org.jetbrains.kotlin.analysis.project.structure.builder.buildKtSdkModule
import org.jetbrains.kotlin.analysis.project.structure.builder.buildKtSourceModule
import org.jetbrains.kotlin.analysis.project.structure.impl.KtModuleProviderImpl
import org.jetbrains.kotlin.analysis.project.structure.impl.getSourceFilePaths
import org.jetbrains.kotlin.analysis.providers.KotlinAnnotationsResolverFactory
import org.jetbrains.kotlin.analysis.providers.KotlinDeclarationProviderFactory
import org.jetbrains.kotlin.analysis.providers.KotlinDeclarationProviderMerger
import org.jetbrains.kotlin.analysis.providers.KotlinModificationTrackerFactory
import org.jetbrains.kotlin.analysis.providers.KotlinPackageProviderFactory
import org.jetbrains.kotlin.analysis.providers.KotlinPsiDeclarationProviderFactory
import org.jetbrains.kotlin.analysis.providers.KotlinResolutionScopeProvider
import org.jetbrains.kotlin.analysis.providers.PackagePartProviderFactory
import org.jetbrains.kotlin.analysis.providers.impl.KotlinByModulesResolutionScopeProvider
import org.jetbrains.kotlin.analysis.providers.impl.KotlinStaticAnnotationsResolverFactory
import org.jetbrains.kotlin.analysis.providers.impl.KotlinStaticDeclarationProviderMerger
import org.jetbrains.kotlin.analysis.providers.impl.KotlinStaticModificationTrackerFactory
import org.jetbrains.kotlin.analysis.providers.impl.KotlinStaticPsiDeclarationProviderFactory
import org.jetbrains.kotlin.analysis.providers.*
import org.jetbrains.kotlin.analysis.providers.impl.*
import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoot
import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoots
import org.jetbrains.kotlin.cli.common.config.kotlinSourceRoots
Expand Down Expand Up @@ -223,13 +212,11 @@ class KotlinSymbolProcessing(

// register services and build session
val ktModuleProviderImpl = projectStructureProvider as KtModuleProviderImpl
val modules = ktModuleProviderImpl.mainModules
val allSourceFiles = ktModuleProviderImpl.allSourceFiles()
val modules = ktModuleProviderImpl.allKtModules
val allSourceFiles = ktModuleProviderImpl.allSourceFiles
StandaloneProjectFactory.registerServicesForProjectEnvironment(
kotlinCoreProjectEnvironment,
projectStructureProvider,
modules,
allSourceFiles,
)
val ktFiles = allSourceFiles.filterIsInstance<KtFile>()
val libraryRoots = StandaloneProjectFactory.getAllBinaryRoots(modules, kotlinCoreProjectEnvironment)
Expand Down Expand Up @@ -278,6 +265,10 @@ class KotlinSymbolProcessing(
) {
val project = kotlinCoreProjectEnvironment.project
project.apply {
registerService(
KotlinMessageBusProvider::class.java,
KotlinProjectMessageBusProvider::class.java
)
FirStandaloneServiceRegistrar.registerProjectServices(project)
FirStandaloneServiceRegistrar.registerProjectExtensionPoints(project)
FirStandaloneServiceRegistrar.registerProjectModelServices(
Expand All @@ -289,6 +280,10 @@ class KotlinSymbolProcessing(
KotlinModificationTrackerFactory::class.java,
KotlinStaticModificationTrackerFactory::class.java
)
registerService(
KotlinGlobalModificationService::class.java,
KotlinStaticGlobalModificationService::class.java
)
registerService(
KtLifetimeTokenProvider::class.java,
KtReadActionConfinementLifetimeTokenProvider::class.java
Expand Down Expand Up @@ -465,8 +460,7 @@ class KotlinSymbolProcessing(
processors.forEach { it.finish() }
} else {
// Drop caches
KotlinModificationTrackerFactory.getService(project)
.incrementModificationsCount(includeBinaryTrackers = false)
KotlinGlobalModificationService.getInstance(project).publishGlobalModuleStateModification()
KtAnalysisSessionProvider.getInstance(project).clearCaches()
psiManager.dropResolveCaches()
psiManager.dropPsiCaches()
Expand Down
Loading