From 1e41db059526c24fadb8a0921baa334df88ec746 Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Thu, 19 Jun 2025 17:53:45 -0400
Subject: [PATCH 1/2] Revert "fix: preserve Dokka v1 module paths (#1298)"

This reverts commit c616efefc7219567682c1553af2d67a00a2b649d.
---
 runtime/auth/aws-credentials/build.gradle.kts                 | 4 ----
 runtime/auth/aws-signing-common/build.gradle.kts              | 4 ----
 runtime/auth/aws-signing-crt/build.gradle.kts                 | 4 ----
 runtime/auth/aws-signing-default/build.gradle.kts             | 4 ----
 runtime/auth/aws-signing-tests/build.gradle.kts               | 4 ----
 runtime/auth/http-auth-api/build.gradle.kts                   | 4 ----
 runtime/auth/http-auth-aws/build.gradle.kts                   | 4 ----
 runtime/auth/http-auth/build.gradle.kts                       | 4 ----
 runtime/auth/identity-api/build.gradle.kts                    | 4 ----
 runtime/crt-util/build.gradle.kts                             | 4 ----
 runtime/observability/logging-slf4j2/build.gradle.kts         | 4 ----
 runtime/observability/telemetry-api/build.gradle.kts          | 4 ----
 runtime/observability/telemetry-defaults/build.gradle.kts     | 4 ----
 .../telemetry-provider-micrometer/build.gradle.kts            | 4 ----
 .../observability/telemetry-provider-otel/build.gradle.kts    | 4 ----
 runtime/protocol/aws-event-stream/build.gradle.kts            | 4 ----
 runtime/protocol/aws-json-protocols/build.gradle.kts          | 4 ----
 runtime/protocol/aws-protocol-core/build.gradle.kts           | 4 ----
 runtime/protocol/aws-xml-protocols/build.gradle.kts           | 4 ----
 .../http-client-engine-crt/build.gradle.kts                   | 4 ----
 .../http-client-engine-default/build.gradle.kts               | 4 ----
 .../http-client-engine-okhttp/build.gradle.kts                | 4 ----
 .../protocol/http-client-engines/test-suite/build.gradle.kts  | 4 ----
 runtime/protocol/http-client/build.gradle.kts                 | 4 ----
 runtime/protocol/http-test/build.gradle.kts                   | 4 ----
 runtime/protocol/http/build.gradle.kts                        | 4 ----
 runtime/protocol/smithy-rpcv2-protocols/build.gradle.kts      | 4 ----
 runtime/runtime-core/build.gradle.kts                         | 4 ----
 runtime/serde/serde-cbor/build.gradle.kts                     | 4 ----
 runtime/serde/serde-form-url/build.gradle.kts                 | 4 ----
 runtime/serde/serde-json/build.gradle.kts                     | 4 ----
 runtime/serde/serde-xml/build.gradle.kts                      | 4 ----
 runtime/smithy-client/build.gradle.kts                        | 4 ----
 33 files changed, 132 deletions(-)

diff --git a/runtime/auth/aws-credentials/build.gradle.kts b/runtime/auth/aws-credentials/build.gradle.kts
index a4473f84b7..059032c494 100644
--- a/runtime/auth/aws-credentials/build.gradle.kts
+++ b/runtime/auth/aws-credentials/build.gradle.kts
@@ -30,7 +30,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-credentials"
-}
diff --git a/runtime/auth/aws-signing-common/build.gradle.kts b/runtime/auth/aws-signing-common/build.gradle.kts
index 535afecab5..45e0ae5d62 100644
--- a/runtime/auth/aws-signing-common/build.gradle.kts
+++ b/runtime/auth/aws-signing-common/build.gradle.kts
@@ -34,7 +34,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-signing-common"
-}
diff --git a/runtime/auth/aws-signing-crt/build.gradle.kts b/runtime/auth/aws-signing-crt/build.gradle.kts
index 89cbb618d8..4c67282762 100644
--- a/runtime/auth/aws-signing-crt/build.gradle.kts
+++ b/runtime/auth/aws-signing-crt/build.gradle.kts
@@ -26,7 +26,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-signing-crt"
-}
diff --git a/runtime/auth/aws-signing-default/build.gradle.kts b/runtime/auth/aws-signing-default/build.gradle.kts
index ef4f295bd8..22e20d39fd 100644
--- a/runtime/auth/aws-signing-default/build.gradle.kts
+++ b/runtime/auth/aws-signing-default/build.gradle.kts
@@ -27,7 +27,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-signing-default"
-}
diff --git a/runtime/auth/aws-signing-tests/build.gradle.kts b/runtime/auth/aws-signing-tests/build.gradle.kts
index e2d0e49f81..5810181041 100644
--- a/runtime/auth/aws-signing-tests/build.gradle.kts
+++ b/runtime/auth/aws-signing-tests/build.gradle.kts
@@ -39,7 +39,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-signing-tests"
-}
diff --git a/runtime/auth/http-auth-api/build.gradle.kts b/runtime/auth/http-auth-api/build.gradle.kts
index 063a3786d2..6186421327 100644
--- a/runtime/auth/http-auth-api/build.gradle.kts
+++ b/runtime/auth/http-auth-api/build.gradle.kts
@@ -16,7 +16,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-auth-api"
-}
diff --git a/runtime/auth/http-auth-aws/build.gradle.kts b/runtime/auth/http-auth-aws/build.gradle.kts
index de948f443a..dfcc0c7da3 100644
--- a/runtime/auth/http-auth-aws/build.gradle.kts
+++ b/runtime/auth/http-auth-aws/build.gradle.kts
@@ -37,7 +37,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-auth-aws"
-}
diff --git a/runtime/auth/http-auth/build.gradle.kts b/runtime/auth/http-auth/build.gradle.kts
index 233e636858..4c6ad7260d 100644
--- a/runtime/auth/http-auth/build.gradle.kts
+++ b/runtime/auth/http-auth/build.gradle.kts
@@ -27,7 +27,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-auth"
-}
diff --git a/runtime/auth/identity-api/build.gradle.kts b/runtime/auth/identity-api/build.gradle.kts
index 16f441b0d1..c1c62a055c 100644
--- a/runtime/auth/identity-api/build.gradle.kts
+++ b/runtime/auth/identity-api/build.gradle.kts
@@ -28,7 +28,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "identity-api"
-}
diff --git a/runtime/crt-util/build.gradle.kts b/runtime/crt-util/build.gradle.kts
index 06fa4087c2..ddc57d11a9 100644
--- a/runtime/crt-util/build.gradle.kts
+++ b/runtime/crt-util/build.gradle.kts
@@ -29,7 +29,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "crt-util"
-}
diff --git a/runtime/observability/logging-slf4j2/build.gradle.kts b/runtime/observability/logging-slf4j2/build.gradle.kts
index 14b41c75ea..2fd9ad4c70 100644
--- a/runtime/observability/logging-slf4j2/build.gradle.kts
+++ b/runtime/observability/logging-slf4j2/build.gradle.kts
@@ -25,7 +25,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "logging-slf4j2"
-}
diff --git a/runtime/observability/telemetry-api/build.gradle.kts b/runtime/observability/telemetry-api/build.gradle.kts
index f76e08a711..f3e1f34703 100644
--- a/runtime/observability/telemetry-api/build.gradle.kts
+++ b/runtime/observability/telemetry-api/build.gradle.kts
@@ -28,7 +28,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "telemetry-api"
-}
diff --git a/runtime/observability/telemetry-defaults/build.gradle.kts b/runtime/observability/telemetry-defaults/build.gradle.kts
index e53164b980..e77655c91d 100644
--- a/runtime/observability/telemetry-defaults/build.gradle.kts
+++ b/runtime/observability/telemetry-defaults/build.gradle.kts
@@ -29,7 +29,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "telemetry-defaults"
-}
diff --git a/runtime/observability/telemetry-provider-micrometer/build.gradle.kts b/runtime/observability/telemetry-provider-micrometer/build.gradle.kts
index a47c755e7c..92296a45db 100644
--- a/runtime/observability/telemetry-provider-micrometer/build.gradle.kts
+++ b/runtime/observability/telemetry-provider-micrometer/build.gradle.kts
@@ -25,7 +25,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "telemetry-provider-micrometer"
-}
diff --git a/runtime/observability/telemetry-provider-otel/build.gradle.kts b/runtime/observability/telemetry-provider-otel/build.gradle.kts
index 50766e800a..bdee5b1d6a 100644
--- a/runtime/observability/telemetry-provider-otel/build.gradle.kts
+++ b/runtime/observability/telemetry-provider-otel/build.gradle.kts
@@ -26,7 +26,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "telemetry-provider-otel"
-}
diff --git a/runtime/protocol/aws-event-stream/build.gradle.kts b/runtime/protocol/aws-event-stream/build.gradle.kts
index 9511433cd9..71ffa46f65 100644
--- a/runtime/protocol/aws-event-stream/build.gradle.kts
+++ b/runtime/protocol/aws-event-stream/build.gradle.kts
@@ -34,7 +34,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-event-stream"
-}
diff --git a/runtime/protocol/aws-json-protocols/build.gradle.kts b/runtime/protocol/aws-json-protocols/build.gradle.kts
index 6deff77d67..bb393d0cff 100644
--- a/runtime/protocol/aws-json-protocols/build.gradle.kts
+++ b/runtime/protocol/aws-json-protocols/build.gradle.kts
@@ -33,7 +33,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-json-protocols"
-}
diff --git a/runtime/protocol/aws-protocol-core/build.gradle.kts b/runtime/protocol/aws-protocol-core/build.gradle.kts
index e70e27c23a..3c88f1b557 100644
--- a/runtime/protocol/aws-protocol-core/build.gradle.kts
+++ b/runtime/protocol/aws-protocol-core/build.gradle.kts
@@ -32,7 +32,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-protocol-core"
-}
diff --git a/runtime/protocol/aws-xml-protocols/build.gradle.kts b/runtime/protocol/aws-xml-protocols/build.gradle.kts
index 4d8fc195f4..ca1dbbafd2 100644
--- a/runtime/protocol/aws-xml-protocols/build.gradle.kts
+++ b/runtime/protocol/aws-xml-protocols/build.gradle.kts
@@ -31,7 +31,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-xml-protocols"
-}
diff --git a/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts b/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts
index 33661f0a6f..d2f411578f 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts
+++ b/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts
@@ -35,7 +35,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-client-engine-crt"
-}
diff --git a/runtime/protocol/http-client-engines/http-client-engine-default/build.gradle.kts b/runtime/protocol/http-client-engines/http-client-engine-default/build.gradle.kts
index 2ddca2c9c9..d2381c39f0 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-default/build.gradle.kts
+++ b/runtime/protocol/http-client-engines/http-client-engine-default/build.gradle.kts
@@ -32,7 +32,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-client-engine-default"
-}
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp/build.gradle.kts b/runtime/protocol/http-client-engines/http-client-engine-okhttp/build.gradle.kts
index 50a88a4372..3e5d139381 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-okhttp/build.gradle.kts
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp/build.gradle.kts
@@ -39,7 +39,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-client-engine-okhttp"
-}
diff --git a/runtime/protocol/http-client-engines/test-suite/build.gradle.kts b/runtime/protocol/http-client-engines/test-suite/build.gradle.kts
index 0905f02429..ece9d6e102 100644
--- a/runtime/protocol/http-client-engines/test-suite/build.gradle.kts
+++ b/runtime/protocol/http-client-engines/test-suite/build.gradle.kts
@@ -136,7 +136,3 @@ tasks.jvmTest {
 gradle.buildFinished {
     startTestServers.stop()
 }
-
-dokka {
-    modulePath = "test-suite"
-}
diff --git a/runtime/protocol/http-client/build.gradle.kts b/runtime/protocol/http-client/build.gradle.kts
index 079007149c..d55e5ffe41 100644
--- a/runtime/protocol/http-client/build.gradle.kts
+++ b/runtime/protocol/http-client/build.gradle.kts
@@ -36,7 +36,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-client"
-}
diff --git a/runtime/protocol/http-test/build.gradle.kts b/runtime/protocol/http-test/build.gradle.kts
index a59f2ea11a..a2077a979c 100644
--- a/runtime/protocol/http-test/build.gradle.kts
+++ b/runtime/protocol/http-test/build.gradle.kts
@@ -33,7 +33,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-test"
-}
diff --git a/runtime/protocol/http/build.gradle.kts b/runtime/protocol/http/build.gradle.kts
index 104d034704..42fcc6927a 100644
--- a/runtime/protocol/http/build.gradle.kts
+++ b/runtime/protocol/http/build.gradle.kts
@@ -29,7 +29,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http"
-}
diff --git a/runtime/protocol/smithy-rpcv2-protocols/build.gradle.kts b/runtime/protocol/smithy-rpcv2-protocols/build.gradle.kts
index aef14c6c43..063995b95c 100644
--- a/runtime/protocol/smithy-rpcv2-protocols/build.gradle.kts
+++ b/runtime/protocol/smithy-rpcv2-protocols/build.gradle.kts
@@ -33,7 +33,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "smithy-rpcv2-protocols"
-}
diff --git a/runtime/runtime-core/build.gradle.kts b/runtime/runtime-core/build.gradle.kts
index bfd4bc7f6a..bbaa9d60ef 100644
--- a/runtime/runtime-core/build.gradle.kts
+++ b/runtime/runtime-core/build.gradle.kts
@@ -42,7 +42,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "runtime-core"
-}
diff --git a/runtime/serde/serde-cbor/build.gradle.kts b/runtime/serde/serde-cbor/build.gradle.kts
index 38fbabdd0b..e561afb774 100644
--- a/runtime/serde/serde-cbor/build.gradle.kts
+++ b/runtime/serde/serde-cbor/build.gradle.kts
@@ -21,7 +21,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "serde-cbor"
-}
diff --git a/runtime/serde/serde-form-url/build.gradle.kts b/runtime/serde/serde-form-url/build.gradle.kts
index e7b4af0374..11d7d7bcfa 100644
--- a/runtime/serde/serde-form-url/build.gradle.kts
+++ b/runtime/serde/serde-form-url/build.gradle.kts
@@ -20,7 +20,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "serde-form-url"
-}
diff --git a/runtime/serde/serde-json/build.gradle.kts b/runtime/serde/serde-json/build.gradle.kts
index 282bc98fe9..aed9342025 100644
--- a/runtime/serde/serde-json/build.gradle.kts
+++ b/runtime/serde/serde-json/build.gradle.kts
@@ -22,7 +22,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "serde-json"
-}
diff --git a/runtime/serde/serde-xml/build.gradle.kts b/runtime/serde/serde-xml/build.gradle.kts
index d2c78d4b25..f3ccc9a64f 100644
--- a/runtime/serde/serde-xml/build.gradle.kts
+++ b/runtime/serde/serde-xml/build.gradle.kts
@@ -22,7 +22,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "serde-xml"
-}
diff --git a/runtime/smithy-client/build.gradle.kts b/runtime/smithy-client/build.gradle.kts
index 862bd5516c..e464e76163 100644
--- a/runtime/smithy-client/build.gradle.kts
+++ b/runtime/smithy-client/build.gradle.kts
@@ -28,7 +28,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "smithy-client"
-}

From 17ffc3e638c7635c9270413b55d261b55ed855f1 Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Thu, 19 Jun 2025 17:55:02 -0400
Subject: [PATCH 2/2] Simplify configuration of `modulePath`

---
 runtime/build.gradle.kts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts
index 7a6945c178..1b1ae3224e 100644
--- a/runtime/build.gradle.kts
+++ b/runtime/build.gradle.kts
@@ -85,4 +85,14 @@ dependencies {
         it.plugins.apply("dokka-convention") // Apply the Dokka conventions plugin to the submodule
         dokka(project(it.path)) // Aggregate the submodule's generated documentation
     }
+
+    subprojects {
+        if (excludeFromDocumentation.contains(this@subprojects.path)) {
+            return@subprojects
+        }
+
+        dokka {
+            modulePath = this@subprojects.name
+        }
+    }
 }