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.

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

UPDATE_KOTLIN_VERSION: 1.9.20-dev-4459 #1420

Merged
merged 2 commits into from
Jun 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copied from kotlinc
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx2200m -Dfile.encoding=UTF-8

kotlinBaseVersion=1.9.20-dev-2357
kotlinBaseVersion=1.9.20-dev-4459
agpBaseVersion=7.0.0
intellijVersion=213.7172.25
junitVersion=4.12
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,7 @@ class PlaygroundIT {
val gradleRunner = GradleRunner.create().withProjectDir(project.root).withGradleVersion("8.0")
gradleRunner.withArguments("clean", "build").buildAndFail().let { result ->
Assert.assertTrue(
result.output.contains(
"'compileJava' task (current target is 11) and 'kspKotlin' " +
"task (current target is 17) jvm target compatibility should be set to the same Java version."
)
result.output.contains("Inconsistent JVM-target compatibility detected for tasks")
)
}
project.restore(buildFile.path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@ import com.google.devtools.ksp.impl.CommandLineKSPLogger
import com.google.devtools.ksp.impl.KotlinSymbolProcessing
import com.google.devtools.ksp.processor.AbstractTestProcessor
import com.google.devtools.ksp.testutils.AbstractKSPTest
import com.intellij.openapi.extensions.ExtensionPoint
import com.intellij.core.CoreApplicationEnvironment
import com.intellij.mock.MockProject
import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.analysis.api.resolve.extensions.KtResolveExtensionProvider
import org.jetbrains.kotlin.analysis.api.standalone.StandaloneAnalysisAPISessionBuilder
import org.jetbrains.kotlin.analysis.api.standalone.buildStandaloneAnalysisAPISession
import org.jetbrains.kotlin.analysis.decompiler.stub.file.CachedAttributeData
import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache
import org.jetbrains.kotlin.analysis.decompiler.stub.file.FileAttributeService
import org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.JvmFirDeserializedSymbolProviderFactory
import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoot
import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoots
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
Expand Down Expand Up @@ -156,15 +158,17 @@ abstract class AbstractKSPAATest : AbstractKSPTest(FrontendKinds.FIR) {
val analysisSession = buildStandaloneAnalysisAPISession(withPsiDeclarationFromBinaryModuleProvider = true) {
registerOnce<FileAttributeService> { DummyFileAttributeService }
registerOnce(::ClsKotlinBinaryClassCache)
CoreApplicationEnvironment.registerExtensionPoint(
project.extensionArea,
KtResolveExtensionProvider.EP_NAME.name,
KtResolveExtensionProvider::class.java
)
buildKtModuleProviderByCompilerConfiguration(compilerConfiguration)
project.extensionArea.apply {
registerExtensionPoint(
KtResolveExtensionProvider.EP_NAME.name,
KtResolveExtensionProvider::class.java.name,
ExtensionPoint.Kind.INTERFACE,
false
)
}
}.apply {
(project as MockProject).registerService(
JvmFirDeserializedSymbolProviderFactory::class.java,
JvmFirDeserializedSymbolProviderFactory::class.java
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any insight on this magic?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FirStandaloneServiceRegistrar registers JvmStubBasedDeserializedSymbolProviderFactory, which is IDE only. Standalone mode should go with JvmFirDeserializedSymbolProviderFactory per this comment.

)
}
val ksp = KotlinSymbolProcessing(
compilerConfiguration,
Expand Down
Loading