Skip to content

Commit 4ae9b5d

Browse files
Upgrade dokka-gradle-plugin to v2.1.0. (#314)
1 parent 9661ae6 commit 4ae9b5d

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

buildSrc/src/main/kotlin/tools.aqua.stars.library-conventions.gradle.kts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ detekt {
6363
val kdocJar: TaskProvider<Jar> by
6464
tasks.registering(Jar::class) {
6565
archiveClassifier.set("kdoc")
66-
from(tasks.dokkaHtml.flatMap { it.outputDirectory })
66+
from(tasks.dokkaGenerateHtml)
6767
}
6868

6969
val kdoc: Configuration by
@@ -85,17 +85,10 @@ artifacts {
8585
add(tests.name, testJar.get())
8686
}
8787

88-
val javadocJar: TaskProvider<Jar> by
89-
tasks.registering(Jar::class) {
90-
archiveClassifier.set("javadoc")
91-
from(tasks.dokkaJavadoc.flatMap { it.outputDirectory })
92-
}
93-
9488
// black magic from https://github.com/gradle/gradle/issues/15383
9589
val libs = the<LibrariesForLibs>()
9690

9791
dependencies {
98-
dokkaGfmPlugin(libs.dokka.javadoc)
9992
testImplementation(libs.kotlin.test)
10093
detektPlugins(libs.detekt.rules.libraries)
10194
}

gradle/libs.versions.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,14 @@ kotlin-test = { group = "org.jetbrains.kotlin", name="kotlin-test" }
2121

2222
# Gradle Plugins
2323
gradle-kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version = "2.3.10" }
24-
gradle-dokka = { group = "org.jetbrains.dokka", name = "dokka-gradle-plugin", version = "1.9.20" }
24+
gradle-dokka = { group = "org.jetbrains.dokka", name = "dokka-gradle-plugin", version = "2.1.0" }
2525
gradle-detekt = { group = "io.gitlab.arturbosch.detekt", name = "detekt-gradle-plugin", version = "1.23.8" }
2626
gradle-bmVersions = { group = "com.github.ben-manes", name = "gradle-versions-plugin", version = "0.53.0" }
2727
gradle-gitVersioning = { group = "me.qoomon", name = "gradle-git-versioning-plugin", version = "6.4.4" }
2828
gradle-taskTree = { group = "com.dorongold.plugins", name = "task-tree", version = "4.0.1" }
2929
gradle-spotless = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version = "8.2.0" }
3030
gradle-mavenPublish = { group = "com.vanniktech.maven.publish", name = "com.vanniktech.maven.publish.gradle.plugin", version = "0.35.0" }
3131

32-
# Other
33-
dokka-javadoc = { group = "org.jetbrains.dokka", name = "kotlin-as-java-plugin", version = "2.1.0" }
34-
3532
# JUnit
3633
junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version = "6.0.2" }
3734

0 commit comments

Comments
 (0)