Skip to content

fix: bump org.jetbrains.dokka to v2 #6490

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: bump org.jetbrains.dokka to v2 #6490

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
dceba8b
fix: bump org.jetbrains.dokka to v2
vlsi Jul 22, 2025
534bd7a
fix: try increasing xmx
vlsi Jul 23, 2025
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
2 changes: 1 addition & 1 deletion build-logic/jvm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ dependencies {
api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.22")
api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.9.22")
api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.9.10")
api("org.jetbrains.dokka-javadoc:org.jetbrains.dokka-javadoc.gradle.plugin:2.0.0")
}
8 changes: 4 additions & 4 deletions build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

plugins {
id("java-base")
id("org.jetbrains.dokka")
id("org.jetbrains.dokka-javadoc")
}

java {
Expand All @@ -30,15 +30,15 @@ tasks.named<Jar>("javadocJar") {
archiveClassifier.set("javadoc_java")
}

tasks.dokkaJavadoc {
moduleName.set("Apache JMeter ${project.name}")
tasks.dokkaGeneratePublicationJavadoc {
mustRunAfter("kaptKotlin")
generator.moduleName = "Apache JMeter ${project.name}"
}

val dokkaJar by tasks.registering(Jar::class) {
group = LifecycleBasePlugin.BUILD_GROUP
description = "Assembles a jar archive containing javadoc"
from(tasks.dokkaJavadoc)
from(tasks.dokkaGeneratePublicationJavadoc)
archiveClassifier.set("javadoc")
}

Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@
# limitations under the License.
#

org.gradle.jvmargs=-Xmx1500m -XX:MaxMetaspaceSize=768m
org.gradle.jvmargs=-Xmx1000m -XX:MaxMetaspaceSize=768m
org.gradle.parallel=true
# Build cache can be disabled with --no-build-cache option
org.gradle.caching=true
#org.gradle.caching.debug=true
org.gradle.dependency.verification.console=verbose

kapt.include.compile.classpath=false
# Kotlin Dokka 2 is experemental, and we want silence the build warning
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true

# See https://github.com/gradle/gradle/pull/11358 , https://issues.apache.org/jira/browse/INFRA-14923
# repository.apache.org does not yet support .sha256 and .sha512 checksums
Expand Down
15 changes: 4 additions & 11 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@
<trusting group="org.apache.commons"/>
<trusting group="org.xmlunit"/>
</trusted-key>
<trusted-key id="CFBE6E7934FB211224EE1C2B0C0A9468268C79AE" group="org.jetbrains"/>
<trusted-key id="D022218DCC08AAD6EF3AF876B3DE72E647D35161" group="org.testcontainers"/>
<trusted-key id="D112630C899F508198C09018105CB91CAC2AEE0E">
<trusting group="com.github.autostyle"/>
Expand Down Expand Up @@ -495,17 +496,9 @@
<sha256 value="000dd616298aebd21a9d5731874df083d7298424b91e037b73cbdd07ebc83e0e" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="org.jetbrains.dokka" name="dokka-gradle-plugin" version="1.9.10">
<artifact name="dokka-gradle-plugin-1.9.10.pom">
<ignored-keys>
<ignored-key id="98465301A4939C0279F2E847D89D05374952262B" reason="PGP verification failed"/>
</ignored-keys>
<sha256 value="fffe835e7088d5be855fc722770388d403b416e4d145696b1d56fdd1395e0617" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
</artifact>
</component>
<component group="org.jetbrains.dokka" name="org.jetbrains.dokka.gradle.plugin" version="1.9.10">
<artifact name="org.jetbrains.dokka.gradle.plugin-1.9.10.pom">
<sha256 value="27bb52753f97b2cbedd5ad72e111e05e53e0b08a4d22a2aaa80069df5d527ae1" origin="Generated by Gradle" reason="Artifact is not signed"/>
<component group="org.jetbrains.dokka-javadoc" name="org.jetbrains.dokka-javadoc.gradle.plugin" version="2.0.0">
<artifact name="org.jetbrains.dokka-javadoc.gradle.plugin-2.0.0.pom">
<sha256 value="9f7c10804ddd447174153f009f8b1b1b65b712a6bec0dd57e5faf8a20c9ac807" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="org.jetbrains.gradle.plugin.idea-ext" name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin" version="1.1.7">
Expand Down
Loading