From 5a9e236f6cf06203c5424c2a3b4ba03d586dca95 Mon Sep 17 00:00:00 2001 From: Oleg Yukhnevich Date: Thu, 30 May 2024 10:52:24 +0300 Subject: [PATCH] fix dokka-base-test-utils exposing runtime dependency on descriptors analysis (#3621) --- .../plugin-all-modules-page/build.gradle.kts | 4 ++++ .../plugin-android-documentation/build.gradle.kts | 4 +--- .../plugin-base-test-utils/build.gradle.kts | 4 ---- dokka-subprojects/plugin-base/build.gradle.kts | 11 ++--------- dokka-subprojects/plugin-javadoc/build.gradle.kts | 4 +--- .../plugin-kotlin-as-java/build.gradle.kts | 4 +--- dokka-subprojects/plugin-mathjax/build.gradle.kts | 4 +--- 7 files changed, 10 insertions(+), 25 deletions(-) diff --git a/dokka-subprojects/plugin-all-modules-page/build.gradle.kts b/dokka-subprojects/plugin-all-modules-page/build.gradle.kts index 71c6619046..dfff1b69a8 100644 --- a/dokka-subprojects/plugin-all-modules-page/build.gradle.kts +++ b/dokka-subprojects/plugin-all-modules-page/build.gradle.kts @@ -7,6 +7,7 @@ import dokkabuild.overridePublicationArtifactId plugins { id("dokkabuild.kotlin-jvm") id("dokkabuild.publish-jvm") + id("dokkabuild.test-k2") } overridePublicationArtifactId("all-modules-page-plugin") @@ -29,4 +30,7 @@ dependencies { testImplementation(projects.dokkaSubprojects.pluginGfmTemplateProcessing) testImplementation(projects.dokkaSubprojects.coreContentMatcherTestUtils) testImplementation(projects.dokkaSubprojects.dokkaTestApi) + + symbolsTestImplementation(project(path = ":dokka-subprojects:analysis-kotlin-symbols", configuration = "shadow")) + descriptorsTestImplementation(project(path = ":dokka-subprojects:analysis-kotlin-descriptors", configuration = "shadow")) } diff --git a/dokka-subprojects/plugin-android-documentation/build.gradle.kts b/dokka-subprojects/plugin-android-documentation/build.gradle.kts index 66e3f24879..7927c7de44 100644 --- a/dokka-subprojects/plugin-android-documentation/build.gradle.kts +++ b/dokka-subprojects/plugin-android-documentation/build.gradle.kts @@ -25,7 +25,5 @@ dependencies { symbolsTestImplementation(project(path = ":dokka-subprojects:analysis-kotlin-symbols", configuration = "shadow")) descriptorsTestImplementation(project(path = ":dokka-subprojects:analysis-kotlin-descriptors", configuration = "shadow")) - testImplementation(projects.dokkaSubprojects.pluginBaseTestUtils) { - exclude(module = "analysis-kotlin-descriptors") - } + testImplementation(projects.dokkaSubprojects.pluginBaseTestUtils) } diff --git a/dokka-subprojects/plugin-base-test-utils/build.gradle.kts b/dokka-subprojects/plugin-base-test-utils/build.gradle.kts index 62494f75b6..868d957f08 100644 --- a/dokka-subprojects/plugin-base-test-utils/build.gradle.kts +++ b/dokka-subprojects/plugin-base-test-utils/build.gradle.kts @@ -17,10 +17,6 @@ dependencies { api(projects.dokkaSubprojects.analysisKotlinApi) - // TODO [beresnev] analysis switcher - //runtimeOnly(project(path = ":subprojects:analysis-kotlin-symbols", configuration = "shadow")) - runtimeOnly(project(path = ":dokka-subprojects:analysis-kotlin-descriptors", configuration = "shadow")) - implementation(kotlin("reflect")) implementation(libs.jsoup) diff --git a/dokka-subprojects/plugin-base/build.gradle.kts b/dokka-subprojects/plugin-base/build.gradle.kts index 58dc8d6764..8246c7594f 100644 --- a/dokka-subprojects/plugin-base/build.gradle.kts +++ b/dokka-subprojects/plugin-base/build.gradle.kts @@ -37,15 +37,8 @@ dependencies { testImplementation(libs.junit.jupiterParams) symbolsTestImplementation(project(path = ":dokka-subprojects:analysis-kotlin-symbols", configuration = "shadow")) - descriptorsTestImplementation( - project( - path = ":dokka-subprojects:analysis-kotlin-descriptors", - configuration = "shadow" - ) - ) - testImplementation(projects.dokkaSubprojects.pluginBaseTestUtils) { - exclude(module = "analysis-kotlin-descriptors") - } + descriptorsTestImplementation(project(path = ":dokka-subprojects:analysis-kotlin-descriptors", configuration = "shadow")) + testImplementation(projects.dokkaSubprojects.pluginBaseTestUtils) testImplementation(projects.dokkaSubprojects.coreContentMatcherTestUtils) testImplementation(projects.dokkaSubprojects.dokkaTestApi) testImplementation(projects.dokkaSubprojects.analysisKotlinApi) diff --git a/dokka-subprojects/plugin-javadoc/build.gradle.kts b/dokka-subprojects/plugin-javadoc/build.gradle.kts index 7953e69485..976172118c 100644 --- a/dokka-subprojects/plugin-javadoc/build.gradle.kts +++ b/dokka-subprojects/plugin-javadoc/build.gradle.kts @@ -27,9 +27,7 @@ dependencies { testImplementation(kotlin("test")) symbolsTestImplementation(project(path = ":dokka-subprojects:analysis-kotlin-symbols", configuration = "shadow")) descriptorsTestImplementation(project(path = ":dokka-subprojects:analysis-kotlin-descriptors", configuration = "shadow")) - testImplementation(projects.dokkaSubprojects.pluginBaseTestUtils) { - exclude(module = "analysis-kotlin-descriptors") - } + testImplementation(projects.dokkaSubprojects.pluginBaseTestUtils) testImplementation(projects.dokkaSubprojects.dokkaTestApi) testImplementation(libs.jsoup) } diff --git a/dokka-subprojects/plugin-kotlin-as-java/build.gradle.kts b/dokka-subprojects/plugin-kotlin-as-java/build.gradle.kts index 38c7f0cff8..6969c57060 100644 --- a/dokka-subprojects/plugin-kotlin-as-java/build.gradle.kts +++ b/dokka-subprojects/plugin-kotlin-as-java/build.gradle.kts @@ -25,9 +25,7 @@ dependencies { testImplementation(projects.dokkaSubprojects.pluginBase) symbolsTestImplementation(project(path = ":dokka-subprojects:analysis-kotlin-symbols", configuration = "shadow")) descriptorsTestImplementation(project(path = ":dokka-subprojects:analysis-kotlin-descriptors", configuration = "shadow")) - testImplementation(projects.dokkaSubprojects.pluginBaseTestUtils) { - exclude(module = "analysis-kotlin-descriptors") - } + testImplementation(projects.dokkaSubprojects.pluginBaseTestUtils) testImplementation(projects.dokkaSubprojects.coreContentMatcherTestUtils) testImplementation(projects.dokkaSubprojects.dokkaTestApi) } diff --git a/dokka-subprojects/plugin-mathjax/build.gradle.kts b/dokka-subprojects/plugin-mathjax/build.gradle.kts index f7dd6f9937..2268527d86 100644 --- a/dokka-subprojects/plugin-mathjax/build.gradle.kts +++ b/dokka-subprojects/plugin-mathjax/build.gradle.kts @@ -26,7 +26,5 @@ dependencies { symbolsTestImplementation(project(path = ":dokka-subprojects:analysis-kotlin-symbols", configuration = "shadow")) descriptorsTestImplementation(project(path = ":dokka-subprojects:analysis-kotlin-descriptors", configuration = "shadow")) - testImplementation(projects.dokkaSubprojects.pluginBaseTestUtils) { - exclude(module = "analysis-kotlin-descriptors") - } + testImplementation(projects.dokkaSubprojects.pluginBaseTestUtils) }