UPDATE_AA_VERSION: 2.0.0-dev-18803

google · Mar 21, 2024 · 3993454 · 3993454
1 parent 060281f
commit 3993454
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ junit5Version=5.8.2
 junitPlatformVersion=1.8.2
 googleTruthVersion=1.1
 
-aaKotlinBaseVersion=2.0.0-dev-17175
+aaKotlinBaseVersion=2.0.0-dev-18803
 aaIntellijVersion=213.7172.25
 aaGuavaVersion=29.0-jre
 aaAsmVersion=9.0

diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt
@@ -47,8 +47,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithMembers
 import org.jetbrains.kotlin.analysis.api.types.*
 import org.jetbrains.kotlin.analysis.project.structure.KtLibraryModule
 import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
-import org.jetbrains.kotlin.codegen.state.JVM_SUPPRESS_WILDCARDS_ANNOTATION_FQ_NAME
-import org.jetbrains.kotlin.codegen.state.JVM_WILDCARD_ANNOTATION_FQ_NAME
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.descriptors.java.JavaVisibilities
@@ -63,6 +61,8 @@ import org.jetbrains.kotlin.load.java.structure.impl.classFiles.BinaryJavaAnnota
 import org.jetbrains.kotlin.load.java.structure.impl.classFiles.ClassifierResolutionContext
 import org.jetbrains.kotlin.load.kotlin.TypeMappingMode
 import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.name.JvmStandardClassIds.JVM_SUPPRESS_WILDCARDS_ANNOTATION_FQ_NAME
+import org.jetbrains.kotlin.name.JvmStandardClassIds.JVM_WILDCARD_ANNOTATION_FQ_NAME
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtParameter
 import org.jetbrains.kotlin.types.Variance

diff --git a/kotlin-analysis-api/testData/parent.kt b/kotlin-analysis-api/testData/parent.kt
@@ -30,13 +30,11 @@
 // parent of Bnno: @Bnno
 // parent of @Bnno: B
 // parent of B: File: B.java
-// parent of T: (T & Any..T?)
-// parent of T & Any: (T & Any..T?)
-// parent of (T & Any..T?): t
+// parent of T: (T..T?)
+// parent of (T..T?): t
 // parent of t: B
-// parent of T: (T & Any..T?)
-// parent of T & Any: (T & Any..T?)
-// parent of (T & Any..T?): t
+// parent of T: (T..T?)
+// parent of (T..T?): t
 // parent of t: foo
 // parent of Int: Int
 // parent of Int: i

diff --git a/kotlin-analysis-api/testData/typeParameterReference.kt b/kotlin-analysis-api/testData/typeParameterReference.kt
@@ -29,10 +29,10 @@
 // foo.T3: false
 // T
 // List<T>
-// (T & Any..T?)
-// (MutableList<(T & Any..T?)>..List<(T & Any..T?)>?)
-// (SelfReferencingJava<(T & Any..T?)>..SelfReferencingJava<(T & Any..T?)>?)
-// (T1 & Any..T1?)
+// (T..T?)
+// (MutableList<(T..T?)>..List<(T..T?)>?)
+// (SelfReferencingJava<(T..T?)>..SelfReferencingJava<(T..T?)>?)
+// (T1..T1?)
 // END
 
 // MODULE: lib