Skip to content

Commit 17d237a

Browse files
authored
Merge pull request #3 from kalinjul/update-compose
Update compose
2 parents cf3e96a + 9eed283 commit 17d237a

4 files changed

Lines changed: 7 additions & 4 deletions

File tree

.github/workflows/actions/build/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ runs:
1313
run: ./gradlew -p sample-app assembleRelease
1414
- name: Build dokka
1515
shell: bash
16-
run: ./gradlew dokkaHtmlCollector
16+
run: ./gradlew dokkaGeneratePublicationHtml

build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/MavenCentralPublishConventionPlugin.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ class MavenCentralPublishConventionPlugin : Plugin<Project> {
3333

3434
val javadocJar = tasks.register("javadocJar", Jar::class.java) {
3535
archiveClassifier.set("javadoc")
36-
from(tasks.getByName("dokkaHtml"))
36+
from(tasks.getByName("dokkaGeneratePublicationHtml"))
37+
// from(tasks.getByName("dokkaGeneratePublicationJavadoc"))
3738
}
3839

3940
extensions.configure<PublishingExtension> {

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,6 @@ kotlin.native.cacheKind.iosSimulatorArm64=none
1818
compose.kotlin.native.manageCacheKind=false
1919

2020
# ok with "new" memory model
21-
kotlin.native.binary.objcExportSuspendFunctionLaunchThreadRestriction=none
21+
kotlin.native.binary.objcExportSuspendFunctionLaunchThreadRestriction=none
22+
23+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ androidxActivity = "1.11.0"
2020
androidxAppCompat = "1.7.1"
2121
coreKtx = "1.17.0"
2222

23-
dokka = "1.9.20"
23+
dokka = "2.0.0"
2424
nexus-publish-plugin = "2.0.0"
2525
mlkit-document-scanner = "16.0.0-beta1"
2626

0 commit comments

Comments
 (0)