Skip to content

Commit ef09196

Browse files
authored
Update kotlin to 1.4.20 (#169)
* Update kotlin to 1.4.20
1 parent 9e607cd commit ef09196

File tree

11 files changed

+25
-19
lines changed

11 files changed

+25
-19
lines changed

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import java.time.LocalDateTime
22
import java.time.format.DateTimeFormatter
33

44
plugins {
5-
kotlin("jvm") version "1.4.0" apply false
5+
kotlin("jvm") version "1.4.20" apply false
66
}
77

88
if (!extra.has("kspVersion")) {

compiler-plugin/build.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tasks.withType<KotlinCompile> {
1717

1818
plugins {
1919
kotlin("jvm")
20-
id("org.jetbrains.intellij") version "0.4.22"
20+
id("org.jetbrains.intellij") version "0.6.4"
2121
}
2222

2323
intellij {
@@ -49,6 +49,7 @@ dependencies {
4949
testImplementation(kotlin("stdlib", kotlinBaseVersion))
5050
testImplementation("org.jetbrains.kotlin:kotlin-compiler:$kotlinBaseVersion")
5151
testImplementation("org.jetbrains.kotlin:kotlin-compiler-tests:$kotlinBaseVersion")
52+
testImplementation("org.jetbrains.kotlin:tests-mutes:$kotlinBaseVersion")
5253
testImplementation("org.jetbrains.kotlin:kotlin-scripting-compiler:$kotlinBaseVersion")
5354

5455
testImplementation("junit:junit:$junitVersion")

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSClassDeclarationDescriptorImpl.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ class KSClassDeclarationDescriptorImpl private constructor(val descriptor: Class
5454

5555
override fun getAllFunctions(): List<KSFunctionDeclaration> {
5656
return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.FUNCTIONS).toList()
57-
.filter { (it as FunctionDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
57+
.filter { (it as FunctionDescriptor).visibility != DescriptorVisibilities.INVISIBLE_FAKE }
5858
.map { KSFunctionDeclarationDescriptorImpl.getCached(it as FunctionDescriptor) }
5959
}
6060

6161
override fun getAllProperties(): List<KSPropertyDeclaration> {
6262
return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.VARIABLES).toList()
63-
.filter { (it as PropertyDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
63+
.filter { (it as PropertyDescriptor).visibility != DescriptorVisibilities.INVISIBLE_FAKE }
6464
.map { KSPropertyDeclarationDescriptorImpl.getCached(it as PropertyDescriptor) }
6565
}
6666

@@ -84,8 +84,8 @@ class KSClassDeclarationDescriptorImpl private constructor(val descriptor: Class
8484
listOf(descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(), descriptor.staticScope.getDescriptorsFiltered()).flatten()
8585
.filter {
8686
it is MemberDescriptor
87-
&& it.visibility != Visibilities.INHERITED
88-
&& it.visibility != Visibilities.INVISIBLE_FAKE
87+
&& it.visibility != DescriptorVisibilities.INHERITED
88+
&& it.visibility != DescriptorVisibilities.INVISIBLE_FAKE
8989
}
9090
.map {
9191
when (it) {

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaImpl.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import com.google.devtools.ksp.symbol.impl.kotlin.KSNameImpl
3131
import com.google.devtools.ksp.symbol.impl.kotlin.getKSTypeCached
3232
import com.google.devtools.ksp.symbol.impl.replaceTypeArguments
3333
import com.google.devtools.ksp.symbol.impl.toKSFunctionDeclaration
34+
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
3435
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
3536
import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl
3637
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
@@ -77,7 +78,7 @@ class KSClassDeclarationJavaImpl private constructor(val psi: PsiClass) : KSClas
7778
return descriptor?.let {
7879
it.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.FUNCTIONS)
7980
.toList()
80-
.filter { (it as FunctionDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
81+
.filter { (it as FunctionDescriptor).visibility != DescriptorVisibilities.INVISIBLE_FAKE }
8182
.plus(it.constructors)
8283
.map { (it as FunctionDescriptor).toKSFunctionDeclaration() }
8384
} ?: emptyList()
@@ -87,7 +88,7 @@ class KSClassDeclarationJavaImpl private constructor(val psi: PsiClass) : KSClas
8788
return descriptor?.let {
8889
it.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.VARIABLES)
8990
.toList()
90-
.filter { (it as PropertyDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
91+
.filter { (it as PropertyDescriptor).visibility != DescriptorVisibilities.INVISIBLE_FAKE }
9192
.map{ (it as PropertyDescriptor).toKSPropertyDeclaration() }
9293
} ?: emptyList()
9394
}

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSClassDeclarationImpl.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import com.google.devtools.ksp.processing.impl.ResolverImpl
2525
import com.google.devtools.ksp.symbol.*
2626
import com.google.devtools.ksp.symbol.impl.*
2727
import com.google.devtools.ksp.symbol.impl.synthetic.KSConstructorSyntheticImpl
28+
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
2829
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
2930
import org.jetbrains.kotlin.psi.KtClassOrObject
3031
import org.jetbrains.kotlin.psi.KtObjectDeclaration
@@ -50,13 +51,13 @@ class KSClassDeclarationImpl private constructor(val ktClassOrObject: KtClassOrO
5051

5152
override fun getAllFunctions(): List<KSFunctionDeclaration> {
5253
return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.FUNCTIONS).toList()
53-
.filter { (it as FunctionDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
54+
.filter { (it as FunctionDescriptor).visibility != DescriptorVisibilities.INVISIBLE_FAKE }
5455
.map { (it as FunctionDescriptor).toKSFunctionDeclaration() }
5556
}
5657

5758
override fun getAllProperties(): List<KSPropertyDeclaration> {
5859
return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.VARIABLES).toList()
59-
.filter { (it as PropertyDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
60+
.filter { (it as PropertyDescriptor).visibility != DescriptorVisibilities.INVISIBLE_FAKE }
6061
.map { (it as PropertyDescriptor).toKSPropertyDeclaration() }
6162
}
6263

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/utils.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import com.google.devtools.ksp.symbol.impl.java.KSTypeArgumentJavaImpl
3535
import com.google.devtools.ksp.symbol.impl.kotlin.*
3636
import com.intellij.psi.impl.source.PsiClassImpl
3737
import org.jetbrains.kotlin.lexer.KtTokens
38-
import org.jetbrains.kotlin.load.java.JavaVisibilities
38+
import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities
3939
import org.jetbrains.kotlin.load.java.descriptors.JavaClassConstructorDescriptor
4040
import org.jetbrains.kotlin.psi.*
4141
import org.jetbrains.kotlin.resolve.source.getPsi
@@ -130,12 +130,12 @@ fun MemberDescriptor.toKSModifiers(): Set<Modifier> {
130130
Modality.ABSTRACT -> modifiers.add(Modifier.ABSTRACT)
131131
}
132132
when (this.visibility) {
133-
Visibilities.PUBLIC -> modifiers.add(Modifier.PUBLIC)
134-
Visibilities.PROTECTED, JavaVisibilities.PROTECTED_AND_PACKAGE -> modifiers.add(Modifier.PROTECTED)
135-
Visibilities.PRIVATE -> modifiers.add(Modifier.PRIVATE)
136-
Visibilities.INTERNAL -> modifiers.add(Modifier.INTERNAL)
133+
DescriptorVisibilities.PUBLIC -> modifiers.add(Modifier.PUBLIC)
134+
DescriptorVisibilities.PROTECTED, JavaDescriptorVisibilities.PROTECTED_AND_PACKAGE -> modifiers.add(Modifier.PROTECTED)
135+
DescriptorVisibilities.PRIVATE -> modifiers.add(Modifier.PRIVATE)
136+
DescriptorVisibilities.INTERNAL -> modifiers.add(Modifier.INTERNAL)
137137
// Since there is no modifier for package-private, use No modifier to tell if a symbol from binary is package private.
138-
JavaVisibilities.PACKAGE_VISIBILITY, JavaVisibilities.PROTECTED_STATIC_VISIBILITY -> Unit
138+
JavaDescriptorVisibilities.PACKAGE_VISIBILITY, JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY -> Unit
139139
else -> throw IllegalStateException("unhandled visibility: ${this.visibility}")
140140
}
141141
return modifiers

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

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ abstract class AbstractKotlinKSPTest : KotlinBaseTest<AbstractKotlinKSPTest.KspT
103103
val configuration = createConfiguration(
104104
ConfigurationKind.NO_KOTLIN_REFLECT,
105105
TestJdkKind.FULL_JDK_9,
106+
TargetBackend.JVM,
106107
listOf(KotlinTestUtils.getAnnotationsJar()) + dependencies,
107108
listOf(module.javaSrcDir),
108109
emptyList()

gradle.properties

+3-3
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=-Xmx2200m -Dfile.encoding=UTF-8
33

4-
kotlinBaseVersion=1.4.10
5-
intellijVersion=193.6494.35
4+
kotlinBaseVersion=1.4.20
5+
intellijVersion=201.7223.91
66
junitVersion=4.12
7-
compilerTestEnabled=false
7+
compilerTestEnabled=false

third_party/prebuilt/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ $ cd path_to_kotlin_compiler_src
1010
$ patch -p1 < 0001-Package-test-classes.patch
1111
$ ./gradlew :include:kotlin-compiler-tests:build
1212
$ cp include/kotlin-compiler-tests/build/libs/*.jar path_to_below
13+
$ ./gradlew :compiler:tests-mutes:build
14+
$ cp compiler/tests-mutes/build/libs/*.jar path_to_below
1315
```
Binary file not shown.

0 commit comments

Comments
 (0)