Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use the new API for code blocks introduced in Dokka 1.9.20 #6

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+290 −256
Open

Use the new API for code blocks introduced in Dokka 1.9.20 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59b023b
Use the new API for code blocks introduced in Dokka 1.9.20
whyoleg Mar 5, 2024
5eca610
Update Gradle, fix warnings and cleanup build.gradle.kts a bit
whyoleg Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 11 additions & 23 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import org.gradle.api.plugins.internal.DefaultAdhocSoftwareComponent
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.net.URI

plugins {
kotlin("jvm") version "1.9.10"
id("org.jetbrains.dokka") version "1.9.10"
kotlin("jvm") version "1.9.22"
id("org.jetbrains.dokka") version "1.9.20"
`maven-publish`
signing
}
Expand All @@ -14,7 +10,6 @@ version = "0.6.0"

repositories {
mavenCentral()
jcenter()
}

val dokkaVersion: String by project
Expand All @@ -27,23 +22,16 @@ dependencies {
testImplementation(kotlin("test-junit"))
testImplementation("org.jetbrains.dokka:dokka-test-api:$dokkaVersion")
testImplementation("org.jetbrains.dokka:dokka-base-test-utils:$dokkaVersion")
testImplementation("org.jsoup:jsoup:1.16.1")
}

val dokkaOutputDir = "$buildDir/dokka"

tasks {
withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}
dokkaHtml {
outputDirectory.set(file(dokkaOutputDir))
}
kotlin {
jvmToolchain(8)
}

val javadocJar by tasks.registering(Jar::class) {
dependsOn(tasks.dokkaHtml)
from(tasks.dokkaHtml)
archiveClassifier.set("javadoc")
from(dokkaOutputDir)
}

java {
Expand All @@ -58,8 +46,8 @@ java {
task("mergeJs") {
val dir = rootDir.path + "/src/main/js"
File(rootDir.path + "/src/main/resources/dokka/dokka-mermaid.js").writeText(
File(dir + "/mermaid.min.js").readText() + "\n" +
File(dir + "/extras.js").readText()
File("$dir/mermaid.min.js").readText() + "\n" +
File("$dir/extras.js").readText()
)
}

Expand All @@ -68,7 +56,7 @@ publishing {
val htmlMermaidDokkaPlugin by creating(MavenPublication::class) {
artifactId = project.name
from(components["java"])
artifact(javadocJar.get())
artifact(javadocJar)

pom {
name.set("Mermaid Html Dokka plugin")
Expand All @@ -78,7 +66,7 @@ publishing {
licenses {
license {
name.set("The Apache Software License, Version 2.0")
url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
distribution.set("repo")
}
}
Expand All @@ -101,7 +89,7 @@ publishing {

repositories {
maven {
url = URI("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
credentials {
username = System.getenv("SONATYPE_USER")
password = System.getenv("SONATYPE_PASSWORD")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dokkaVersion=1.9.10
dokkaVersion=1.9.20
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading