Skip to content

Commit b7d032d

Browse files
authored
Use Kotlin compiler 2.1.10 for K1 analysis and remove old workarounds (#4012)
1 parent 70beb15 commit b7d032d

File tree

6 files changed

+4
-726
lines changed

6 files changed

+4
-726
lines changed

dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ open class AllSupportedTestedVersionsArgumentsProvider : TestedVersionsArguments
1414

1515
object TestedVersions {
1616

17-
val LATEST = BuildVersions("8.10.2", "2.1.0")
17+
val LATEST = BuildVersions("8.12.1", "2.1.10")
1818

1919
/**
2020
* All supported Gradle/Kotlin versions, including [LATEST]
@@ -41,7 +41,7 @@ object TestedVersions {
4141
val ANDROID =
4242
BuildVersions.permutations(
4343
gradleVersions = listOf("8.4"),
44-
kotlinVersions = listOf("2.1.0", "2.0.21"),
44+
kotlinVersions = listOf("2.1.10", "2.0.21"),
4545
androidGradlePluginVersions = listOf("8.3.0")
4646
) + BuildVersions.permutations(
4747
gradleVersions = listOf("7.4.2", *ifExhaustive("7.0")),
@@ -68,7 +68,7 @@ object TestedVersions {
6868
"1.9.23" to "18.2.0-pre.682",
6969
"2.0.0" to "18.2.0-pre.726",
7070
"2.0.21" to "18.3.1-pre.758",
71-
"2.1.0" to "18.3.1-pre.818",
71+
"2.1.10" to "2025.1.10-19.0.0",
7272
)
7373
}
7474

dokka-subprojects/analysis-kotlin-descriptors-compiler/api/analysis-kotlin-descriptors-compiler.api

-30
Original file line numberDiff line numberDiff line change
@@ -84,33 +84,3 @@ public abstract class org/jetbrains/dokka/analysis/kotlin/descriptors/compiler/c
8484
public final fun get (Lorg/jetbrains/dokka/DokkaConfiguration$DokkaSourceSet;)Lorg/jetbrains/dokka/analysis/kotlin/descriptors/compiler/configuration/AnalysisContext;
8585
}
8686

87-
public final class org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl : com/intellij/core/CoreJavaFileManager, org/jetbrains/kotlin/resolve/jvm/KotlinCliJavaFileManager {
88-
public static final field Companion Lorg/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl$Companion;
89-
public fun <init> (Lcom/intellij/psi/PsiManager;)V
90-
public fun findClass (Ljava/lang/String;Lcom/intellij/psi/search/GlobalSearchScope;)Lcom/intellij/psi/PsiClass;
91-
public fun findClass (Lorg/jetbrains/kotlin/load/java/JavaClassFinder$Request;Lcom/intellij/psi/search/GlobalSearchScope;)Lorg/jetbrains/kotlin/load/java/structure/JavaClass;
92-
public final fun findClass (Lorg/jetbrains/kotlin/name/ClassId;Lcom/intellij/psi/search/GlobalSearchScope;)Lorg/jetbrains/kotlin/load/java/structure/JavaClass;
93-
public fun findClasses (Ljava/lang/String;Lcom/intellij/psi/search/GlobalSearchScope;)[Lcom/intellij/psi/PsiClass;
94-
public fun findModules (Ljava/lang/String;Lcom/intellij/psi/search/GlobalSearchScope;)Ljava/util/Collection;
95-
public fun findPackage (Ljava/lang/String;)Lcom/intellij/psi/PsiPackage;
96-
public fun getNonTrivialPackagePrefixes ()Ljava/util/Collection;
97-
public final fun initialize (Lorg/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndex;Ljava/util/List;Lorg/jetbrains/kotlin/cli/jvm/index/SingleJavaFileRootsIndex;Z)V
98-
public fun knownClassNamesInPackage (Lorg/jetbrains/kotlin/name/FqName;)Ljava/util/Set;
99-
}
100-
101-
public final class org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl$Companion {
102-
}
103-
104-
public final class org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndexImpl : org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndex {
105-
public fun <init> (Ljava/util/List;)V
106-
public fun findClass (Lorg/jetbrains/kotlin/name/ClassId;Ljava/util/Set;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
107-
public fun getIndexedRoots ()Lkotlin/sequences/Sequence;
108-
public fun traverseDirectoriesInPackage (Lorg/jetbrains/kotlin/name/FqName;Ljava/util/Set;Lkotlin/jvm/functions/Function2;)V
109-
}
110-
111-
public final class org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer {
112-
public fun <init> (Lorg/jetbrains/kotlin/descriptors/ModuleDescriptor;Lorg/jetbrains/kotlin/descriptors/NotFoundClasses;)V
113-
public final fun deserializeAnnotation (Lorg/jetbrains/kotlin/metadata/ProtoBuf$Annotation;Lorg/jetbrains/kotlin/metadata/deserialization/NameResolver;)Lorg/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptor;
114-
public final fun resolveValue (Lorg/jetbrains/kotlin/types/KotlinType;Lorg/jetbrains/kotlin/metadata/ProtoBuf$Annotation$Argument$Value;Lorg/jetbrains/kotlin/metadata/deserialization/NameResolver;)Lorg/jetbrains/kotlin/resolve/constants/ConstantValue;
115-
}
116-

dokka-subprojects/analysis-kotlin-descriptors-compiler/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/descriptors/compiler/configuration/JvmDependenciesIndexImpl.kt

-257
This file was deleted.

0 commit comments

Comments
 (0)