From f6baafceb439d579916866fe5aef45a38d365b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20L=C3=B3pez=20Ma=C3=B1as?= Date: Fri, 22 Sep 2023 16:02:43 +0700 Subject: [PATCH] feat: updating configuration to generate multimodule documentation (#401) --- .github/workflows/docs.yml | 4 ++-- build.gradle | 6 +++--- gradle/libs.versions.toml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 596a94af..4a9bcc33 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -43,10 +43,10 @@ jobs: # Run dokka and create tar - name: Generate documentation run: | - ./gradlew dokkaHtml + ./gradlew dokkaHtmlMultiModule echo "Creating tar for generated docs" - cd $GITHUB_WORKSPACE/maps-compose/build/dokka/html && tar cvf ~/maps-compose-docs.tar . + cd $GITHUB_WORKSPACE/build/dokka/htmlMultiModule && tar cvf ~/maps-compose-docs.tar . echo "Unpacking tar into gh-pages branch" git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/* diff --git a/build.gradle b/build.gradle index d9b7b72c..891921b0 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { } plugins { - alias libs.plugins.dokka apply false + alias libs.plugins.dokka apply true } ext.projectArtifactId = { project -> @@ -51,7 +51,7 @@ subprojects { project -> toolVersion = libs.versions.jacoco.tool.plugin.get() } - tasks.withType(Test) { + tasks.withType(Test).configureEach { jacoco.includeNoLocationClasses = true jacoco.excludes = ['jdk.internal.*'] } @@ -123,6 +123,6 @@ subprojects { project -> } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a5e6a44f..cdbb794c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ androidxtest = "1.5.0" compose-bom = "2022.11.00" composecompiler = "1.3.2" coroutines = "1.6.0" -dokka = "1.5.0" +dokka = "1.9.0" espresso = "3.4.0" jacoco-plugin = "0.2" jacoco-tool-plugin = "0.8.7"