Skip to content

Commit 9e8470d

Browse files
committed
chore: bump Dokka to v2, and reduce Gradle daemon memory consumption
Previously, Dokka (kotlin doc + javadoc) was running within Gradle Daemon process, so it required every Gradle Daemon to allocate lots of heap. The change allows reducing heap consumption
1 parent 91ed127 commit 9e8470d

5 files changed

Lines changed: 69 additions & 9 deletions

File tree

‎build-logic/jvm/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ dependencies {
2727
api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90")
2828
api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.22")
2929
api("org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:1.9.22")
30-
api("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.9.10")
30+
api("org.jetbrains.dokka-javadoc:org.jetbrains.dokka-javadoc.gradle.plugin:2.0.0")
3131
}

‎build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
plugins {
1919
id("java-base")
20-
id("org.jetbrains.dokka")
20+
id("org.jetbrains.dokka-javadoc")
2121
}
2222

2323
java {
@@ -30,15 +30,21 @@ tasks.named<Jar>("javadocJar") {
3030
archiveClassifier.set("javadoc_java")
3131
}
3232

33-
tasks.dokkaJavadoc {
34-
moduleName.set("Apache JMeter ${project.name}")
33+
dokka {
34+
moduleName = "Apache JMeter ${project.name}"
35+
dokkaGeneratorIsolation = ProcessIsolation {
36+
maxHeapSize = "2g"
37+
}
38+
}
39+
40+
tasks.dokkaGeneratePublicationJavadoc {
3541
mustRunAfter("kaptKotlin")
3642
}
3743

3844
val dokkaJar by tasks.registering(Jar::class) {
3945
group = LifecycleBasePlugin.BUILD_GROUP
4046
description = "Assembles a jar archive containing javadoc"
41-
from(tasks.dokkaJavadoc)
47+
from(tasks.dokkaGeneratePublicationJavadoc)
4248
archiveClassifier.set("javadoc")
4349
}
4450

‎gradle.properties‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616
#
1717

18-
org.gradle.jvmargs=-Xmx1500m -XX:MaxMetaspaceSize=768m
18+
org.gradle.jvmargs=-Xms128m -Xmx768m -XX:MaxMetaspaceSize=768m
1919
org.gradle.parallel=true
2020
# Build cache can be disabled with --no-build-cache option
2121
org.gradle.caching=true
@@ -24,6 +24,10 @@ org.gradle.dependency.verification.console=verbose
2424

2525
kapt.include.compile.classpath=false
2626

27+
# Kotlin Dokka is experemental, and we want silence the build warning
28+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
29+
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
30+
2731
# See https://github.com/gradle/gradle/pull/11358 , https://issues.apache.org/jira/browse/INFRA-14923
2832
# repository.apache.org does not yet support .sha256 and .sha512 checksums
2933
systemProp.org.gradle.internal.publish.checksums.insecure=true

‎gradle/verification-keyring.keys‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3946,6 +3946,50 @@ f2vHkgXOGMk=
39463946
=2bDb
39473947
-----END PGP PUBLIC KEY BLOCK-----
39483948

3949+
pub 0C0A9468268C79AE
3950+
uid JetBrains Markdown <markdown@jetbrains.com>
3951+
3952+
sub FA258103C03E2F42
3953+
-----BEGIN PGP PUBLIC KEY BLOCK-----
3954+
3955+
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
3990+
=M/EH
3991+
-----END PGP PUBLIC KEY BLOCK-----
3992+
39493993
pub 0D3B328562A119A7
39503994
uid Aleksey Shipilev <aleksey@shipilev.net>
39513995

‎gradle/verification-metadata.xml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@
207207
<trusting group="org.apache.commons"/>
208208
<trusting group="org.xmlunit"/>
209209
</trusted-key>
210+
<trusted-key id="CFBE6E7934FB211224EE1C2B0C0A9468268C79AE" group="org.jetbrains"/>
210211
<trusted-key id="D022218DCC08AAD6EF3AF876B3DE72E647D35161" group="org.testcontainers"/>
211212
<trusted-key id="D112630C899F508198C09018105CB91CAC2AEE0E">
212213
<trusting group="com.github.autostyle"/>
@@ -503,9 +504,14 @@
503504
<sha256 value="fffe835e7088d5be855fc722770388d403b416e4d145696b1d56fdd1395e0617" origin="Generated by Gradle" reason="PGP signature verification failed!"/>
504505
</artifact>
505506
</component>
506-
<component group="org.jetbrains.dokka" name="org.jetbrains.dokka.gradle.plugin" version="1.9.10">
507-
<artifact name="org.jetbrains.dokka.gradle.plugin-1.9.10.pom">
508-
<sha256 value="27bb52753f97b2cbedd5ad72e111e05e53e0b08a4d22a2aaa80069df5d527ae1" origin="Generated by Gradle" reason="Artifact is not signed"/>
507+
<component group="org.jetbrains.dokka" name="org.jetbrains.dokka.gradle.plugin" version="2.0.0">
508+
<artifact name="org.jetbrains.dokka.gradle.plugin-2.0.0.pom">
509+
<sha256 value="e1fc686a01837e7e86291185901507ffeaf794b8a9ec947b5d04368fa70e00ca" origin="Generated by Gradle" reason="Artifact is not signed"/>
510+
</artifact>
511+
</component>
512+
<component group="org.jetbrains.dokka-javadoc" name="org.jetbrains.dokka-javadoc.gradle.plugin" version="2.0.0">
513+
<artifact name="org.jetbrains.dokka-javadoc.gradle.plugin-2.0.0.pom">
514+
<sha256 value="9f7c10804ddd447174153f009f8b1b1b65b712a6bec0dd57e5faf8a20c9ac807" origin="Generated by Gradle" reason="Artifact is not signed"/>
509515
</artifact>
510516
</component>
511517
<component group="org.jetbrains.gradle.plugin.idea-ext" name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin" version="1.1.7">

0 commit comments

Comments
 (0)