From 9eed283a1a5c3a5769bd6664e1f23ec3fc35dd4d Mon Sep 17 00:00:00 2001 From: julakali Date: Mon, 29 Sep 2025 16:05:31 +0200 Subject: [PATCH] update dokka --- .github/workflows/actions/build/action.yml | 2 +- .../convention/MavenCentralPublishConventionPlugin.kt | 3 ++- gradle.properties | 4 +++- gradle/libs.versions.toml | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/actions/build/action.yml b/.github/workflows/actions/build/action.yml index 416670f..b45e912 100644 --- a/.github/workflows/actions/build/action.yml +++ b/.github/workflows/actions/build/action.yml @@ -13,4 +13,4 @@ runs: run: ./gradlew -p sample-app assembleRelease - name: Build dokka shell: bash - run: ./gradlew dokkaHtmlCollector \ No newline at end of file + run: ./gradlew dokkaGeneratePublicationHtml \ No newline at end of file diff --git a/build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/MavenCentralPublishConventionPlugin.kt b/build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/MavenCentralPublishConventionPlugin.kt index 0ab0c66..4f41b90 100644 --- a/build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/MavenCentralPublishConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/MavenCentralPublishConventionPlugin.kt @@ -33,7 +33,8 @@ class MavenCentralPublishConventionPlugin : Plugin { val javadocJar = tasks.register("javadocJar", Jar::class.java) { archiveClassifier.set("javadoc") - from(tasks.getByName("dokkaHtml")) + from(tasks.getByName("dokkaGeneratePublicationHtml")) +// from(tasks.getByName("dokkaGeneratePublicationJavadoc")) } extensions.configure { diff --git a/gradle.properties b/gradle.properties index 46c41d3..8371870 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,6 @@ kotlin.native.cacheKind.iosSimulatorArm64=none compose.kotlin.native.manageCacheKind=false # ok with "new" memory model -kotlin.native.binary.objcExportSuspendFunctionLaunchThreadRestriction=none \ No newline at end of file +kotlin.native.binary.objcExportSuspendFunctionLaunchThreadRestriction=none + +org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 18de672..d52719f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ androidxActivity = "1.11.0" androidxAppCompat = "1.7.1" coreKtx = "1.17.0" -dokka = "1.9.20" +dokka = "2.0.0" nexus-publish-plugin = "2.0.0" mlkit-document-scanner = "16.0.0-beta1"