Fix dokka-core artifact name for runners

Kotlin · Oct 19, 2023 · 1f50760 · 1f50760
1 parent 0beee0e
commit 1f50760
Show file tree

Hide file tree

Showing 24 changed files with 32 additions and 26 deletions.
diff --git a/dokka-runners/cli/build.gradle.kts b/dokka-runners/cli/build.gradle.kts
@@ -15,8 +15,7 @@ plugins {
 }
 
 dependencies {
-    // TODO [structure-refactoring] the name of the artifact should be `dokka-core`. Add substitution
-    implementation("org.jetbrains.dokka:core")
+    implementation("org.jetbrains.dokka:dokka-core")
     implementation(libs.kotlinx.cli)
 
     testImplementation(kotlin("test"))

diff --git a/dokka-runners/gradle-plugin-classic/build.gradle.kts b/dokka-runners/gradle-plugin-classic/build.gradle.kts
@@ -9,8 +9,7 @@ plugins {
 }
 
 dependencies {
-    // TODO [structure-refactoring] the name of the artifact should be `dokka-core`. Add substitution
-    api("org.jetbrains.dokka:core")
+    api("org.jetbrains.dokka:dokka-core")
 
     compileOnly(libs.gradlePlugin.kotlin)
     compileOnly(libs.gradlePlugin.kotlin.klibCommonizerApi)

diff --git a/dokka-runners/maven-plugin/build.gradle.kts b/dokka-runners/maven-plugin/build.gradle.kts
@@ -11,8 +11,7 @@ plugins {
 }
 
 dependencies {
-    // TODO [structure-refactoring] the name of the artifact should be `dokka-core`. Add substitution
-    implementation("org.jetbrains.dokka:core")
+    implementation("org.jetbrains.dokka:dokka-core")
 
     implementation(libs.apacheMaven.core)
     implementation(libs.apacheMaven.pluginApi)

diff --git a/dokka-subprojects/analysis-java-psi/build.gradle.kts b/dokka-subprojects/analysis-java-psi/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     api(libs.intellij.java.psi.api)
 

diff --git a/dokka-subprojects/analysis-kotlin-api/build.gradle.kts b/dokka-subprojects/analysis-kotlin-api/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 }
 
 registerDokkaArtifactPublication("analysisKotlinApi") {

diff --git a/dokka-subprojects/analysis-kotlin-descriptors-compiler/build.gradle.kts b/dokka-subprojects/analysis-kotlin-descriptors-compiler/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.analysisKotlinApi)
 
     api(libs.kotlin.compiler)

diff --git a/dokka-subprojects/analysis-kotlin-descriptors-ide/build.gradle.kts b/dokka-subprojects/analysis-kotlin-descriptors-ide/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.analysisKotlinApi)
 
     implementation(projects.analysisKotlinDescriptorsCompiler)

diff --git a/dokka-subprojects/analysis-kotlin-symbols/build.gradle.kts b/dokka-subprojects/analysis-kotlin-symbols/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.analysisKotlinApi)
 
     implementation(projects.analysisMarkdownJb)

diff --git a/dokka-subprojects/analysis-markdown-jb/build.gradle.kts b/dokka-subprojects/analysis-markdown-jb/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(libs.jsoup)
     implementation(libs.jetbrains.markdown)

diff --git a/dokka-subprojects/core-test-api/build.gradle.kts b/dokka-subprojects/core-test-api/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    api(projects.core)
+    api(projects.dokkaCore)
 
     implementation(kotlin("reflect"))
 }

diff --git a/dokka-subprojects/plugin-all-modules-page/build.gradle.kts b/dokka-subprojects/plugin-all-modules-page/build.gradle.kts
@@ -14,7 +14,7 @@ registerDokkaArtifactPublication("dokkaAllModulesPage") {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.analysisKotlinApi)
 
     implementation(projects.pluginBase)

diff --git a/dokka-subprojects/plugin-android-documentation/build.gradle.kts b/dokka-subprojects/plugin-android-documentation/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(projects.pluginBase)
 

diff --git a/dokka-subprojects/plugin-base-test-utils/build.gradle.kts b/dokka-subprojects/plugin-base-test-utils/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.pluginBase)
 
     api(projects.analysisKotlinApi)

diff --git a/dokka-subprojects/plugin-base/build.gradle.kts b/dokka-subprojects/plugin-base/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.analysisKotlinApi)
 
     implementation(projects.analysisMarkdownJb)

diff --git a/dokka-subprojects/plugin-gfm-template-processing/build.gradle.kts b/dokka-subprojects/plugin-gfm-template-processing/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(projects.pluginBase)
     implementation(projects.pluginGfm)

diff --git a/dokka-subprojects/plugin-gfm/build.gradle.kts b/dokka-subprojects/plugin-gfm/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(projects.pluginBase)
 

diff --git a/dokka-subprojects/plugin-javadoc/build.gradle.kts b/dokka-subprojects/plugin-javadoc/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.analysisKotlinApi)
 
     implementation(projects.pluginBase)

diff --git a/dokka-subprojects/plugin-jekyll-template-processing/build.gradle.kts b/dokka-subprojects/plugin-jekyll-template-processing/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(projects.pluginBase)
     implementation(projects.pluginJekyll)

diff --git a/dokka-subprojects/plugin-jekyll/build.gradle.kts b/dokka-subprojects/plugin-jekyll/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(projects.pluginBase)
     implementation(projects.pluginGfm)

diff --git a/dokka-subprojects/plugin-kotlin-as-java/build.gradle.kts b/dokka-subprojects/plugin-kotlin-as-java/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.analysisKotlinApi)
 
     implementation(projects.pluginBase)

diff --git a/dokka-subprojects/plugin-mathjax/build.gradle.kts b/dokka-subprojects/plugin-mathjax/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(projects.pluginBase)
 

diff --git a/dokka-subprojects/plugin-templating/build.gradle.kts b/dokka-subprojects/plugin-templating/build.gradle.kts
@@ -14,7 +14,7 @@ registerDokkaArtifactPublication("templating-plugin") {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     api(libs.jsoup)
 

diff --git a/dokka-subprojects/plugin-versioning/build.gradle.kts b/dokka-subprojects/plugin-versioning/build.gradle.kts
@@ -14,7 +14,7 @@ registerDokkaArtifactPublication("versioning-plugin") {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(projects.pluginBase)
     implementation(projects.pluginTemplating)

diff --git a/dokka-subprojects/settings.gradle.kts b/dokka-subprojects/settings.gradle.kts
@@ -88,3 +88,12 @@ include(
     ":plugin-templating",
     ":plugin-versioning",
 )
+
+// TODO [structure-refactoring]
+//  this is required for included build support
+//  the name of the artifact published now is `dokka-core`, but module named `core`
+//  dependency substitution in this case doesn't work for some reason
+//  may be we fall here in one of the unsupported cases:
+//  https://docs.gradle.org/current/userguide/composite_builds.html#included_build_substitution_limitations
+//  may be we need to find some other solution for this
+project(":core").name = "dokka-core"