Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings
This repository was archived by the owner on Jan 22, 2024. It is now read-only.

Commit 88ad8c9

Browse files
committed
Update dokka examples to reflect latest dokka Gradle plugin changes
1 parent 789d46d commit 88ad8c9

File tree

15 files changed

+54
-60
lines changed

15 files changed

+54
-60
lines changed

‎gradle/dokka/dokka-customFormat-example/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import org.jetbrains.dokka.gradle.DokkaTask
22

33
plugins {
4-
kotlin("jvm") version "1.4.0-rc"
5-
id("org.jetbrains.dokka") version ("1.4.0-rc")
4+
kotlin("jvm") version "1.4.0"
5+
id("org.jetbrains.dokka") version ("1.4.10-dev-47")
66
}
77

88
repositories {
@@ -15,7 +15,7 @@ repositories {
1515
tasks.register<DokkaTask>("dokkaCustomFormat") {
1616
dependencies {
1717
// Using the javadoc plugin as "custom format". Can use any plugin here!
18-
plugins("org.jetbrains.dokka:javadoc-plugin:1.4.0-rc")
18+
plugins("org.jetbrains.dokka:javadoc-plugin:1.4.10-dev-47")
1919
}
2020
}
2121

‎gradle/dokka/dokka-customFormat-example/settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
pluginManagement {
22
repositories {
3+
gradlePluginPortal()
34
jcenter()
45
mavenCentral()
56
maven("https://dl.bintray.com/kotlin/kotlin-eap")

‎gradle/dokka/dokka-gradle-example/build.gradle.kts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import org.jetbrains.dokka.gradle.DokkaTask
2+
import java.net.URL
23

34
plugins {
4-
kotlin("jvm") version "1.4.0-rc"
5-
id("org.jetbrains.dokka") version ("1.4.0-rc")
5+
kotlin("jvm") version "1.4.0"
6+
id("org.jetbrains.dokka") version ("1.4.10-dev-47")
67
}
78

89
repositories {
@@ -17,16 +18,17 @@ dependencies {
1718
testImplementation(kotlin("test-junit"))
1819
}
1920

20-
tasks.withType<DokkaTask> {
21+
tasks.withType<DokkaTask>().configureEach {
2122
dokkaSourceSets {
22-
register("main") {
23-
moduleDisplayName="Dokka Gradle Example"
24-
includes=listOf("Module.md")
23+
named("main") {
24+
moduleDisplayName.set("Dokka Gradle Example")
25+
includes.from("Module.md")
2526
sourceLink {
26-
path ="src/main/kotlin"
27-
url ="https://github.com/Kotlin/kotlin-examples/tree/master/" +
27+
localDirectory.set(file("src/main/kotlin"))
28+
remoteUrl.set(URL("https://github.com/Kotlin/kotlin-examples/tree/master/" +
2829
"gradle/dokka/dokka-gradle-example/src/main/kotlin"
29-
lineSuffix = "#L"
30+
))
31+
remoteLineSuffix.set("#L")
3032
}
3133
}
3234
}

‎gradle/dokka/dokka-gradle-example/settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
pluginManagement {
22
repositories {
3+
gradlePluginPortal()
34
jcenter()
45
mavenCentral()
56
maven("https://dl.bintray.com/kotlin/kotlin-eap")

‎gradle/dokka/dokka-kotlinAsJava-example/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
kotlin("jvm") version "1.4.0-rc"
3-
id("org.jetbrains.dokka") version ("1.4.0-rc")
2+
kotlin("jvm") version "1.4.0"
3+
id("org.jetbrains.dokka") version ("1.4.10-dev-47")
44
}
55

66
repositories {
@@ -15,11 +15,11 @@ dependencies {
1515
testImplementation(kotlin("test-junit"))
1616

1717
// Will apply the plugin to all dokka tasks
18-
dokkaPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.4.0-rc")
18+
dokkaPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.4.10-dev-47")
1919

2020
// Will apply the plugin only to the `:dokkaHtml` task
21-
//dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.4.0-rc")
21+
//dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.4.10-dev-47")
2222

2323
// Will apply the plugin only to the `:dokkaGfm` task
24-
//dokkaGfmPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.4.0-rc")
24+
//dokkaGfmPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.4.10-dev-47")
2525
}

‎gradle/dokka/dokka-kotlinAsJava-example/settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
pluginManagement {
22
repositories {
3+
gradlePluginPortal()
34
jcenter()
45
mavenCentral()
56
maven("https://dl.bintray.com/kotlin/kotlin-eap")

‎gradle/dokka/dokka-library-publishing-example/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
kotlin("jvm") version "1.4.0-rc"
3-
id("org.jetbrains.dokka") version ("1.4.0-rc")
2+
kotlin("jvm") version "1.4.0"
3+
id("org.jetbrains.dokka") version ("1.4.10-dev-47")
44
`java-library`
55
`maven-publish`
66
}
@@ -19,13 +19,13 @@ dependencies {
1919

2020
val dokkaJavadocJar by tasks.register<Jar>("dokkaJavadocJar") {
2121
dependsOn(tasks.dokkaJavadoc)
22-
from(tasks.dokkaJavadoc.get().getOutputDirectoryAsFile())
22+
from(tasks.dokkaJavadoc.flatMap { it.outputDirectory })
2323
archiveClassifier.set("javadoc")
2424
}
2525

2626
val dokkaHtmlJar by tasks.register<Jar>("dokkaHtmlJar") {
2727
dependsOn(tasks.dokkaHtml)
28-
from(tasks.dokkaHtml.get().getOutputDirectoryAsFile())
28+
from(tasks.dokkaHtml.flatMap { it.outputDirectory })
2929
archiveClassifier.set("html-doc")
3030
}
3131

‎gradle/dokka/dokka-library-publishing-example/settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
pluginManagement {
22
repositories {
3+
gradlePluginPortal()
34
jcenter()
45
mavenCentral()
56
maven("https://dl.bintray.com/kotlin/kotlin-eap")

‎gradle/dokka/dokka-multimodule-example/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ subprojects {
22
repositories {
33
mavenCentral()
44
jcenter()
5+
maven("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev")
56
}
67
}

‎gradle/dokka/dokka-multimodule-example/parentProject/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
* Configuring the html multimodule task
2323
* Run ./gradlew :parentProject:dokkaHtmlMultimodule
2424
*/
25-
tasks.dokkaHtmlMultimodule {
26-
documentationFileName="Module.md"
25+
tasks.dokkaHtmlMultiModule {
26+
documentationFileName.set("Module.md")
2727
}
2828

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /