Skip to content

Commit 1feca7d

Browse files
committed
Migrate to Dokka v2
1 parent efec544 commit 1feca7d

4 files changed

Lines changed: 16 additions & 10 deletions

File tree

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
run: chmod +x gradlew
2828

2929
- name: Generate aggregated Dokka docs
30-
run: ./gradlew dokkaHtmlMultiModule
30+
run: ./gradlew dokkaGenerateHtml
3131

3232
- name: Upload artifact for GitHub Pages
3333
uses: actions/upload-pages-artifact@v3
3434
with:
35-
path: build/dokka/htmlMultiModule
35+
path: build/dokka/html
3636

3737
- name: Deploy to GitHub Pages
3838
uses: actions/deploy-pages@v4

build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import com.diffplug.spotless.LineEnding
2-
import org.jetbrains.dokka.gradle.DokkaTask
32

43
plugins {
54
`java-library`
@@ -25,7 +24,12 @@ allprojects {
2524
}
2625
}
2726

28-
tasks.withType<DokkaTask>().configureEach {
27+
dependencies {
28+
dokka(project(":fastutil4k-extensions-only"))
29+
dokka(project(":fastutil4k-more-collections"))
30+
}
31+
32+
dokka {
2933
dokkaSourceSets.configureEach {
3034
jdkVersion.set(8)
3135
}

fastutil4k-extensions-only/build.gradle.kts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.dokka.gradle.tasks.DokkaBaseTask
2+
13
plugins {
24
id("fastutil-ext-generator")
35
}
@@ -15,10 +17,12 @@ kotlin {
1517
}
1618
}
1719

18-
tasks.dokkaHtmlPartial {
19-
dependsOn("generate-all")
20-
20+
dokka {
2121
dokkaSourceSets.configureEach {
2222
sourceRoots.from(fastutilGeneratorOutput)
2323
}
2424
}
25+
26+
tasks.withType<DokkaBaseTask>().configureEach {
27+
dependsOn("generate-all")
28+
}

gradle/libs.versions.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
[versions]
22
fastutil = "8.5.15"
3-
joml = "1.10.8"
43

54
kotlin = "2.0.0"
6-
dokka = "2.0.0"
5+
dokka = "2.1.0"
76

87
[libraries]
98
fastutil = { module = "it.unimi.dsi:fastutil", version.ref = "fastutil" }
10-
joml = { module = "org.joml:joml", version.ref = "joml" }
119

1210
[plugins]
1311
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

0 commit comments

Comments
 (0)