Skip to content

Commit 98c4dc7

Browse files
committed
back to dokka v1
1 parent c704c09 commit 98c4dc7

File tree

3 files changed

+7
-24
lines changed

3 files changed

+7
-24
lines changed

.github/workflows/github-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
java-version: 17
3737

3838
- name: Generate Dokka HTML docs
39-
run: ./gradlew :dokkaGenerate
39+
run: ./gradlew :dokkaHtml
4040

4141
- name: Setup Pages
4242
uses: actions/configure-pages@v5

build.gradle.kts

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -285,27 +285,11 @@ tasks {
285285

286286
// Docs
287287

288-
tasks.register("javadocJar", Jar::class) {
289-
archiveClassifier.set("javadoc")
290-
}
291-
292-
dependencies {
293-
dokka(project(":"))
294-
}
295-
296-
dokka {
297-
moduleName.set("kotlin-logging")
298-
dokkaSourceSets {
299-
configureEach {
300-
sourceLink {
301-
localDirectory.set(project.projectDir.resolve("src"))
302-
remoteUrl.set(uri("https://github.com/oshai/kotlin-logging/tree/master/src"))
303-
remoteLineSuffix.set("#L")
304-
}
305-
}
306-
}
307-
dokkaPublications.html {
308-
outputDirectory.set(project.layout.buildDirectory.dir("dokka"))
288+
tasks {
289+
register<Jar>("dokkaJar") {
290+
from(dokkaHtml)
291+
dependsOn(dokkaHtml)
292+
archiveClassifier.set("javadoc")
309293
}
310294
}
311295

@@ -373,7 +357,7 @@ publishing {
373357
url.set("https://github.com/oshai/kotlin-logging/tree/master")
374358
}
375359
}
376-
360+
artifact(tasks["dokkaJar"])
377361
}
378362
}
379363

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ org.gradle.jvmargs=-Xmx2048m
44
# see https://kotlinlang.org/docs/whatsnew18.html#sourcedirectories
55
kotlin.mpp.androidSourceSetLayoutVersion=2
66
kotlin.mpp.applyDefaultHierarchyTemplate=false
7-
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

0 commit comments

Comments
 (0)