From 44ab1e77ccf6bc72ed05f5eea71f5657a62c1af2 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Thu, 19 Jun 2025 16:14:22 -0400 Subject: [PATCH 01/11] Add `modulePath` to preserve Dokka1 module paths --- aws-runtime/aws-config/build.gradle.kts | 2 ++ aws-runtime/aws-core/build.gradle.kts | 4 ++++ aws-runtime/aws-endpoint/build.gradle.kts | 4 ++++ aws-runtime/aws-http/build.gradle.kts | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/aws-runtime/aws-config/build.gradle.kts b/aws-runtime/aws-config/build.gradle.kts index 89b6df71884..295cc45316f 100644 --- a/aws-runtime/aws-config/build.gradle.kts +++ b/aws-runtime/aws-config/build.gradle.kts @@ -253,4 +253,6 @@ dokka { suppress.set(true) } } + + modulePath = "aws-config" } diff --git a/aws-runtime/aws-core/build.gradle.kts b/aws-runtime/aws-core/build.gradle.kts index 42e90f200e7..6812ac59ae1 100644 --- a/aws-runtime/aws-core/build.gradle.kts +++ b/aws-runtime/aws-core/build.gradle.kts @@ -27,3 +27,7 @@ kotlin { } } } + +dokka { + modulePath = "aws-core" +} diff --git a/aws-runtime/aws-endpoint/build.gradle.kts b/aws-runtime/aws-endpoint/build.gradle.kts index c910984754d..b197fb4b79d 100644 --- a/aws-runtime/aws-endpoint/build.gradle.kts +++ b/aws-runtime/aws-endpoint/build.gradle.kts @@ -24,3 +24,7 @@ kotlin { } } } + +dokka { + modulePath = "aws-endpoint" +} \ No newline at end of file diff --git a/aws-runtime/aws-http/build.gradle.kts b/aws-runtime/aws-http/build.gradle.kts index 21a560d31a8..90f91fce477 100644 --- a/aws-runtime/aws-http/build.gradle.kts +++ b/aws-runtime/aws-http/build.gradle.kts @@ -32,3 +32,7 @@ kotlin { } } } + +dokka { + modulePath = "aws-http" +} From af3c184625ec63b584b4c9fd6e30583fe6e692ff Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Thu, 19 Jun 2025 16:44:58 -0400 Subject: [PATCH 02/11] Add `modulePath` to code-generated build.gradle.kts to preserve Dokka1 module paths --- .../main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt index f590cf1a790..e1428843696 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt @@ -77,6 +77,12 @@ class GradleGenerator : KotlinIntegration { } } + writer.write("") + writer.withBlock("dokka {", "}") { + val serviceModuleName = ctx.settings.pkg.name.split(".").last() + write("modulePath = #S", serviceModuleName) + } + val contents = writer.toString() delegator.fileManifest.writeFile("build.gradle.kts", contents) } From c0a33783845de64d5cdd5d2c0f4b7147ab83cb0e Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Thu, 19 Jun 2025 16:45:34 -0400 Subject: [PATCH 03/11] HLLs: only generate docs for dynamodb-mapper and dynamodb-mapper-annotations --- hll/build.gradle.kts | 7 ++----- hll/dynamodb-mapper/build.gradle.kts | 8 ++++++++ .../dynamodb-mapper-annotations/build.gradle.kts | 8 ++++++++ hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts | 5 +++++ 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 hll/dynamodb-mapper/build.gradle.kts diff --git a/hll/build.gradle.kts b/hll/build.gradle.kts index 23d9ac0e128..851d372e458 100644 --- a/hll/build.gradle.kts +++ b/hll/build.gradle.kts @@ -108,10 +108,7 @@ apiValidation { ).filter { it in availableSubprojects } // Some projects may not be in the build depending on bootstrapping } -// Configure Dokka for subprojects +// Configure Dokka for dynamodb-mapper dependencies { - subprojects.forEach { - it.plugins.apply("dokka-convention") // Apply the Dokka conventions plugin to the subproject - dokka(project(it.path)) // Aggregate the subproject's generated documentation - } + dokka(project("dynamodb-mapper")) } diff --git a/hll/dynamodb-mapper/build.gradle.kts b/hll/dynamodb-mapper/build.gradle.kts new file mode 100644 index 00000000000..391724d93ff --- /dev/null +++ b/hll/dynamodb-mapper/build.gradle.kts @@ -0,0 +1,8 @@ +plugins { + `dokka-convention` +} + +dependencies { + dokka(project("dynamodb-mapper")) + dokka(project("dynamodb-mapper-annotations")) +} \ No newline at end of file diff --git a/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts index 2576670bf70..1ffc70e1118 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts +++ b/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts @@ -6,3 +6,11 @@ description = "DynamoDbMapper annotations" extra["displayName"] = "AWS :: SDK :: Kotlin :: HLL :: DynamoDbMapper :: Annotations" extra["moduleName"] = "aws.sdk.kotlin.hll.dynamodbmapper.annotations" + +plugins { + `dokka-convention` +} + +dokka { + modulePath = "dynamodb-mapper-annotations" +} \ No newline at end of file diff --git a/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts index 6d958622961..abb5356df35 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts +++ b/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts @@ -26,6 +26,7 @@ buildscript { plugins { alias(libs.plugins.ksp) + `dokka-convention` } kotlin { @@ -184,3 +185,7 @@ tasks.withType { startDdbLocal.stop() } } + +dokka { + modulePath = "dynamodb-mapper" +} From 1659a35937f05833437dec4314c31cc9e2cf89da Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Thu, 19 Jun 2025 17:00:54 -0400 Subject: [PATCH 04/11] ktlint --- aws-runtime/aws-endpoint/build.gradle.kts | 2 +- hll/dynamodb-mapper/build.gradle.kts | 2 +- .../dynamodb-mapper-annotations/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aws-runtime/aws-endpoint/build.gradle.kts b/aws-runtime/aws-endpoint/build.gradle.kts index b197fb4b79d..6c88c430440 100644 --- a/aws-runtime/aws-endpoint/build.gradle.kts +++ b/aws-runtime/aws-endpoint/build.gradle.kts @@ -27,4 +27,4 @@ kotlin { dokka { modulePath = "aws-endpoint" -} \ No newline at end of file +} diff --git a/hll/dynamodb-mapper/build.gradle.kts b/hll/dynamodb-mapper/build.gradle.kts index 391724d93ff..0c352fef9a1 100644 --- a/hll/dynamodb-mapper/build.gradle.kts +++ b/hll/dynamodb-mapper/build.gradle.kts @@ -5,4 +5,4 @@ plugins { dependencies { dokka(project("dynamodb-mapper")) dokka(project("dynamodb-mapper-annotations")) -} \ No newline at end of file +} diff --git a/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts index 1ffc70e1118..2457e7fd752 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts +++ b/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts @@ -13,4 +13,4 @@ plugins { dokka { modulePath = "dynamodb-mapper-annotations" -} \ No newline at end of file +} From edd76614586e135bff8dde40e0e81d72e12197bc Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Thu, 19 Jun 2025 17:06:59 -0400 Subject: [PATCH 05/11] Reference project by full path --- hll/build.gradle.kts | 2 +- hll/dynamodb-mapper/build.gradle.kts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hll/build.gradle.kts b/hll/build.gradle.kts index 851d372e458..20de97af49e 100644 --- a/hll/build.gradle.kts +++ b/hll/build.gradle.kts @@ -110,5 +110,5 @@ apiValidation { // Configure Dokka for dynamodb-mapper dependencies { - dokka(project("dynamodb-mapper")) + dokka(project(":hll:dynamodb-mapper")) } diff --git a/hll/dynamodb-mapper/build.gradle.kts b/hll/dynamodb-mapper/build.gradle.kts index 0c352fef9a1..18b4cb42f7d 100644 --- a/hll/dynamodb-mapper/build.gradle.kts +++ b/hll/dynamodb-mapper/build.gradle.kts @@ -3,6 +3,6 @@ plugins { } dependencies { - dokka(project("dynamodb-mapper")) - dokka(project("dynamodb-mapper-annotations")) + dokka(project(":hll:dynamodb-mapper:dynamodb-mapper")) + dokka(project(":hll:dynamodb-mapper:dynamodb-mapper-annotations")) } From c321367150882a02b68d246c6d3ffdec7ab4c24d Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Thu, 19 Jun 2025 17:16:15 -0400 Subject: [PATCH 06/11] Use `rootProject.project` --- hll/build.gradle.kts | 2 +- hll/dynamodb-mapper/build.gradle.kts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hll/build.gradle.kts b/hll/build.gradle.kts index 20de97af49e..9c1a3a5927d 100644 --- a/hll/build.gradle.kts +++ b/hll/build.gradle.kts @@ -110,5 +110,5 @@ apiValidation { // Configure Dokka for dynamodb-mapper dependencies { - dokka(project(":hll:dynamodb-mapper")) + dokka(rootProject.project(":hll:dynamodb-mapper")) } diff --git a/hll/dynamodb-mapper/build.gradle.kts b/hll/dynamodb-mapper/build.gradle.kts index 18b4cb42f7d..4485963b7c8 100644 --- a/hll/dynamodb-mapper/build.gradle.kts +++ b/hll/dynamodb-mapper/build.gradle.kts @@ -3,6 +3,6 @@ plugins { } dependencies { - dokka(project(":hll:dynamodb-mapper:dynamodb-mapper")) - dokka(project(":hll:dynamodb-mapper:dynamodb-mapper-annotations")) + dokka(rootProject.project(":hll:dynamodb-mapper:dynamodb-mapper")) + dokka(rootProject.project(":hll:dynamodb-mapper:dynamodb-mapper-annotations")) } From ba7684351348d0c30b4201ea1369d0267ffee636 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Thu, 19 Jun 2025 17:25:15 -0400 Subject: [PATCH 07/11] Revert dynamodb-mapper changes --- hll/build.gradle.kts | 7 +++++-- hll/dynamodb-mapper/build.gradle.kts | 8 -------- .../dynamodb-mapper-annotations/build.gradle.kts | 4 ---- 3 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 hll/dynamodb-mapper/build.gradle.kts diff --git a/hll/build.gradle.kts b/hll/build.gradle.kts index 9c1a3a5927d..23d9ac0e128 100644 --- a/hll/build.gradle.kts +++ b/hll/build.gradle.kts @@ -108,7 +108,10 @@ apiValidation { ).filter { it in availableSubprojects } // Some projects may not be in the build depending on bootstrapping } -// Configure Dokka for dynamodb-mapper +// Configure Dokka for subprojects dependencies { - dokka(rootProject.project(":hll:dynamodb-mapper")) + subprojects.forEach { + it.plugins.apply("dokka-convention") // Apply the Dokka conventions plugin to the subproject + dokka(project(it.path)) // Aggregate the subproject's generated documentation + } } diff --git a/hll/dynamodb-mapper/build.gradle.kts b/hll/dynamodb-mapper/build.gradle.kts deleted file mode 100644 index 4485963b7c8..00000000000 --- a/hll/dynamodb-mapper/build.gradle.kts +++ /dev/null @@ -1,8 +0,0 @@ -plugins { - `dokka-convention` -} - -dependencies { - dokka(rootProject.project(":hll:dynamodb-mapper:dynamodb-mapper")) - dokka(rootProject.project(":hll:dynamodb-mapper:dynamodb-mapper-annotations")) -} diff --git a/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts index 2457e7fd752..bbd90a45b21 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts +++ b/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts @@ -7,10 +7,6 @@ description = "DynamoDbMapper annotations" extra["displayName"] = "AWS :: SDK :: Kotlin :: HLL :: DynamoDbMapper :: Annotations" extra["moduleName"] = "aws.sdk.kotlin.hll.dynamodbmapper.annotations" -plugins { - `dokka-convention` -} - dokka { modulePath = "dynamodb-mapper-annotations" } From f1ca96b6505c82e5b9efa2d5c80d6b3a950ad6a1 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Thu, 19 Jun 2025 17:33:36 -0400 Subject: [PATCH 08/11] Ignore dynamodb-mapper codegen projects --- hll/build.gradle.kts | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/hll/build.gradle.kts b/hll/build.gradle.kts index 23d9ac0e128..8ccf0daffda 100644 --- a/hll/build.gradle.kts +++ b/hll/build.gradle.kts @@ -96,22 +96,25 @@ subprojects { } } +// Projects to ignore for API validation and documentation generation +val projectsToIgnore = listOf( + "hll-codegen", + "dynamodb-mapper-codegen", + "dynamodb-mapper-ops-codegen", + "dynamodb-mapper-schema-codegen", + "dynamodb-mapper-schema-generator-plugin-test" +).filter { it in subprojects.map { it.name }.toSet() } // Some projects may not be in the build depending on bootstrapping + apiValidation { - val availableSubprojects = subprojects.map { it.name }.toSet() - - ignoredProjects += listOf( - "hll-codegen", - "dynamodb-mapper-codegen", - "dynamodb-mapper-ops-codegen", - "dynamodb-mapper-schema-codegen", - "dynamodb-mapper-schema-generator-plugin-test", - ).filter { it in availableSubprojects } // Some projects may not be in the build depending on bootstrapping + ignoredProjects += projectsToIgnore } // Configure Dokka for subprojects dependencies { subprojects.forEach { - it.plugins.apply("dokka-convention") // Apply the Dokka conventions plugin to the subproject - dokka(project(it.path)) // Aggregate the subproject's generated documentation + if (it.name !in projectsToIgnore) { + it.plugins.apply("dokka-convention") // Apply the Dokka conventions plugin to the subproject + dokka(project(it.path)) // Aggregate the subproject's generated documentation + } } } From 6aa0d688568b028efd79b7293f5b076923a504d2 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Thu, 19 Jun 2025 17:33:54 -0400 Subject: [PATCH 09/11] ktlint --- hll/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hll/build.gradle.kts b/hll/build.gradle.kts index 8ccf0daffda..b160ceee1f7 100644 --- a/hll/build.gradle.kts +++ b/hll/build.gradle.kts @@ -102,7 +102,7 @@ val projectsToIgnore = listOf( "dynamodb-mapper-codegen", "dynamodb-mapper-ops-codegen", "dynamodb-mapper-schema-codegen", - "dynamodb-mapper-schema-generator-plugin-test" + "dynamodb-mapper-schema-generator-plugin-test", ).filter { it in subprojects.map { it.name }.toSet() } // Some projects may not be in the build depending on bootstrapping apiValidation { From 3f62cc1629b7837a8bfc174f41746e571b97b056 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Thu, 19 Jun 2025 17:35:11 -0400 Subject: [PATCH 10/11] Add modulePath for schema generator plugin --- .../dynamodb-mapper-schema-generator-plugin/build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/build.gradle.kts index 600a93c0929..1c2efee275b 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/build.gradle.kts +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/build.gradle.kts @@ -213,3 +213,7 @@ tasks.withType { dependsOn(":hll:hll-mapping-core:publishToMavenLocal") dependsOn(":services:dynamodb:publishToMavenLocal") } + +dokka { + modulePath = "dynamodb-mapper-schema-generator-plugin" +} \ No newline at end of file From a4a90115d6818bdf984904909353a32102185902 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Thu, 19 Jun 2025 17:52:52 -0400 Subject: [PATCH 11/11] Simplify configuration of `modulePath` --- aws-runtime/aws-config/build.gradle.kts | 2 -- aws-runtime/aws-core/build.gradle.kts | 4 ---- aws-runtime/aws-endpoint/build.gradle.kts | 4 ---- aws-runtime/aws-http/build.gradle.kts | 4 ---- aws-runtime/build.gradle.kts | 8 ++++++++ .../aws/sdk/kotlin/codegen/GradleGenerator.kt | 6 ------ hll/build.gradle.kts | 14 ++++++++++++++ .../dynamodb-mapper-annotations/build.gradle.kts | 4 ---- .../build.gradle.kts | 4 ---- .../dynamodb-mapper/build.gradle.kts | 4 ---- services/build.gradle.kts | 8 ++++++++ 11 files changed, 30 insertions(+), 32 deletions(-) diff --git a/aws-runtime/aws-config/build.gradle.kts b/aws-runtime/aws-config/build.gradle.kts index 295cc45316f..89b6df71884 100644 --- a/aws-runtime/aws-config/build.gradle.kts +++ b/aws-runtime/aws-config/build.gradle.kts @@ -253,6 +253,4 @@ dokka { suppress.set(true) } } - - modulePath = "aws-config" } diff --git a/aws-runtime/aws-core/build.gradle.kts b/aws-runtime/aws-core/build.gradle.kts index 6812ac59ae1..42e90f200e7 100644 --- a/aws-runtime/aws-core/build.gradle.kts +++ b/aws-runtime/aws-core/build.gradle.kts @@ -27,7 +27,3 @@ kotlin { } } } - -dokka { - modulePath = "aws-core" -} diff --git a/aws-runtime/aws-endpoint/build.gradle.kts b/aws-runtime/aws-endpoint/build.gradle.kts index 6c88c430440..c910984754d 100644 --- a/aws-runtime/aws-endpoint/build.gradle.kts +++ b/aws-runtime/aws-endpoint/build.gradle.kts @@ -24,7 +24,3 @@ kotlin { } } } - -dokka { - modulePath = "aws-endpoint" -} diff --git a/aws-runtime/aws-http/build.gradle.kts b/aws-runtime/aws-http/build.gradle.kts index 90f91fce477..21a560d31a8 100644 --- a/aws-runtime/aws-http/build.gradle.kts +++ b/aws-runtime/aws-http/build.gradle.kts @@ -32,7 +32,3 @@ kotlin { } } } - -dokka { - modulePath = "aws-http" -} diff --git a/aws-runtime/build.gradle.kts b/aws-runtime/build.gradle.kts index 442fbe701f1..ac150b0abb1 100644 --- a/aws-runtime/build.gradle.kts +++ b/aws-runtime/build.gradle.kts @@ -79,4 +79,12 @@ dependencies { it.plugins.apply("dokka-convention") // Apply the Dokka conventions plugin to the subproject dokka(project(it.path)) // Aggregate the subprojects' generated documentation } + + // Preserve Dokka v1 module paths + // https://kotlinlang.org/docs/dokka-migration.html#revert-to-the-dgp-v1-directory-behavior + subprojects { + dokka { + modulePath = this@subprojects.name + } + } } diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt index e1428843696..f590cf1a790 100644 --- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt +++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt @@ -77,12 +77,6 @@ class GradleGenerator : KotlinIntegration { } } - writer.write("") - writer.withBlock("dokka {", "}") { - val serviceModuleName = ctx.settings.pkg.name.split(".").last() - write("modulePath = #S", serviceModuleName) - } - val contents = writer.toString() delegator.fileManifest.writeFile("build.gradle.kts", contents) } diff --git a/hll/build.gradle.kts b/hll/build.gradle.kts index b160ceee1f7..f91bcacb4cf 100644 --- a/hll/build.gradle.kts +++ b/hll/build.gradle.kts @@ -117,4 +117,18 @@ dependencies { dokka(project(it.path)) // Aggregate the subproject's generated documentation } } + + // Preserve Dokka v1 module paths + // https://kotlinlang.org/docs/dokka-migration.html#revert-to-the-dgp-v1-directory-behavior + subprojects { + val subProjectName = this@subprojects.name + + if (subProjectName in projectsToIgnore) { + return@subprojects + } + + dokka { + modulePath = subProjectName + } + } } diff --git a/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts index bbd90a45b21..2576670bf70 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts +++ b/hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts @@ -6,7 +6,3 @@ description = "DynamoDbMapper annotations" extra["displayName"] = "AWS :: SDK :: Kotlin :: HLL :: DynamoDbMapper :: Annotations" extra["moduleName"] = "aws.sdk.kotlin.hll.dynamodbmapper.annotations" - -dokka { - modulePath = "dynamodb-mapper-annotations" -} diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/build.gradle.kts index 1c2efee275b..600a93c0929 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/build.gradle.kts +++ b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/build.gradle.kts @@ -213,7 +213,3 @@ tasks.withType { dependsOn(":hll:hll-mapping-core:publishToMavenLocal") dependsOn(":services:dynamodb:publishToMavenLocal") } - -dokka { - modulePath = "dynamodb-mapper-schema-generator-plugin" -} \ No newline at end of file diff --git a/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts index abb5356df35..53ad4cd2875 100644 --- a/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts +++ b/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts @@ -185,7 +185,3 @@ tasks.withType { startDdbLocal.stop() } } - -dokka { - modulePath = "dynamodb-mapper" -} diff --git a/services/build.gradle.kts b/services/build.gradle.kts index c58178b9ecd..1a2bc2db6b8 100644 --- a/services/build.gradle.kts +++ b/services/build.gradle.kts @@ -152,4 +152,12 @@ dependencies { it.plugins.apply("dokka-convention") // Apply the Dokka conventions plugin to the subproject dokka(project(it.path)) // Aggregate the subproject's generated documentation } + + // Preserve Dokka v1 module paths + // https://kotlinlang.org/docs/dokka-migration.html#revert-to-the-dgp-v1-directory-behavior + subprojects { + dokka { + modulePath = this@subprojects.name + } + } }