Skip to content

Commit e900817

Browse files
IgnatBeresnevIgnatBeresnev
committed
Fix Kotlin Analysis API package name (#3100)
(cherry picked from commit 8fd4ed3)
1 parent 6dd728f commit e900817

File tree

39 files changed

+69
-69
lines changed

39 files changed

+69
-69
lines changed

‎plugins/all-modules-page/src/main/kotlin/MultimodulePageCreator.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import org.jetbrains.dokka.plugability.plugin
1818
import org.jetbrains.dokka.plugability.querySingle
1919
import org.jetbrains.dokka.transformers.pages.PageCreator
2020
import org.jetbrains.dokka.utilities.DokkaLogger
21-
import org.jetbrains.kotlin.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
21+
import org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
2222
import java.io.File
2323

2424
class MultimodulePageCreator(

‎plugins/base/api/base.api

+3-3
Original file line numberDiff line numberDiff line change
@@ -1277,8 +1277,8 @@ public final class org/jetbrains/dokka/base/translators/documentables/DefaultDoc
12771277
}
12781278

12791279
public class org/jetbrains/dokka/base/translators/documentables/DefaultPageCreator {
1280-
public fun <init> (Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;Lorg/jetbrains/dokka/base/transformers/pages/comments/CommentsToContentConverter;Lorg/jetbrains/dokka/base/signatures/SignatureProvider;Lorg/jetbrains/dokka/utilities/DokkaLogger;Ljava/util/List;Lorg/jetbrains/kotlin/analysis/kotlin/internal/DocumentableSourceLanguageParser;)V
1281-
public synthetic fun <init> (Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;Lorg/jetbrains/dokka/base/transformers/pages/comments/CommentsToContentConverter;Lorg/jetbrains/dokka/base/signatures/SignatureProvider;Lorg/jetbrains/dokka/utilities/DokkaLogger;Ljava/util/List;Lorg/jetbrains/kotlin/analysis/kotlin/internal/DocumentableSourceLanguageParser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
1280+
public fun <init> (Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;Lorg/jetbrains/dokka/base/transformers/pages/comments/CommentsToContentConverter;Lorg/jetbrains/dokka/base/signatures/SignatureProvider;Lorg/jetbrains/dokka/utilities/DokkaLogger;Ljava/util/List;Lorg/jetbrains/dokka/analysis/kotlin/internal/DocumentableSourceLanguageParser;)V
1281+
public synthetic fun <init> (Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;Lorg/jetbrains/dokka/base/transformers/pages/comments/CommentsToContentConverter;Lorg/jetbrains/dokka/base/signatures/SignatureProvider;Lorg/jetbrains/dokka/utilities/DokkaLogger;Ljava/util/List;Lorg/jetbrains/dokka/analysis/kotlin/internal/DocumentableSourceLanguageParser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
12821282
protected fun contentForBrief (Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder$DocumentableContentBuilder;Lorg/jetbrains/dokka/model/Documentable;)V
12831283
protected fun contentForClasslikesAndEntries (Ljava/util/List;)Lorg/jetbrains/dokka/pages/ContentGroup;
12841284
protected fun contentForConstructors (Ljava/util/List;Ljava/util/Set;Ljava/util/Set;)Lorg/jetbrains/dokka/pages/ContentGroup;
@@ -1298,7 +1298,7 @@ public class org/jetbrains/dokka/base/translators/documentables/DefaultPageCreat
12981298
public static synthetic fun divergentBlock$default (Lorg/jetbrains/dokka/base/translators/documentables/DefaultPageCreator;Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder$DocumentableContentBuilder;Ljava/lang/String;Ljava/util/Collection;Lorg/jetbrains/dokka/pages/ContentKind;Lorg/jetbrains/dokka/model/properties/PropertyContainer;ILjava/lang/Object;)V
12991299
protected fun getContentBuilder ()Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder;
13001300
public final fun getCustomTagContentProviders ()Ljava/util/List;
1301-
public final fun getDocumentableAnalyzer ()Lorg/jetbrains/kotlin/analysis/kotlin/internal/DocumentableSourceLanguageParser;
1301+
public final fun getDocumentableAnalyzer ()Lorg/jetbrains/dokka/analysis/kotlin/internal/DocumentableSourceLanguageParser;
13021302
public final fun getLogger ()Lorg/jetbrains/dokka/utilities/DokkaLogger;
13031303
protected final fun getMergeImplicitExpectActualDeclarations ()Z
13041304
protected final fun getSeparateInheritedMembers ()Z

‎plugins/base/src/main/kotlin/renderers/html/NavigationDataProvider.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import org.jetbrains.dokka.pages.*
1010
import org.jetbrains.dokka.plugability.DokkaContext
1111
import org.jetbrains.dokka.plugability.plugin
1212
import org.jetbrains.dokka.plugability.querySingle
13-
import org.jetbrains.kotlin.analysis.kotlin.internal.DocumentableLanguage
14-
import org.jetbrains.kotlin.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
13+
import org.jetbrains.dokka.analysis.kotlin.internal.DocumentableLanguage
14+
import org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
1515

1616
abstract class NavigationDataProvider(
1717
dokkaContext: DokkaContext

‎plugins/base/src/main/kotlin/transformers/documentables/ExtensionExtractorTransformer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.jetbrains.dokka.plugability.querySingle
1414
import org.jetbrains.dokka.transformers.documentation.DocumentableTransformer
1515
import org.jetbrains.dokka.utilities.parallelForEach
1616
import org.jetbrains.dokka.utilities.parallelMap
17-
import org.jetbrains.kotlin.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
17+
import org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
1818

1919

2020
class ExtensionExtractorTransformer : DocumentableTransformer {

‎plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import org.jetbrains.dokka.plugability.DokkaContext
88
import org.jetbrains.dokka.plugability.plugin
99
import org.jetbrains.dokka.plugability.querySingle
1010
import org.jetbrains.dokka.transformers.documentation.PreMergeDocumentableTransformer
11-
import org.jetbrains.kotlin.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
12-
import org.jetbrains.kotlin.analysis.kotlin.internal.ModuleAndPackageDocumentationReader
11+
import org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
12+
import org.jetbrains.dokka.analysis.kotlin.internal.ModuleAndPackageDocumentationReader
1313

1414
internal class ModuleAndPackageDocumentationTransformer(
1515
private val moduleAndPackageDocumentationReader: ModuleAndPackageDocumentationReader

‎plugins/base/src/main/kotlin/transformers/documentables/ReportUndocumentedTransformer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.jetbrains.dokka.plugability.DokkaContext
77
import org.jetbrains.dokka.plugability.plugin
88
import org.jetbrains.dokka.plugability.querySingle
99
import org.jetbrains.dokka.transformers.documentation.DocumentableTransformer
10-
import org.jetbrains.kotlin.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
10+
import org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
1111

1212
internal class ReportUndocumentedTransformer : DocumentableTransformer {
1313

‎plugins/base/src/main/kotlin/translators/documentables/DefaultDocumentableToPageTranslator.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import org.jetbrains.dokka.model.DModule
66
import org.jetbrains.dokka.pages.ModulePageNode
77
import org.jetbrains.dokka.plugability.*
88
import org.jetbrains.dokka.transformers.documentation.DocumentableToPageTranslator
9-
import org.jetbrains.kotlin.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
9+
import org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
1010

1111
class DefaultDocumentableToPageTranslator(
1212
context: DokkaContext

‎plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import org.jetbrains.dokka.model.properties.PropertyContainer
1818
import org.jetbrains.dokka.model.properties.WithExtraProperties
1919
import org.jetbrains.dokka.pages.*
2020
import org.jetbrains.dokka.utilities.DokkaLogger
21-
import org.jetbrains.kotlin.analysis.kotlin.internal.DocumentableSourceLanguageParser
22-
import org.jetbrains.kotlin.analysis.kotlin.internal.DocumentableLanguage
21+
import org.jetbrains.dokka.analysis.kotlin.internal.DocumentableSourceLanguageParser
22+
import org.jetbrains.dokka.analysis.kotlin.internal.DocumentableLanguage
2323
import kotlin.reflect.KClass
2424

2525
internal typealias GroupedTags = Map<KClass<out TagWrapper>, List<Pair<DokkaSourceSet?, TagWrapper>>>

‎plugins/base/src/test/kotlin/transformers/ContextModuleAndPackageDocumentationReaderTest1.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.jetbrains.dokka.plugability.querySingle
99
import org.jetbrains.dokka.testApi.logger.TestLogger
1010
import org.jetbrains.dokka.utilities.DokkaConsoleLogger
1111
import org.jetbrains.dokka.utilities.LoggingLevel
12-
import org.jetbrains.kotlin.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
12+
import org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
1313
import org.junit.jupiter.api.Assertions.assertEquals
1414
import org.junit.jupiter.api.BeforeEach
1515
import org.junit.jupiter.api.Test

‎plugins/base/src/test/kotlin/transformers/ContextModuleAndPackageDocumentationReaderTest3.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import org.jetbrains.dokka.plugability.plugin
66
import org.jetbrains.dokka.plugability.querySingle
77
import org.jetbrains.dokka.utilities.DokkaConsoleLogger
88
import org.jetbrains.dokka.utilities.LoggingLevel
9-
import org.jetbrains.kotlin.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
9+
import org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
1010
import org.junit.jupiter.api.BeforeEach
1111
import org.junit.jupiter.api.Test
1212
import testApi.testRunner.TestDokkaConfigurationBuilder

‎plugins/base/src/test/kotlin/transformers/InvalidContentModuleAndPackageDocumentationReaderTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.jetbrains.dokka.plugability.plugin
55
import org.jetbrains.dokka.plugability.querySingle
66
import org.jetbrains.dokka.utilities.DokkaConsoleLogger
77
import org.jetbrains.dokka.utilities.LoggingLevel
8-
import org.jetbrains.kotlin.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
8+
import org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
99
import org.junit.jupiter.api.BeforeEach
1010
import org.junit.jupiter.api.Test
1111
import testApi.testRunner.TestDokkaConfigurationBuilder

‎plugins/base/src/test/kotlin/transformers/ModuleAndPackageDocumentationTransformerUnitTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import org.jetbrains.dokka.model.doc.CustomDocTag
1212
import org.jetbrains.dokka.model.doc.Description
1313
import org.jetbrains.dokka.model.doc.DocumentationNode
1414
import org.jetbrains.dokka.model.doc.Text
15-
import org.jetbrains.kotlin.analysis.kotlin.internal.ModuleAndPackageDocumentationReader
15+
import org.jetbrains.dokka.analysis.kotlin.internal.ModuleAndPackageDocumentationReader
1616
import org.junit.jupiter.api.Assertions.assertEquals
1717
import org.junit.jupiter.api.Test
1818
import testApi.testRunner.dPackage

‎plugins/base/src/test/kotlin/translators/ExternalDocumentablesTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import org.jetbrains.dokka.model.DInterface
66
import org.jetbrains.dokka.plugability.plugin
77
import org.jetbrains.dokka.plugability.querySingle
88
import org.jetbrains.dokka.utilities.cast
9-
import org.jetbrains.kotlin.analysis.kotlin.internal.ExternalDocumentablesProvider
10-
import org.jetbrains.kotlin.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
9+
import org.jetbrains.dokka.analysis.kotlin.internal.ExternalDocumentablesProvider
10+
import org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
1111
import org.junit.jupiter.api.Assertions.assertEquals
1212
import org.junit.jupiter.api.Test
1313

‎plugins/javadoc/api/javadoc.api

+3-3
Original file line numberDiff line numberDiff line change
@@ -588,16 +588,16 @@ public final class org/jetbrains/dokka/javadoc/pages/TreeViewInstaller : org/jet
588588
}
589589

590590
public final class org/jetbrains/dokka/javadoc/pages/TreeViewPage : org/jetbrains/dokka/javadoc/pages/JavadocPageNode {
591-
public fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Ljava/util/List;Lorg/jetbrains/dokka/pages/PageNode;Lorg/jetbrains/kotlin/analysis/kotlin/internal/InheritanceBuilder;)V
592-
public synthetic fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Ljava/util/List;Lorg/jetbrains/dokka/pages/PageNode;Lorg/jetbrains/kotlin/analysis/kotlin/internal/InheritanceBuilder;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
591+
public fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Ljava/util/List;Lorg/jetbrains/dokka/pages/PageNode;Lorg/jetbrains/dokka/analysis/kotlin/internal/InheritanceBuilder;)V
592+
public synthetic fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Ljava/util/List;Lorg/jetbrains/dokka/pages/PageNode;Lorg/jetbrains/dokka/analysis/kotlin/internal/InheritanceBuilder;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
593593
public fun getChildren ()Ljava/util/List;
594594
public final fun getClasses ()Ljava/util/List;
595595
public fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
596596
public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
597597
public fun getDocumentables ()Ljava/util/List;
598598
public fun getDri ()Ljava/util/Set;
599599
public fun getEmbeddedResources ()Ljava/util/List;
600-
public final fun getInheritanceBuilder ()Lorg/jetbrains/kotlin/analysis/kotlin/internal/InheritanceBuilder;
600+
public final fun getInheritanceBuilder ()Lorg/jetbrains/dokka/analysis/kotlin/internal/InheritanceBuilder;
601601
public final fun getKind ()Ljava/lang/String;
602602
public fun getName ()Ljava/lang/String;
603603
public final fun getPackages ()Ljava/util/List;

‎plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/JavadocPageNodes.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import org.jetbrains.dokka.model.*
77
import org.jetbrains.dokka.model.properties.PropertyContainer
88
import org.jetbrains.dokka.model.properties.WithExtraProperties
99
import org.jetbrains.dokka.pages.*
10-
import org.jetbrains.kotlin.analysis.kotlin.internal.InheritanceBuilder
11-
import org.jetbrains.kotlin.analysis.kotlin.internal.InheritanceNode
10+
import org.jetbrains.dokka.analysis.kotlin.internal.InheritanceBuilder
11+
import org.jetbrains.dokka.analysis.kotlin.internal.InheritanceNode
1212

1313
interface JavadocPageNode : ContentPage, WithDocumentables
1414

‎plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/htmlPreprocessors.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import org.jetbrains.dokka.plugability.DokkaContext
1212
import org.jetbrains.dokka.plugability.plugin
1313
import org.jetbrains.dokka.plugability.querySingle
1414
import org.jetbrains.dokka.transformers.pages.PageTransformer
15-
import org.jetbrains.kotlin.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
15+
import org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
1616

1717
object ResourcesInstaller : PageTransformer {
1818
override fun invoke(input: RootPageNode): RootPageNode = input.modified(

‎plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/renderer/KorteJavadocRenderer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import org.jetbrains.dokka.plugability.plugin
2222
import org.jetbrains.dokka.plugability.query
2323
import org.jetbrains.dokka.plugability.querySingle
2424
import org.jetbrains.dokka.renderers.Renderer
25-
import org.jetbrains.kotlin.analysis.kotlin.internal.InheritanceNode
25+
import org.jetbrains.dokka.analysis.kotlin.internal.InheritanceNode
2626
import java.time.LocalDate
2727

2828
typealias TemplateMap = Map<String, Any?>

‎plugins/kotlin-as-java/api/kotlin-as-java.api

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public final class org/jetbrains/dokka/kotlinAsJava/translators/KotlinAsJavaDocu
9797
}
9898

9999
public final class org/jetbrains/dokka/kotlinAsJava/translators/KotlinAsJavaPageCreator : org/jetbrains/dokka/base/translators/documentables/DefaultPageCreator {
100-
public fun <init> (Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;Lorg/jetbrains/dokka/base/transformers/pages/comments/CommentsToContentConverter;Lorg/jetbrains/dokka/base/signatures/SignatureProvider;Lorg/jetbrains/dokka/utilities/DokkaLogger;Ljava/util/List;Lorg/jetbrains/kotlin/analysis/kotlin/internal/DocumentableSourceLanguageParser;)V
100+
public fun <init> (Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;Lorg/jetbrains/dokka/base/transformers/pages/comments/CommentsToContentConverter;Lorg/jetbrains/dokka/base/signatures/SignatureProvider;Lorg/jetbrains/dokka/utilities/DokkaLogger;Ljava/util/List;Lorg/jetbrains/dokka/analysis/kotlin/internal/DocumentableSourceLanguageParser;)V
101101
public fun pageForProperty (Lorg/jetbrains/dokka/model/DProperty;)Lorg/jetbrains/dokka/pages/MemberPageNode;
102102
}
103103

‎plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import org.jetbrains.dokka.model.properties.PropertyContainer
1111
import org.jetbrains.dokka.plugability.DokkaContext
1212
import org.jetbrains.dokka.plugability.plugin
1313
import org.jetbrains.dokka.plugability.querySingle
14-
import org.jetbrains.kotlin.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
14+
import org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
1515

1616
val jvmNameProvider = JvmNameProvider()
1717
internal const val OBJECT_INSTANCE_NAME = "INSTANCE"

‎plugins/kotlin-as-java/src/main/kotlin/translators/KotlinAsJavaDocumentableToPageTranslator.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.jetbrains.dokka.pages.ModulePageNode
77
import org.jetbrains.dokka.plugability.*
88
import org.jetbrains.dokka.transformers.documentation.DocumentableToPageTranslator
99
import org.jetbrains.dokka.utilities.DokkaLogger
10-
import org.jetbrains.kotlin.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
10+
import org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
1111

1212
class KotlinAsJavaDocumentableToPageTranslator(context: DokkaContext) : DocumentableToPageTranslator {
1313
private val configuration = configuration<DokkaBase, DokkaBaseConfiguration>(context)

‎plugins/kotlin-as-java/src/main/kotlin/translators/KotlinAsJavaPageCreator.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.jetbrains.dokka.base.translators.documentables.DefaultPageCreator
88
import org.jetbrains.dokka.model.DProperty
99
import org.jetbrains.dokka.pages.MemberPageNode
1010
import org.jetbrains.dokka.utilities.DokkaLogger
11-
import org.jetbrains.kotlin.analysis.kotlin.internal.DocumentableSourceLanguageParser
11+
import org.jetbrains.dokka.analysis.kotlin.internal.DocumentableSourceLanguageParser
1212

1313
class KotlinAsJavaPageCreator(
1414
configuration: DokkaBaseConfiguration?,

0 commit comments

Comments
 (0)