Skip to content

Commit c61fe6a

Browse files
ting-yuanmkmuir0
authored andcommitted
Downgrade to Kotlin 2.1.10-RC
1 parent 7605f9b commit c61fe6a

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/processing/impl/ResolverImpl.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ import com.intellij.psi.impl.source.PsiClassReferenceType
5757
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
5858
import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
5959
import org.jetbrains.kotlin.codegen.ClassBuilderMode
60+
import org.jetbrains.kotlin.codegen.OwnerKind
6061
import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter
6162
import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
6263
import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
@@ -892,13 +893,17 @@ class ResolverImpl(
892893

893894
@KspExperimental
894895
override fun getJvmName(accessor: KSPropertyAccessor): String? {
895-
return resolvePropertyAccessorDeclaration(accessor)?.let(typeMapper::mapFunctionName)
896+
return resolvePropertyAccessorDeclaration(accessor)?.let {
897+
typeMapper.mapFunctionName(it, OwnerKind.IMPLEMENTATION)
898+
}
896899
}
897900

898901
@KspExperimental
899902
override fun getJvmName(declaration: KSFunctionDeclaration): String? {
900903
// function names might be mangled if they receive inline class parameters or they are internal
901-
return (resolveFunctionDeclaration(declaration) as? FunctionDescriptor)?.let(typeMapper::mapFunctionName)
904+
return (resolveFunctionDeclaration(declaration) as? FunctionDescriptor)?.let {
905+
typeMapper.mapFunctionName(it, OwnerKind.IMPLEMENTATION)
906+
}
902907
}
903908

904909
@KspExperimental

compiler-plugin/src/test/kotlin/com/google/devtools/ksp/test/AbstractKSPTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ abstract class AbstractKSPTest(frontend: FrontendKind<*>) : DisposableTest() {
185185
"-classpath", classpath,
186186
"-d", module.outDir.path
187187
)
188-
compileJavaFiles(javaFiles, options)
188+
compileJavaFiles(javaFiles, options, assertions = JUnit5Assertions)
189189
}
190190

191191
fun runTest(@TestDataFile path: String) {

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copied from kotlinc
22
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx4096m -Dfile.encoding=UTF-8
33

4-
kotlinBaseVersion=2.1.20-Beta1
4+
kotlinBaseVersion=2.1.10-RC
55
agpBaseVersion=7.3.1
66
agpTestVersion=8.7.1
77
intellijVersion=233.13135.128

0 commit comments

Comments
 (0)