Skip to content

Commit a4a9011

Browse files
committed
Simplify configuration of modulePath
1 parent 3f62cc1 commit a4a9011

File tree

11 files changed

+30
-32
lines changed

11 files changed

+30
-32
lines changed

aws-runtime/aws-config/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,4 @@ dokka {
253253
suppress.set(true)
254254
}
255255
}
256-
257-
modulePath = "aws-config"
258256
}

aws-runtime/aws-core/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,3 @@ kotlin {
2727
}
2828
}
2929
}
30-
31-
dokka {
32-
modulePath = "aws-core"
33-
}

aws-runtime/aws-endpoint/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,3 @@ kotlin {
2424
}
2525
}
2626
}
27-
28-
dokka {
29-
modulePath = "aws-endpoint"
30-
}

aws-runtime/aws-http/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,3 @@ kotlin {
3232
}
3333
}
3434
}
35-
36-
dokka {
37-
modulePath = "aws-http"
38-
}

aws-runtime/build.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,12 @@ dependencies {
7979
it.plugins.apply("dokka-convention") // Apply the Dokka conventions plugin to the subproject
8080
dokka(project(it.path)) // Aggregate the subprojects' generated documentation
8181
}
82+
83+
// Preserve Dokka v1 module paths
84+
// https://kotlinlang.org/docs/dokka-migration.html#revert-to-the-dgp-v1-directory-behavior
85+
subprojects {
86+
dokka {
87+
modulePath = this@subprojects.name
88+
}
89+
}
8290
}

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@ class GradleGenerator : KotlinIntegration {
7777
}
7878
}
7979

80-
writer.write("")
81-
writer.withBlock("dokka {", "}") {
82-
val serviceModuleName = ctx.settings.pkg.name.split(".").last()
83-
write("modulePath = #S", serviceModuleName)
84-
}
85-
8680
val contents = writer.toString()
8781
delegator.fileManifest.writeFile("build.gradle.kts", contents)
8882
}

hll/build.gradle.kts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,18 @@ dependencies {
117117
dokka(project(it.path)) // Aggregate the subproject's generated documentation
118118
}
119119
}
120+
121+
// Preserve Dokka v1 module paths
122+
// https://kotlinlang.org/docs/dokka-migration.html#revert-to-the-dgp-v1-directory-behavior
123+
subprojects {
124+
val subProjectName = this@subprojects.name
125+
126+
if (subProjectName in projectsToIgnore) {
127+
return@subprojects
128+
}
129+
130+
dokka {
131+
modulePath = subProjectName
132+
}
133+
}
120134
}

hll/dynamodb-mapper/dynamodb-mapper-annotations/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,3 @@
66
description = "DynamoDbMapper annotations"
77
extra["displayName"] = "AWS :: SDK :: Kotlin :: HLL :: DynamoDbMapper :: Annotations"
88
extra["moduleName"] = "aws.sdk.kotlin.hll.dynamodbmapper.annotations"
9-
10-
dokka {
11-
modulePath = "dynamodb-mapper-annotations"
12-
}

hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,3 @@ tasks.withType<Test> {
213213
dependsOn(":hll:hll-mapping-core:publishToMavenLocal")
214214
dependsOn(":services:dynamodb:publishToMavenLocal")
215215
}
216-
217-
dokka {
218-
modulePath = "dynamodb-mapper-schema-generator-plugin"
219-
}

hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,3 @@ tasks.withType<Test> {
185185
startDdbLocal.stop()
186186
}
187187
}
188-
189-
dokka {
190-
modulePath = "dynamodb-mapper"
191-
}

0 commit comments

Comments
 (0)