From dceba8b41f74afa66835b1116368db9413e21547 Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Tue, 22 Jul 2025 21:21:38 +0300 Subject: [PATCH 1/2] fix: bump org.jetbrains.dokka to v2 This should improve dokka (Kotlin-doc) generation, and it should reduce heap consumption for Gradle daemon. There's an option to configure separate worker for Dokka --- build-logic/jvm/build.gradle.kts | 2 +- .../kotlin/build-logic.dokka-javadoc.gradle.kts | 8 ++++---- gradle.properties | 5 ++++- gradle/verification-metadata.xml | 15 ++++----------- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts index 899c13c1560..d4edfc896dd 100644 --- a/build-logic/jvm/build.gradle.kts +++ b/build-logic/jvm/build.gradle.kts @@ -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") } diff --git a/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts index 1be932a5730..0a8b3d686c2 100644 --- a/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts +++ b/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts @@ -17,7 +17,7 @@ plugins { id("java-base") - id("org.jetbrains.dokka") + id("org.jetbrains.dokka-javadoc") } java { @@ -30,15 +30,15 @@ tasks.named("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") } diff --git a/gradle.properties b/gradle.properties index c5f97deb259..532b3713c3d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ # limitations under the License. # -org.gradle.jvmargs=-Xmx1500m -XX:MaxMetaspaceSize=768m +org.gradle.jvmargs=-Xmx768m -XX:MaxMetaspaceSize=768m org.gradle.parallel=true # Build cache can be disabled with --no-build-cache option org.gradle.caching=true @@ -23,6 +23,9 @@ org.gradle.caching=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 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 80f46201810..6fa25cfb909 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -207,6 +207,7 @@ + @@ -495,17 +496,9 @@ - - - - - - - - - - - + + + From 534bd7ac88582fbb4284063ac4f1638c95a59b26 Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Wed, 23 Jul 2025 19:29:55 +0300 Subject: [PATCH 2/2] fix: try increasing xmx --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 532b3713c3d..41997e31726 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ # limitations under the License. # -org.gradle.jvmargs=-Xmx768m -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