diff --git a/dokka-integration-tests/cli/src/cliIntegrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt b/dokka-integration-tests/cli/src/cliIntegrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt index 9a4caedf91..ad6f77e92a 100644 --- a/dokka-integration-tests/cli/src/cliIntegrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt +++ b/dokka-integration-tests/cli/src/cliIntegrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt @@ -344,8 +344,8 @@ class CliIntegrationTest : AbstractCliIntegrationTest() { "packageListUrl": "https://docs.oracle.com/javase/8/docs/api/package-list" }, { - "url": "https://kotlinlang.org/api/latest/jvm/stdlib/", - "packageListUrl": "https://kotlinlang.org/api/latest/jvm/stdlib/package-list" + "url": "https://kotlinlang.org/api/core/", + "packageListUrl": "https://kotlinlang.org/api/core/package-list" } """.trimIndent(), globalPerPackageOptions = """ diff --git a/dokka-runners/runner-maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/ExternalDocumentationLinkBuilder.kt b/dokka-runners/runner-maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/ExternalDocumentationLinkBuilder.kt index 6c1ec2f61a..e168611e68 100644 --- a/dokka-runners/runner-maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/ExternalDocumentationLinkBuilder.kt +++ b/dokka-runners/runner-maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/ExternalDocumentationLinkBuilder.kt @@ -25,7 +25,7 @@ import java.net.URL * ```xml * * - * https://kotlinlang.org/api/latest/jvm/stdlib/ + * https://kotlinlang.org/api/core/ * file:/${project.basedir}/stdlib.package.list * * @@ -45,7 +45,7 @@ public class ExternalDocumentationLinkBuilder { * Example: * * ```xml - * https://kotlinlang.org/api/latest/jvm/stdlib/ + * https://kotlinlang.org/api/core/ * ``` */ @Parameter(name = "url", required = true) diff --git a/dokka-subprojects/analysis-kotlin-api/src/test/kotlin/org/jetbrains/dokka/analysis/test/sample/SampleRewriterTest.kt b/dokka-subprojects/analysis-kotlin-api/src/test/kotlin/org/jetbrains/dokka/analysis/test/sample/SampleRewriterTest.kt index cb12a139c9..da98f614a9 100644 --- a/dokka-subprojects/analysis-kotlin-api/src/test/kotlin/org/jetbrains/dokka/analysis/test/sample/SampleRewriterTest.kt +++ b/dokka-subprojects/analysis-kotlin-api/src/test/kotlin/org/jetbrains/dokka/analysis/test/sample/SampleRewriterTest.kt @@ -134,7 +134,7 @@ class SampleRewriterTest { sampleFile("/samples/_sampleUtils.kt", fqPackageName = "samples") { +sampleUtilsKT } - // the sample is from https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/is-not-empty.html + // the sample is from https://kotlinlang.org/api/core/kotlin.collections/is-not-empty.html sampleFile("/samples/collections/collections.kt", fqPackageName = "samples.collections") { +""" import samples.* @@ -192,7 +192,7 @@ class SampleRewriterTest { sampleFile("/samples/_sampleUtils.kt", fqPackageName = "samples") { +sampleUtilsKT } - // the sample is from https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/indices.html + // the sample is from https://kotlinlang.org/api/core/kotlin.collections/indices.html sampleFile("/samples/collections/collections.kt", fqPackageName = "samples.collections") { +""" import samples.* @@ -253,7 +253,7 @@ class SampleRewriterTest { sampleFile("/samples/_sampleUtils.kt", fqPackageName = "samples") { +sampleUtilsKT } - // the sample is from https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/last.html + // the sample is from https://kotlinlang.org/api/core/kotlin.collections/last.html sampleFile("/samples/collections/collections.kt", fqPackageName = "samples.collections") { +""" import samples.* @@ -323,7 +323,7 @@ class SampleRewriterTest { sampleFile("/samples/_sampleUtils.kt", fqPackageName = "samples") { +sampleUtilsKT } - // the sample is from https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/element-at.html + // the sample is from https://kotlinlang.org/api/core/kotlin.collections/element-at.html sampleFile("/samples/collections/collections.kt", fqPackageName = "samples.collections") { +""" import samples.* diff --git a/dokka-subprojects/core-test-api/src/main/kotlin/org/jetbrains/dokka/testApi/testRunner/TestRunner.kt b/dokka-subprojects/core-test-api/src/main/kotlin/org/jetbrains/dokka/testApi/testRunner/TestRunner.kt index 46e0a2cc2d..64331334b4 100644 --- a/dokka-subprojects/core-test-api/src/main/kotlin/org/jetbrains/dokka/testApi/testRunner/TestRunner.kt +++ b/dokka-subprojects/core-test-api/src/main/kotlin/org/jetbrains/dokka/testApi/testRunner/TestRunner.kt @@ -199,8 +199,8 @@ public abstract class AbstractTest, D : Dokk } protected val stdlibExternalDocumentationLink: ExternalDocumentationLinkImpl = ExternalDocumentationLinkImpl( - URL("https://kotlinlang.org/api/latest/jvm/stdlib/"), - URL("https://kotlinlang.org/api/latest/jvm/stdlib/package-list") + URL("https://kotlinlang.org/api/core/"), + URL("https://kotlinlang.org/api/core/package-list") ) public companion object { diff --git a/dokka-subprojects/plugin-base/src/test/kotlin/locationProvider/DefaultExternalLocationProviderTest.kt b/dokka-subprojects/plugin-base/src/test/kotlin/locationProvider/DefaultExternalLocationProviderTest.kt index aaf63e7eef..6535031e7c 100644 --- a/dokka-subprojects/plugin-base/src/test/kotlin/locationProvider/DefaultExternalLocationProviderTest.kt +++ b/dokka-subprojects/plugin-base/src/test/kotlin/locationProvider/DefaultExternalLocationProviderTest.kt @@ -19,7 +19,7 @@ import kotlin.test.assertEquals class DefaultExternalLocationProviderTest : BaseAbstractTest() { private val testDataDir = getTestDataDir("locationProvider").toAbsolutePath().toString().removePrefix("/").let { "/$it" } - private val kotlinLang = "https://kotlinlang.org/api/latest/jvm/stdlib" + private val kotlinLang = "https://kotlinlang.org/api/core" private val packageListURL = URL("file://$testDataDir/stdlib-package-list") private val configuration = dokkaConfiguration { sourceSets { diff --git a/dokka-subprojects/plugin-base/src/test/kotlin/locationProvider/Dokka010ExternalLocationProviderTest.kt b/dokka-subprojects/plugin-base/src/test/kotlin/locationProvider/Dokka010ExternalLocationProviderTest.kt index 726c139544..0d1881ff03 100644 --- a/dokka-subprojects/plugin-base/src/test/kotlin/locationProvider/Dokka010ExternalLocationProviderTest.kt +++ b/dokka-subprojects/plugin-base/src/test/kotlin/locationProvider/Dokka010ExternalLocationProviderTest.kt @@ -19,7 +19,7 @@ import kotlin.test.assertEquals class Dokka010ExternalLocationProviderTest : BaseAbstractTest() { private val testDataDir = getTestDataDir("locationProvider").toAbsolutePath().toString().removePrefix("/").let { "/$it" } - private val kotlinLang = "https://kotlinlang.org/api/latest/jvm/stdlib" + private val kotlinLang = "https://kotlinlang.org/api/core" private val packageListURL = URL("file://$testDataDir/old-package-list") private val configuration = dokkaConfiguration { sourceSets { diff --git a/dokka-subprojects/plugin-base/src/test/kotlin/locationProvider/MultiModuleLinkingTest.kt b/dokka-subprojects/plugin-base/src/test/kotlin/locationProvider/MultiModuleLinkingTest.kt index 375deaa8ba..ff2be29afc 100644 --- a/dokka-subprojects/plugin-base/src/test/kotlin/locationProvider/MultiModuleLinkingTest.kt +++ b/dokka-subprojects/plugin-base/src/test/kotlin/locationProvider/MultiModuleLinkingTest.kt @@ -19,7 +19,7 @@ class MultiModuleLinkingTest : BaseAbstractTest() { getTestDataDir("locationProvider").toAbsolutePath().toString().removePrefix("/").let { "/$it" } private val exampleDomain = "https://example.com" private val packageListURL = URL("file://$testDataDir/multi-module-package-list") - private val kotlinLang = "https://kotlinlang.org/api/latest/jvm/stdlib" + private val kotlinLang = "https://kotlinlang.org/api/core" private val stdlibPackageListURL = URL("file://$testDataDir/stdlib-package-list") private val configuration = dokkaConfiguration { sourceSets { diff --git a/dokka-subprojects/plugin-base/src/test/kotlin/signatures/SignatureTest.kt b/dokka-subprojects/plugin-base/src/test/kotlin/signatures/SignatureTest.kt index cb4dee82ca..92b0e031ad 100644 --- a/dokka-subprojects/plugin-base/src/test/kotlin/signatures/SignatureTest.kt +++ b/dokka-subprojects/plugin-base/src/test/kotlin/signatures/SignatureTest.kt @@ -237,7 +237,7 @@ class SignatureTest : BaseAbstractTest() { } renderingStage = { _, _ -> val signature = writerPlugin.writer.renderedContent("root/example/elvis-like.html") - assertEquals(2, signature.select("a[href=\"https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-any/index.html\"]").size) + assertEquals(2, signature.select("a[href=\"https://kotlinlang.org/api/core/kotlin/-any/index.html\"]").size) signature.firstSignature().match( "fun <", A("T"), "> ", A("elvisLike"), "(", @@ -743,7 +743,7 @@ class SignatureTest : BaseAbstractTest() { renderingStage = { _, _ -> assertEquals( writerPlugin.writer.renderedContent("root/example/-data-class/index.html").lastSignature().html(), - "val arg: String" + "val arg: String" ) } diff --git a/dokka-subprojects/plugin-javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/location/JavadocLocationTest.kt b/dokka-subprojects/plugin-javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/location/JavadocLocationTest.kt index 5677edc36a..33929deec5 100644 --- a/dokka-subprojects/plugin-javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/location/JavadocLocationTest.kt +++ b/dokka-subprojects/plugin-javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/location/JavadocLocationTest.kt @@ -188,7 +188,7 @@ class JavadocLocationTest : BaseAbstractTest() { ) val methodSignatureHtml = transformer.htmlForContentNode(methodWithTypealiasParam.signature, null) - val expectedSignatureHtml = "final Unit " + + val expectedSignatureHtml = "final Unit " + "withTypealias" + "(String typeAliasParam)" @@ -216,8 +216,8 @@ class JavadocLocationTest : BaseAbstractTest() { ) val methodSignatureHtml = transformer.htmlForContentNode(methodWithVoidParam.signature, null) - val expectedSignatureHtml = "final <T extends Any> " + - "Unit " + + val expectedSignatureHtml = "final <T extends Any> " + + "Unit " + "withDefinitelyNonNullableType" + "(T definitelyNonNullable)" diff --git a/dokka-subprojects/plugin-javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/validity/MultiplatformConfiguredCheckerTest.kt b/dokka-subprojects/plugin-javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/validity/MultiplatformConfiguredCheckerTest.kt index da059b68bd..82b29dc59a 100644 --- a/dokka-subprojects/plugin-javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/validity/MultiplatformConfiguredCheckerTest.kt +++ b/dokka-subprojects/plugin-javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/validity/MultiplatformConfiguredCheckerTest.kt @@ -23,7 +23,7 @@ class MultiplatformConfiguredCheckerTest : BaseAbstractTest() { analysisPlatform = "jvm" externalDocumentationLinks = listOf( ExternalDocumentationLink("https://docs.oracle.com/javase/8/docs/api/"), - ExternalDocumentationLink("https://kotlinlang.org/api/latest/jvm/stdlib/") + ExternalDocumentationLink("https://kotlinlang.org/api/core/") ) } sourceSet { @@ -32,7 +32,7 @@ class MultiplatformConfiguredCheckerTest : BaseAbstractTest() { analysisPlatform = "js" externalDocumentationLinks = listOf( ExternalDocumentationLink("https://docs.oracle.com/javase/8/docs/api/"), - ExternalDocumentationLink("https://kotlinlang.org/api/latest/jvm/stdlib/") + ExternalDocumentationLink("https://kotlinlang.org/api/core/") ) } } @@ -46,7 +46,7 @@ class MultiplatformConfiguredCheckerTest : BaseAbstractTest() { analysisPlatform = "jvm" externalDocumentationLinks = listOf( ExternalDocumentationLink("https://docs.oracle.com/javase/8/docs/api/"), - ExternalDocumentationLink("https://kotlinlang.org/api/latest/jvm/stdlib/") + ExternalDocumentationLink("https://kotlinlang.org/api/core/") ) } }