Skip to content

Commit ac4c355

Browse files
committed
Re-enable dokka
1 parent e1d381e commit ac4c355

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ updates:
33
- package-ecosystem: "github-actions"
44
directory: "/"
55
schedule:
6-
interval: "daily"
6+
interval: "weekly"
77
- package-ecosystem: "gradle"
88
directory: "/"
99
schedule:
10-
interval: "daily"
10+
interval: "weekly"

.github/workflows/release.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ jobs:
109109
**/build/reports
110110
111111
- name: Gradle Assemble Dokka
112-
# TODO enable once dokka is fixed
113-
if: ${{ runner.os == 'Linux' && false }}
112+
if: ${{ runner.os == 'Linux' }}
114113
run: ./gradlew dokkaHtmlMultiModule -Pversion=${VERSION//v} --scan
115114

116115
- uses: actions/upload-artifact@v2
@@ -217,8 +216,7 @@ jobs:
217216
release-Dokka:
218217
runs-on: ubuntu-latest
219218
needs: [ build ]
220-
# TODO enable when dokka is fixed
221-
if: ${{ github.event.inputs.skipPages != 'y' && false }}
219+
if: ${{ github.event.inputs.skipPages != 'y' }}
222220
steps:
223221
- uses: actions/download-artifact@v2
224222
with:

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ plugins {
33
id("plugin.git-hooks")
44
}
55
id("plugin.publishing-nexus")
6+
id("org.jetbrains.dokka")
67
}
78

89
gradleEnterprise {

buildSrc/src/main/kotlin/plugin.publishing.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ tasks {
1616
withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach { dependsOn(jsMainClasses) }
1717

1818
register<Jar>("javadocJar") {
19-
// TODO uncomment once https://github.com/Kotlin/dokka/pull/2258 is released
20-
// dependsOn(dokkaHtml)
21-
// from(dokkaHtml)
19+
dependsOn(dokkaHtml)
20+
from(dokkaHtml)
2221
archiveClassifier.set("javadoc")
2322
}
2423
withType<Jar> {

kmdc/kmdc-segmented-button/src/jsMain/kotlin/MDCSegmentedButton.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@ public external object MDCSegmentedButtonModule {
2727
}
2828

2929
public val segments: Array<MDCSegmentedButtonSegment>
30-
public fun initialize(segmentFactory: (el: Element, foundation: dynamic) -> MDCSegmentedButtonSegment = definedExternally)
30+
public fun initialize(
31+
segmentFactory: (
32+
el: Element,
33+
foundation: dynamic
34+
) -> MDCSegmentedButtonSegment = definedExternally
35+
)
36+
3137
public fun initialSyncWithDOM()
3238
public fun destroy()
3339
public fun getDefaultFoundation(): dynamic

versions.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
version.com.diffplug.spotless..spotless-plugin-gradle=6.1.0
1111
version.com.github.jakemarsden..git-hooks-gradle-plugin=0.0.2
1212
version.io.github.gradle-nexus..publish-plugin=1.1.0
13-
version.org.jetbrains.dokka..dokka-gradle-plugin=1.6.0
13+
version.org.jetbrains.dokka..dokka-gradle-plugin=1.6.10
1414
version.klip=0.3.0
1515
version.ktlint=0.43.2
1616
#===================================================== Libraries =======================================================

0 commit comments

Comments
 (0)