KT-71019 Fix stdlib-common dependency when building docs with legacy Dokka
diff --git a/libraries/tools/kotlin-stdlib-docs-legacy/build-docs.xml b/libraries/tools/kotlin-stdlib-docs-legacy/build-docs.xml index 854bb7c..2d08112 100644 --- a/libraries/tools/kotlin-stdlib-docs-legacy/build-docs.xml +++ b/libraries/tools/kotlin-stdlib-docs-legacy/build-docs.xml
@@ -56,11 +56,6 @@ <!--<pathelement location="${basedir}/lib/junit-4.11.jar"/>--> </path> - <path id="kotlin-test-common.classpath"> - <fileset dir="${kotlin_libs}/kotlin-test-common" includes="*.jar"/> - <!--<pathelement location="${basedir}/lib/junit-4.11.jar"/>--> - </path> - <path id="kotlin-test-junit.classpath"> <fileset dir="${kotlin_libs}/kotlin-test-junit" includes="*.jar"/> <!--<pathelement location="${basedir}/lib/junit-4.11.jar"/>--> @@ -296,7 +291,7 @@ jdkversion="8" analysisplatform="common" noStdlibLink="true" - classpathref="kotlin-test-common.classpath" + classpathref="stdlib-common.classpath" languageVersion="${language.version}" includeRootPackage="false" sincekotlin="1.0">
diff --git a/libraries/tools/kotlin-stdlib-docs-legacy/kotlin_big/build.gradle b/libraries/tools/kotlin-stdlib-docs-legacy/kotlin_big/build.gradle index 0f14b0b..1cb0741 100644 --- a/libraries/tools/kotlin-stdlib-docs-legacy/kotlin_big/build.gradle +++ b/libraries/tools/kotlin-stdlib-docs-legacy/kotlin_big/build.gradle
@@ -40,7 +40,6 @@ "kotlin-test-junit5", "kotlin-test-junit", "kotlin-test-testng", - "kotlin-test-common", ] @@ -59,6 +58,13 @@ } } + if (module == "kotlin-stdlib-common") { + lib_src.attributes { + attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, "kotlin-api")) + attribute(Attribute.of("org.jetbrains.kotlin.platform.type", String), "common") + } + } + dependencies { "$lib"(group: 'org.jetbrains.kotlin', name: module, version: kotlinVersion) }