fix dokka-base-test-utils exposing runtime dependency on descriptors …

…analysis (#3621)
Kotlin · May 30, 2024 · 5a9e236 · 5a9e236
1 parent 52ff374
commit 5a9e236
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
 }