From 06214acc95b644085bf2b303c5b83ba3c69ba0d0 Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Wed, 11 Dec 2024 12:22:13 -0500
Subject: [PATCH 01/19] Docs are getting generated

---
 build.gradle.kts                              | 65 ++++++-------------
 buildSrc/build.gradle.kts                     | 13 ++++
 buildSrc/settings.gradle.kts                  |  9 +++
 .../main/kotlin/dokka-convention.gradle.kts   | 46 +++++++++++++
 .../build.gradle.kts                          |  2 +-
 .../build.gradle.kts                          |  2 +-
 .../smithy-kotlin-codegen/build.gradle.kts    |  2 +-
 docs/dokka-presets/README.md                  |  2 +-
 dokka-smithy/build.gradle.kts                 |  2 +-
 gradle.properties                             |  4 +-
 gradle/libs.versions.toml                     |  8 ++-
 runtime/build.gradle.kts                      | 26 ++++++--
 .../nullability-tests/build.gradle.kts        |  2 +-
 .../codegen/paginator-tests/build.gradle.kts  |  2 +-
 tests/codegen/serde-tests/build.gradle.kts    |  2 +-
 tests/codegen/waiter-tests/build.gradle.kts   |  2 +-
 16 files changed, 124 insertions(+), 65 deletions(-)
 create mode 100644 buildSrc/build.gradle.kts
 create mode 100644 buildSrc/settings.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/dokka-convention.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index ab17214cda..1ec5da06aa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,13 +18,13 @@ buildscript {
 }
 
 plugins {
-    alias(libs.plugins.dokka)
+    `dokka-convention`
     alias(libs.plugins.kotlinx.binary.compatibility.validator)
+    alias(libs.plugins.aws.kotlin.repo.tools.artifactsizemetrics)
     // ensure the correct version of KGP ends up on our buildscript classpath
     // since build-plugins also has <some> version in its dependency closure
-    alias(libs.plugins.kotlin.multiplatform) apply false
-    alias(libs.plugins.kotlin.jvm) apply false
-    alias(libs.plugins.aws.kotlin.repo.tools.artifactsizemetrics)
+    id(libs.plugins.kotlin.multiplatform.get().pluginId) apply false
+    id(libs.plugins.kotlin.jvm.get().pluginId) apply false
 }
 
 artifactSizeMetrics {
@@ -40,32 +40,6 @@ val testJavaVersion = typedProp<String>("test.java.version")?.let {
 }
 
 allprojects {
-    tasks.withType<org.jetbrains.dokka.gradle.AbstractDokkaTask>().configureEach {
-        val sdkVersion: String by project
-        moduleVersion.set(sdkVersion)
-
-        val year = java.time.LocalDate.now().year
-        val pluginConfigMap = mapOf(
-            "org.jetbrains.dokka.base.DokkaBase" to """
-                {
-                    "customStyleSheets": [
-                        "${rootProject.file("docs/dokka-presets/css/logo-styles.css")}",
-                        "${rootProject.file("docs/dokka-presets/css/aws-styles.css")}"
-                    ],
-                    "customAssets": [
-                        "${rootProject.file("docs/dokka-presets/assets/logo-icon.svg")}",
-                        "${rootProject.file("docs/dokka-presets/assets/aws_logo_white_59x35.png")}",
-                        "${rootProject.file("docs/dokka-presets/scripts/accessibility.js")}"
-                    ],
-                    "footerMessage": "© $year, Amazon Web Services, Inc. or its affiliates. All rights reserved.",
-                    "separateInheritedMembers" : true,
-                    "templatesDir": "${rootProject.file("docs/dokka-presets/templates")}"
-                }
-            """,
-        )
-        pluginsMapConfiguration.set(pluginConfigMap)
-    }
-
     if (rootProject.typedProp<Boolean>("kotlinWarningsAsErrors") == true) {
         tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
             kotlinOptions.allWarningsAsErrors = true
@@ -90,27 +64,26 @@ allprojects {
 }
 
 // configure the root multimodule docs
-tasks.dokkaHtmlMultiModule.configure {
+dokka {
     moduleName.set("Smithy Kotlin")
 
-    // Output subprojects' docs to <docs-base>/project-name/* instead of <docs-base>/path/to/project-name/*
-    // This is especially important for inter-repo linking (e.g., via externalDocumentationLink) because the
-    // package-list doesn't contain enough project path information to indicate where modules' documentation are
-    // located.
-    fileLayout.set { parent, child ->
-        parent.outputDirectory.dir(child.moduleName)
+    dokkaPublications.html {
+        includes.from(
+            rootProject.file("docs/dokka-presets/README.md")
+        )
     }
 
-    includes.from(
-        // NOTE: these get concatenated
-        rootProject.file("docs/dokka-presets/README.md"),
-    )
+//    // Output subprojects' docs to <docs-base>/project-name/* instead of <docs-base>/path/to/project-name/*
+//    // This is especially important for inter-repo linking (e.g., via externalDocumentationLink) because the
+//    // package-list doesn't contain enough project path information to indicate where modules' documentation are
+//    // located.
+//    fileLayout.set { parent, child ->
+//        parent.outputDirectory.dir(child.moduleName)
+//    }
+}
 
-    val excludeFromDocumentation = listOf(
-        project(":runtime:testing"),
-        project(":runtime:smithy-test"),
-    )
-    removeChildTasks(excludeFromDocumentation)
+dependencies {
+    dokka(project(":runtime"))
 }
 
 // Publishing
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 0000000000..306b0211ac
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation(libs.dokka.gradle.plugin)
+    implementation(libs.kotlin.gradle.plugin)
+}
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
new file mode 100644
index 0000000000..cd7c4b9af0
--- /dev/null
+++ b/buildSrc/settings.gradle.kts
@@ -0,0 +1,9 @@
+rootProject.name = "buildSrc"
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
new file mode 100644
index 0000000000..a66e6142c9
--- /dev/null
+++ b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
@@ -0,0 +1,46 @@
+import kotlin.text.set
+
+plugins {
+    id("org.jetbrains.dokka")
+}
+
+dokka {
+    val sdkVersion: String by project
+    moduleVersion.set(sdkVersion)
+    moduleName.set("Smithy Kotlin")
+
+    pluginsConfiguration.html {
+        customStyleSheets.from(
+            rootProject.file("docs/dokka-presets/css/logo-styles.css"),
+            rootProject.file("docs/dokka-presets/css/aws-styles.css")
+        )
+
+        customAssets.from(
+            rootProject.file("docs/dokka-presets/assets/logo-icon.svg"),
+            rootProject.file("docs/dokka-presets/assets/aws_logo_white_59x35.png"),
+            rootProject.file("docs/dokka-presets/scripts/accessibility.js")
+        )
+
+        footerMessage.set("© ${java.time.LocalDate.now().year}, Amazon Web Services, Inc. or its affiliates. All rights reserved.")
+        separateInheritedMembers.set(true)
+        templatesDir.set(rootProject.file("docs/dokka-presets/templates"))
+    }
+
+    dokkaPublications.html {
+        includes.from(
+            rootProject.file("docs/dokka-presets/README.md")
+        )
+    }
+
+//    // Output subprojects' docs to <docs-base>/project-name/* instead of <docs-base>/path/to/project-name/*
+//    // This is especially important for inter-repo linking (e.g., via externalDocumentationLink) because the
+//    // package-list doesn't contain enough project path information to indicate where modules' documentation are
+//    // located.
+//    fileLayout.set { parent, child ->
+//        parent.outputDirectory.dir(child.moduleName)
+//    }
+}
+
+dependencies {
+    dokkaPlugin(project(":dokka-smithy"))
+}
\ No newline at end of file
diff --git a/codegen/smithy-aws-kotlin-codegen/build.gradle.kts b/codegen/smithy-aws-kotlin-codegen/build.gradle.kts
index 96a7442a5c..00b0b1f88a 100644
--- a/codegen/smithy-aws-kotlin-codegen/build.gradle.kts
+++ b/codegen/smithy-aws-kotlin-codegen/build.gradle.kts
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     jacoco
     `maven-publish`
 }
diff --git a/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts b/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts
index 3bd714fb60..b24f9ac8b2 100644
--- a/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts
+++ b/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     jacoco
     `maven-publish`
 }
diff --git a/codegen/smithy-kotlin-codegen/build.gradle.kts b/codegen/smithy-kotlin-codegen/build.gradle.kts
index 0381edb03b..0ac6c27c6a 100644
--- a/codegen/smithy-kotlin-codegen/build.gradle.kts
+++ b/codegen/smithy-kotlin-codegen/build.gradle.kts
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     jacoco
     `maven-publish`
 }
diff --git a/docs/dokka-presets/README.md b/docs/dokka-presets/README.md
index e1e6c1a8fd..b7b789debb 100644
--- a/docs/dokka-presets/README.md
+++ b/docs/dokka-presets/README.md
@@ -1 +1 @@
-# Smithy Kotlin API Reference
+# Module Smithy Kotlin API Reference
diff --git a/dokka-smithy/build.gradle.kts b/dokka-smithy/build.gradle.kts
index 3126e0a24d..5725d3ea53 100644
--- a/dokka-smithy/build.gradle.kts
+++ b/dokka-smithy/build.gradle.kts
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
  * SPDX-License-Identifier: Apache-2.0
  */
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
 }
 
 description = "Custom Dokka plugin for Kotlin Smithy SDK API docs"
diff --git a/gradle.properties b/gradle.properties
index 8639149e0e..57851b6e49 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,4 +16,6 @@ org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 sdkVersion=1.3.29-SNAPSHOT
 
 # codegen
-codegenVersion=0.33.29-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.33.29-SNAPSHOT
+
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0683bfc2e1..b92973d3ea 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 kotlin-version = "2.0.21"
-dokka-version = "1.9.10"
+dokka-version = "2.0.0-Beta"
 
 aws-kotlin-repo-tools-version = "0.4.16"
 
@@ -34,12 +34,14 @@ jsoup-version = "1.18.1"
 [libraries]
 aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" }
 
+kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-version" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-version"}
 kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin-version"}
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin-version" }
 kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "kotlin-version" }
 dokka-core = { module = "org.jetbrains.dokka:dokka-core", version.ref = "dokka-version" }
 dokka-base = { module = "org.jetbrains.dokka:dokka-base", version.ref = "dokka-version" }
+dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka-version" }
 
 kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu-version" }
 kotlinx-atomicfu-plugin = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "atomicfu-version" }
@@ -101,8 +103,8 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup-version" }
 
 [plugins]
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka-version"}
-kotlin-jvm = {id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" }
-kotlin-multiplatform = {id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-version" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-version" }
 kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlinx-benchmark-version" }
 kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version"}
diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts
index 82a5b5fe56..8c086e346d 100644
--- a/runtime/build.gradle.kts
+++ b/runtime/build.gradle.kts
@@ -4,10 +4,11 @@
  */
 import aws.sdk.kotlin.gradle.dsl.configurePublishing
 import aws.sdk.kotlin.gradle.kmp.*
+import org.gradle.kotlin.dsl.apply
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    alias(libs.plugins.dokka)
+    `dokka-convention`
     alias(libs.plugins.aws.kotlin.repo.tools.kmp) apply false
     jacoco
 }
@@ -24,7 +25,6 @@ subprojects {
 
     apply {
         plugin("org.jetbrains.kotlin.multiplatform")
-        plugin("org.jetbrains.dokka")
         plugin(libraries.plugins.aws.kotlin.repo.tools.kmp.get().pluginId)
     }
 
@@ -62,10 +62,6 @@ subprojects {
         listOf("kotlin.RequiresOptIn").forEach { languageSettings.optIn(it) }
     }
 
-    dependencies {
-        dokkaPlugin(project(":dokka-smithy"))
-    }
-
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_1_8)
@@ -78,3 +74,21 @@ subprojects {
         }
     }
 }
+
+
+val excludeFromDocumentation = listOf(
+    ":runtime:testing",
+    ":runtime:smithy-test",
+)
+
+subprojects
+    .filterNot { excludeFromDocumentation.contains(it.path) }
+    .forEach {
+        it.plugins.apply("dokka-convention")
+    }
+
+dependencies {
+    subprojects.filterNot { excludeFromDocumentation.contains(it.path) }.forEach {
+        dokka(project(it.path))
+    }
+}
diff --git a/tests/codegen/nullability-tests/build.gradle.kts b/tests/codegen/nullability-tests/build.gradle.kts
index e69809dc62..b05b7635b5 100644
--- a/tests/codegen/nullability-tests/build.gradle.kts
+++ b/tests/codegen/nullability-tests/build.gradle.kts
@@ -6,7 +6,7 @@ import aws.sdk.kotlin.gradle.codegen.smithyKotlinProjectionSrcDir
 import aws.sdk.kotlin.gradle.dsl.skipPublishing
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     alias(libs.plugins.aws.kotlin.repo.tools.smithybuild)
 }
 
diff --git a/tests/codegen/paginator-tests/build.gradle.kts b/tests/codegen/paginator-tests/build.gradle.kts
index caa3afbe42..948f2b0795 100644
--- a/tests/codegen/paginator-tests/build.gradle.kts
+++ b/tests/codegen/paginator-tests/build.gradle.kts
@@ -6,7 +6,7 @@ import aws.sdk.kotlin.gradle.codegen.smithyKotlinProjectionSrcDir
 import aws.sdk.kotlin.gradle.dsl.skipPublishing
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     alias(libs.plugins.aws.kotlin.repo.tools.smithybuild)
 }
 
diff --git a/tests/codegen/serde-tests/build.gradle.kts b/tests/codegen/serde-tests/build.gradle.kts
index 0bfe1ca086..f28091e7e7 100644
--- a/tests/codegen/serde-tests/build.gradle.kts
+++ b/tests/codegen/serde-tests/build.gradle.kts
@@ -6,7 +6,7 @@ import aws.sdk.kotlin.gradle.codegen.smithyKotlinProjectionSrcDir
 import aws.sdk.kotlin.gradle.dsl.skipPublishing
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     alias(libs.plugins.aws.kotlin.repo.tools.smithybuild)
 }
 
diff --git a/tests/codegen/waiter-tests/build.gradle.kts b/tests/codegen/waiter-tests/build.gradle.kts
index 4c48a80c6f..72b244a6c9 100644
--- a/tests/codegen/waiter-tests/build.gradle.kts
+++ b/tests/codegen/waiter-tests/build.gradle.kts
@@ -6,7 +6,7 @@ import aws.sdk.kotlin.gradle.codegen.smithyKotlinProjectionSrcDir
 import aws.sdk.kotlin.gradle.dsl.skipPublishing
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     alias(libs.plugins.aws.kotlin.repo.tools.smithybuild)
 }
 

From 429524787b1fa653317b0037a2b7f9e3239d191e Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Wed, 11 Dec 2024 12:27:47 -0500
Subject: [PATCH 02/19] Correct dokka-convention plugin

---
 .../src/main/kotlin/dokka-convention.gradle.kts   | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
index a66e6142c9..77812bce2d 100644
--- a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
+++ b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
@@ -7,7 +7,6 @@ plugins {
 dokka {
     val sdkVersion: String by project
     moduleVersion.set(sdkVersion)
-    moduleName.set("Smithy Kotlin")
 
     pluginsConfiguration.html {
         customStyleSheets.from(
@@ -25,20 +24,6 @@ dokka {
         separateInheritedMembers.set(true)
         templatesDir.set(rootProject.file("docs/dokka-presets/templates"))
     }
-
-    dokkaPublications.html {
-        includes.from(
-            rootProject.file("docs/dokka-presets/README.md")
-        )
-    }
-
-//    // Output subprojects' docs to <docs-base>/project-name/* instead of <docs-base>/path/to/project-name/*
-//    // This is especially important for inter-repo linking (e.g., via externalDocumentationLink) because the
-//    // package-list doesn't contain enough project path information to indicate where modules' documentation are
-//    // located.
-//    fileLayout.set { parent, child ->
-//        parent.outputDirectory.dir(child.moduleName)
-//    }
 }
 
 dependencies {

From 21694f30a7bbc1fed847f89ee5ed3f531c61ca43 Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Wed, 11 Dec 2024 12:30:54 -0500
Subject: [PATCH 03/19] ktlint

---
 .editorconfig                                        | 5 ++++-
 build.gradle.kts                                     | 2 +-
 buildSrc/settings.gradle.kts                         | 2 +-
 buildSrc/src/main/kotlin/dokka-convention.gradle.kts | 6 +++---
 runtime/build.gradle.kts                             | 1 -
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 47da0e8886..97c8967110 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,4 +9,7 @@ ktlint_standard_backing-property-naming = disabled
 # enable trailing commas per JetBrains recommendation
 # (https://kotlinlang.org/docs/coding-conventions.html#trailing-commas)
 ij_kotlin_allow_trailing_comma_on_call_site = true
-ij_kotlin_allow_trailing_comma = true
\ No newline at end of file
+ij_kotlin_allow_trailing_comma = true
+
+[buildSrc/build/**]
+ktlint = disabled
diff --git a/build.gradle.kts b/build.gradle.kts
index 1ec5da06aa..941814da30 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -69,7 +69,7 @@ dokka {
 
     dokkaPublications.html {
         includes.from(
-            rootProject.file("docs/dokka-presets/README.md")
+            rootProject.file("docs/dokka-presets/README.md"),
         )
     }
 
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index cd7c4b9af0..62991c1ef5 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -6,4 +6,4 @@ dependencyResolutionManagement {
             from(files("../gradle/libs.versions.toml"))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
index 77812bce2d..9e3a40e63d 100644
--- a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
+++ b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
@@ -11,13 +11,13 @@ dokka {
     pluginsConfiguration.html {
         customStyleSheets.from(
             rootProject.file("docs/dokka-presets/css/logo-styles.css"),
-            rootProject.file("docs/dokka-presets/css/aws-styles.css")
+            rootProject.file("docs/dokka-presets/css/aws-styles.css"),
         )
 
         customAssets.from(
             rootProject.file("docs/dokka-presets/assets/logo-icon.svg"),
             rootProject.file("docs/dokka-presets/assets/aws_logo_white_59x35.png"),
-            rootProject.file("docs/dokka-presets/scripts/accessibility.js")
+            rootProject.file("docs/dokka-presets/scripts/accessibility.js"),
         )
 
         footerMessage.set("© ${java.time.LocalDate.now().year}, Amazon Web Services, Inc. or its affiliates. All rights reserved.")
@@ -28,4 +28,4 @@ dokka {
 
 dependencies {
     dokkaPlugin(project(":dokka-smithy"))
-}
\ No newline at end of file
+}
diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts
index 8c086e346d..61057e5bb9 100644
--- a/runtime/build.gradle.kts
+++ b/runtime/build.gradle.kts
@@ -75,7 +75,6 @@ subprojects {
     }
 }
 
-
 val excludeFromDocumentation = listOf(
     ":runtime:testing",
     ":runtime:smithy-test",

From 1ef6ce1f2d9d1df4c156c898e33fd560cee7edab Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Wed, 11 Dec 2024 12:32:04 -0500
Subject: [PATCH 04/19] revert README change

---
 docs/dokka-presets/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/dokka-presets/README.md b/docs/dokka-presets/README.md
index b7b789debb..e1e6c1a8fd 100644
--- a/docs/dokka-presets/README.md
+++ b/docs/dokka-presets/README.md
@@ -1 +1 @@
-# Module Smithy Kotlin API Reference
+# Smithy Kotlin API Reference

From 5b3f1e10eed85da9984e963939ff6696941f9a3a Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Wed, 11 Dec 2024 12:32:55 -0500
Subject: [PATCH 05/19] Disable V2 helpers

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 57851b6e49..b882f9c78f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,4 @@ sdkVersion=1.3.29-SNAPSHOT
 # codegen
 codegenVersion=0.33.29-SNAPSHOT
 
-org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From f49cc50820be5af626983fd6682060e7dce941dc Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Wed, 11 Dec 2024 12:35:19 -0500
Subject: [PATCH 06/19] Combine config blocks

---
 runtime/build.gradle.kts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts
index 61057e5bb9..7a6945c178 100644
--- a/runtime/build.gradle.kts
+++ b/runtime/build.gradle.kts
@@ -80,14 +80,9 @@ val excludeFromDocumentation = listOf(
     ":runtime:smithy-test",
 )
 
-subprojects
-    .filterNot { excludeFromDocumentation.contains(it.path) }
-    .forEach {
-        it.plugins.apply("dokka-convention")
-    }
-
 dependencies {
     subprojects.filterNot { excludeFromDocumentation.contains(it.path) }.forEach {
-        dokka(project(it.path))
+        it.plugins.apply("dokka-convention") // Apply the Dokka conventions plugin to the submodule
+        dokka(project(it.path)) // Aggregate the submodule's generated documentation
     }
 }

From 30becbb0f028ae0975e0cd472d468660bfd658c3 Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Wed, 11 Dec 2024 12:37:26 -0500
Subject: [PATCH 07/19] Remove fileLayout config, does not seem necessary
 anymore

---
 build.gradle.kts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 941814da30..8c66b78fe4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -72,14 +72,6 @@ dokka {
             rootProject.file("docs/dokka-presets/README.md"),
         )
     }
-
-//    // Output subprojects' docs to <docs-base>/project-name/* instead of <docs-base>/path/to/project-name/*
-//    // This is especially important for inter-repo linking (e.g., via externalDocumentationLink) because the
-//    // package-list doesn't contain enough project path information to indicate where modules' documentation are
-//    // located.
-//    fileLayout.set { parent, child ->
-//        parent.outputDirectory.dir(child.moduleName)
-//    }
 }
 
 dependencies {

From dfe21bf40ee3a81d7a2a0dfa4cdc9fa273ea3495 Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Wed, 11 Dec 2024 12:39:33 -0500
Subject: [PATCH 08/19] Changelog

---
 .changes/bff93ee1-3d3b-4e21-b19f-7f9b3a61a04c.json | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changes/bff93ee1-3d3b-4e21-b19f-7f9b3a61a04c.json

diff --git a/.changes/bff93ee1-3d3b-4e21-b19f-7f9b3a61a04c.json b/.changes/bff93ee1-3d3b-4e21-b19f-7f9b3a61a04c.json
new file mode 100644
index 0000000000..c6bda7dc7b
--- /dev/null
+++ b/.changes/bff93ee1-3d3b-4e21-b19f-7f9b3a61a04c.json
@@ -0,0 +1,5 @@
+{
+    "id": "bff93ee1-3d3b-4e21-b19f-7f9b3a61a04c",
+    "type": "misc",
+    "description": "Upgrade to Dokka v2.0.0-Beta"
+}
\ No newline at end of file

From 4fee104a65251a24c891c2f4f11e962aea2c4d34 Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Thu, 23 Jan 2025 14:51:53 -0500
Subject: [PATCH 09/19] Upgrade to Dokka 2.0.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 061f5181d5..3d81e493ad 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 kotlin-version = "2.1.0"
-dokka-version = "2.0.0-Beta"
+dokka-version = "2.0.0"
 
 aws-kotlin-repo-tools-version = "0.4.18"
 

From ff216a1edabf97116bc7c57eafe005fc937b20bb Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Fri, 24 Jan 2025 10:47:05 -0500
Subject: [PATCH 10/19] kotlinOptions -> compilerOptions

---
 build.gradle.kts                                 | 2 +-
 tests/codegen/nullability-tests/build.gradle.kts | 2 +-
 tests/codegen/serde-tests/build.gradle.kts       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 8c66b78fe4..0d2e027b96 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -42,7 +42,7 @@ val testJavaVersion = typedProp<String>("test.java.version")?.let {
 allprojects {
     if (rootProject.typedProp<Boolean>("kotlinWarningsAsErrors") == true) {
         tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-            kotlinOptions.allWarningsAsErrors = true
+            compilerOptions.allWarningsAsErrors = true
         }
     }
 
diff --git a/tests/codegen/nullability-tests/build.gradle.kts b/tests/codegen/nullability-tests/build.gradle.kts
index b05b7635b5..89e335cb34 100644
--- a/tests/codegen/nullability-tests/build.gradle.kts
+++ b/tests/codegen/nullability-tests/build.gradle.kts
@@ -46,7 +46,7 @@ kotlin.sourceSets.getByName("main") {
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     dependsOn(tasks.generateSmithyProjections)
     // FIXME - generated code has warnings unfortunately, see https://github.com/awslabs/aws-sdk-kotlin/issues/1169
-    kotlinOptions.allWarningsAsErrors = false
+    compilerOptions.allWarningsAsErrors = false
 }
 
 tasks.test {
diff --git a/tests/codegen/serde-tests/build.gradle.kts b/tests/codegen/serde-tests/build.gradle.kts
index f28091e7e7..cbde9d4059 100644
--- a/tests/codegen/serde-tests/build.gradle.kts
+++ b/tests/codegen/serde-tests/build.gradle.kts
@@ -97,7 +97,7 @@ kotlin.sourceSets.getByName("main") {
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     dependsOn(stageGeneratedSources)
     // generated code has warnings unfortunately, see https://github.com/awslabs/aws-sdk-kotlin/issues/1169
-    kotlinOptions.allWarningsAsErrors = false
+    compilerOptions.allWarningsAsErrors = false
 }
 
 tasks.clean.configure {

From ead3683c949336e4d65e3d2b8a6b96fbc44a2ff0 Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Fri, 24 Jan 2025 10:47:21 -0500
Subject: [PATCH 11/19] Bump to latest versions

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f9310ad381..8bcaa16cae 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin-version = "2.1.0"
 dokka-version = "2.0.0"
 
-aws-kotlin-repo-tools-version = "0.4.18"
+aws-kotlin-repo-tools-version = "0.4.19"
 
 # libs
 coroutines-version = "1.9.0"

From 865e4a4b34a5e154f61a71938cc501454be6fde8 Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Fri, 24 Jan 2025 13:01:02 -0500
Subject: [PATCH 12/19] Style changes

---
 .../main/kotlin/dokka-convention.gradle.kts   |   3 -
 .../assets/aws_logo_white_59x35.png           | Bin 2278 -> 0 bytes
 docs/dokka-presets/assets/logo-icon.svg       |  16 +--
 docs/dokka-presets/css/aws-styles.css         |  92 ++++--------------
 docs/dokka-presets/css/logo-styles.css        |  39 --------
 docs/dokka-presets/scripts/accessibility.js   |  82 +++-------------
 docs/dokka-presets/templates/base.ftl         |  46 ---------
 .../templates/includes/footer.ftl             |   8 --
 .../templates/includes/header.ftl             |  28 ------
 .../templates/includes/page_metadata.ftl      |   7 --
 .../includes/source_set_selector.ftl          |  10 --
 11 files changed, 32 insertions(+), 299 deletions(-)
 delete mode 100644 docs/dokka-presets/assets/aws_logo_white_59x35.png
 delete mode 100644 docs/dokka-presets/css/logo-styles.css
 delete mode 100644 docs/dokka-presets/templates/base.ftl
 delete mode 100644 docs/dokka-presets/templates/includes/footer.ftl
 delete mode 100644 docs/dokka-presets/templates/includes/header.ftl
 delete mode 100644 docs/dokka-presets/templates/includes/page_metadata.ftl
 delete mode 100644 docs/dokka-presets/templates/includes/source_set_selector.ftl

diff --git a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
index 9e3a40e63d..6527053738 100644
--- a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
+++ b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
@@ -10,19 +10,16 @@ dokka {
 
     pluginsConfiguration.html {
         customStyleSheets.from(
-            rootProject.file("docs/dokka-presets/css/logo-styles.css"),
             rootProject.file("docs/dokka-presets/css/aws-styles.css"),
         )
 
         customAssets.from(
             rootProject.file("docs/dokka-presets/assets/logo-icon.svg"),
-            rootProject.file("docs/dokka-presets/assets/aws_logo_white_59x35.png"),
             rootProject.file("docs/dokka-presets/scripts/accessibility.js"),
         )
 
         footerMessage.set("© ${java.time.LocalDate.now().year}, Amazon Web Services, Inc. or its affiliates. All rights reserved.")
         separateInheritedMembers.set(true)
-        templatesDir.set(rootProject.file("docs/dokka-presets/templates"))
     }
 }
 
diff --git a/docs/dokka-presets/assets/aws_logo_white_59x35.png b/docs/dokka-presets/assets/aws_logo_white_59x35.png
deleted file mode 100644
index a35f38afd376e2dd813515b371ab0c0e389aacf3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2278
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
AdH?_b

diff --git a/docs/dokka-presets/assets/logo-icon.svg b/docs/dokka-presets/assets/logo-icon.svg
index ba320e493d..7011eb7c39 100644
--- a/docs/dokka-presets/assets/logo-icon.svg
+++ b/docs/dokka-presets/assets/logo-icon.svg
@@ -1,15 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">  <image id="image0" width="16" height="16" x="0" y="0"
-    xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
-AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAkFBMVEX////9mCf9mCf9mCf9
-mCf9mCf9mCf9mCf9mCfzfCP0fiP6jyb2hSXqYyDsaCH1gSTsaSHpXyD2hSTvcSLzfSP4iSXyeiPp
-YCDzfCPzfCPpXyDpXyDzfCPzfCPpXyDpXyDzfCPzfCPpXyDpXyDzfCPzeyPpXyDpXyD9mCfzfCP7
-kyb5jSbpXyD8lif8lCf///9jOjcpAAAAKHRSTlMAUOAwwBCggPBA8PX18Ezo6EDo6Pbw8PaA8PCA
-EKCgEDDAwDBQ6OBQjKuQ+AAAAAFiS0dEAIgFHUgAAAAHdElNRQflBBwRMSsSF1nDAAAAeElEQVQY
-053PyQKCMAxF0ZS5DqgIiiggOJBI8P8/TwuFsuau+s6qAegTliXAZDv4z7H1dD3Uea7afoBTgQ8g
-V2sDm20Ikmj3GWa7Zz4oIIo6xO+ReQKKk9OZ50DEvBwgvRjIruqrt3yEotTX3CsF9WN27/P1bobX
-D4qaG2DrJKPCAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIxLTA0LTI4VDE3OjQ5OjQzKzAzOjAwXlQE
-twAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMS0wNC0yOFQxNzo0OTo0MyswMzowMC8JvAsAAAAASUVO
-RK5CYII=" />
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 51.82"><defs><style>.cls-1{fill:#df231d;}</style></defs><path class="cls-1" d="M82,51.82s0,0,0,0H16.3s0,0,0,0v-7.53l19.23-8.99s0,0,0,0v-6.44L0,11.8V0s0,0,0,0h69.03v35.29l12.97,16.53ZM100,4.08h-24.45v24.77l24.45-24.77Z"/></svg>
\ No newline at end of file
diff --git a/docs/dokka-presets/css/aws-styles.css b/docs/dokka-presets/css/aws-styles.css
index 3781deecee..936e30b789 100644
--- a/docs/dokka-presets/css/aws-styles.css
+++ b/docs/dokka-presets/css/aws-styles.css
@@ -4,45 +4,29 @@
  */
 
 :root {
-    --aws-color-dark: #232f3e;
-    --horizontal-spacing-for-content: 16px;
-    --default-font-family: JetBrains Sans, Inter, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI,Roboto, Oxygen, Ubuntu,Cantarell, Droid Sans, Helvetica Neue, Arial, sans-serif;
+    --color-background-nav: #232f3e;
+    --dokka-logo-height: 60px;
+    --dokka-logo-width: 90px;
 }
 
-.menu-toggle {
-    background: none;
-}
-
-.menu-toggle:focus {
-    outline: 2px solid #fff; /* White outline */
-    outline-offset: 2px;    /* Space between the outline and the button */
-}
-
-#pages-search:focus {
-    outline: revert;
-}
-
-/* copied from Dokka except for background-color attribute */
-.navigation {
-    display: flex;
-    justify-content: space-between;
-
-    color: #fff;
-    background-color: var(--aws-color-dark);
-    font-family: var(--default-font-family);
-    letter-spacing: -0.1px;
-
-    /* Reset margin and use padding for border */
-    margin-left: 0;
-    margin-right: 0;
-    padding: 10px var(--horizontal-spacing-for-content);
-
-    z-index: 4;
+.skip-to-content {
+    position: absolute; /* Remove from normal flow */
+    top: 0; /* Position off-screen */
+    left: 0;
+    width: 1px;
+    height: 1px;
+    overflow: hidden;
+    opacity: 0;
+    z-index: -1; /* Ensure it's not visible */
 }
 
-/* Styles for section tabs like "Types" and "Functions" */
-.section-tab:focus, .section-tab:active {
-    outline: 2px solid var(--active-tab-border-color); /* The color appears unresolved, but it is defined in Dokka style sheets */
+.skip-to-content:focus,
+.skip-to-content:active {
+    position: static; /* Restore to normal flow when focused */
+    width: auto;
+    height: auto;
+    opacity: 1;
+    z-index: 999; /* Ensure it's on top */
 }
 
 /*
@@ -55,44 +39,6 @@
 .symbol {
     overflow-wrap: break-word;
 }
-
 .keyValue {
     display: block;
-}
-
-/*
-    Disable the playground run button for generated samples
-    https://github.com/Kotlin/dokka/issues/3041
-*/
-div .compiler-info, .fold-button, .run-button {
-    display: none;
-}
-
-.skip-to-content {
-    width: 1px;
-    height: 1px;
-    overflow: hidden;
-    opacity: 0;
-}
-
-.skip-to-content:focus,
-.skip-to-content:active {
-    width: auto;
-    height: auto;
-    opacity: 1;
-    z-index: 999; /* Ensure the skip link is on top of other content */
-}
-
-.aws-toggle-content-btn {
-    font-size: 24px;
-    background: none;
-    border: none;
-    cursor: pointer;
-    padding: 8px;
-}
-
-@media (max-width: 550px) {
-    .content[data-togglable] {
-        display: none;
-    }
 }
\ No newline at end of file
diff --git a/docs/dokka-presets/css/logo-styles.css b/docs/dokka-presets/css/logo-styles.css
deleted file mode 100644
index e53d3a536c..0000000000
--- a/docs/dokka-presets/css/logo-styles.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-.library-name a {
-    position: relative;
-    --logo-width: 72px;
-    margin-left: calc(var(--logo-width) + 5px);
-    display: flex;
-    align-items: center;
-    color: #fff;
-    font-weight: 700;
-    margin-top: 10px;
-    margin-right: 8px;
-}
-
-.library-name a::before {
-    content: '';
-    /* path is relative to final asset location output dir */
-    background-image: url('../images/aws_logo_white_59x35.png');
-    background-size: contain;
-    position: absolute;
-    width: 59px;
-    height: 35px;
-    left: calc(-1 * var(--logo-width) - 5px);
-    margin-right: 5px;
-}
-
-/* Copied from Dokka except `top` replaced with `margin-top` attribute */
-.library-version {
-    position: relative;
-    margin-left: 3px;
-    color: rgba(255,255,255,.7);
-    font-size: 13px;
-    font-weight: normal;
-    line-height: 16px;
-    margin-top: 19px;
-}
diff --git a/docs/dokka-presets/scripts/accessibility.js b/docs/dokka-presets/scripts/accessibility.js
index c27d4531ea..aa61b12f9f 100644
--- a/docs/dokka-presets/scripts/accessibility.js
+++ b/docs/dokka-presets/scripts/accessibility.js
@@ -1,8 +1,8 @@
 /**
- * Check for elements with a navButton class, which indicates the sidebar has finished loading.
+ * Check for elements with a `toc--button` class, which indicates the sidebar has finished loading.
  */
 async function dispatchNavigationLoadedEvent() {
-    while (!document.querySelectorAll('.navButton').length > 0) {
+    while (!document.querySelectorAll('.toc--button').length > 0) {
         await new Promise(resolve => setTimeout(resolve, 100));
     }
     window.dispatchEvent(new Event('navigationLoaded'));
@@ -12,7 +12,7 @@ document.addEventListener('DOMContentLoaded', dispatchNavigationLoadedEvent);
 if (document.readyState === "interactive" || document.readyState === "complete" ) { dispatchNavigationLoadedEvent() }
 
 /**
- * Apply "skip to main content" buttons after each active left sidebar `sideMenuPart`.
+ * Apply "skip to main content" buttons after each active left sidebar `toc--part`.
  * These are invisible and only accessible via keyboard
  * Fixes accessibility violation: "Provide a mechanism for skipping past repetitive content"
  */
@@ -42,20 +42,20 @@ function applySkipLinks() {
 
     function handleChanges(mutationsList) {
         for (const mutation of mutationsList) {
-            if (mutation.type === 'attributes' && mutation.target.classList.contains('sideMenuPart') && !mutation.target.classList.contains('hidden')) {
+            if (mutation.type === 'attributes' && mutation.target.classList.contains('toc--part') && !mutation.target.classList.contains('toc--part_hidden')) {
                 insertSkipLink(mutation.target);
             }
         }
+    }
 
-        // Insert a skip link on all sideMenuParts with [data-active] property
-        document.querySelectorAll('.sideMenuPart[data-active]').forEach(function(sideMenuPart) {
-            insertSkipLink(sideMenuPart)
-        });
+    // Insert a skip link on all visible toc-parts
+    document.querySelectorAll('.toc--part:not(.toc--part_hidden)').forEach(function(sideMenuPart) {
+        insertSkipLink(sideMenuPart)
+    });
 
-        // Insert a skip link on the first sideMenuPart
-        const firstSideMenuPart = document.getElementById("sideMenu").children[0].querySelectorAll(".sideMenuPart")[0]
-        insertSkipLink(firstSideMenuPart)
-    }
+    // Insert a skip link on the first toc-part, regardless of visibility.
+    const firstSideMenuPart = document.getElementById("sideMenu").children[0].querySelectorAll(".toc--part")[0]
+    insertSkipLink(firstSideMenuPart)
 
     const observer = new MutationObserver(handleChanges);
     const observerConfig = {
@@ -67,61 +67,3 @@ function applySkipLinks() {
     observer.observe(document.body, observerConfig);
 }
 window.addEventListener('navigationLoaded', applySkipLinks);
-
-/**
- * Ensure `navButton` elements are interactable and have proper accessibility properties
- * Fixes accessibilty violation: "Ensure all interactive functionality is operable with the keyboard"
- */
-function ensureNavButtonInteractable() {
-    const navButtons = document.querySelectorAll('.navButton');
-
-    navButtons.forEach(function(navButton) {
-        if (navButton.hasAttribute('aria-expanded')) {
-            return;
-        }
-
-        // Make the navButton focusable, add accessibility information
-        navButton.setAttribute('tabindex', '0');
-        navButton.setAttribute('role', 'button');
-
-        const sideMenuPartParent = navButton.closest(".sideMenuPart")
-        const navButtonExpanded = sideMenuPartParent ? (sideMenuPartParent.classList.contains('hidden') ? 'false' : 'true') : 'false'
-        navButton.setAttribute('aria-expanded', navButtonExpanded);
-
-        // Grab the page ID, use it for aria-label and aria-controls
-        const sectionName = navButton.parentElement.parentElement.getAttribute('pageid')
-        // Remove the page ID suffix auto-generated by Dokka
-        const cleanedSectionName = sectionName.substring(0, sectionName.indexOf("////PointingToDeclaration"))
-        navButton.setAttribute('aria-label', cleanedSectionName);
-
-        const sectionID = navButton.parentElement.parentElement.id
-        navButton.setAttribute('aria-controls', sectionID);
-
-        // Add event listener for Enter and Space keys
-        navButton.addEventListener('keydown', function(event) {
-            if (event.key === 'Enter' || event.key === ' ') {
-                event.preventDefault(); // Prevent the default action to avoid navigation
-                this.click(); // Trigger the onclick event
-            }
-        });
-
-        // Update aria-expanded attribute on click
-        navButton.addEventListener('click', function() {
-            const isExpanded = navButton.getAttribute('aria-expanded') === 'true';
-            navButton.setAttribute('aria-expanded', (!isExpanded).toString());
-        });
-    });
-}
-window.addEventListener('navigationLoaded', ensureNavButtonInteractable);
-
-/**
- * Ensure that content (specifically, code blocks) reflows on small page sizes.
- * Fixes accessibility violation: "Ensure pages reflow without requiring two-dimensional scrolling without loss of content or functionality"
- */
-function ensureContentReflow() {
-    // Ensure `content` sections are reflowable
-    document.querySelectorAll('.content[data-togglable]').forEach(function(content) {
-        content.style.display = 'block'
-    });
-}
-window.addEventListener('navigationLoaded', ensureContentReflow);
\ No newline at end of file
diff --git a/docs/dokka-presets/templates/base.ftl b/docs/dokka-presets/templates/base.ftl
deleted file mode 100644
index 81bd1f0982..0000000000
--- a/docs/dokka-presets/templates/base.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-<#-- This is an unchanged copy of Dokka's base.ftl -->
-<#import "includes/page_metadata.ftl" as page_metadata>
-<#import "includes/header.ftl" as header>
-<#import "includes/footer.ftl" as footer>
-<!DOCTYPE html>
-<html class="no-js" lang="en">
-<head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <@page_metadata.display/>
-    <@template_cmd name="pathToRoot"><script>var pathToRoot = "${pathToRoot}";</script></@template_cmd>
-    <script>document.documentElement.classList.replace("no-js","js");</script>
-    <#-- This script doesn't need to be there but it is nice to have
-    since app in dark mode doesn't 'blink' (class is added before it is rendered) -->
-    <script>const storage = localStorage.getItem("dokka-dark-mode")
-        if (storage == null) {
-            const osDarkSchemePreferred = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
-            if (osDarkSchemePreferred === true) {
-                document.getElementsByTagName("html")[0].classList.add("theme-dark")
-            }
-        } else {
-            const savedDarkMode = JSON.parse(storage)
-            if(savedDarkMode === true) {
-                document.getElementsByTagName("html")[0].classList.add("theme-dark")
-            }
-        }
-    </script>
-    <#-- Resources (scripts, stylesheets) are handled by Dokka.
-    Use customStyleSheets and customAssets to change them. -->
-    <@resources/>
-</head>
-<body>
-<div class="root">
-    <@header.display/>
-    <div id="container">
-        <div class="sidebar" id="leftColumn">
-            <div><a class="skip-to-content" href="#content" tabindex="0">Skip to Main Content</a></div>
-            <div class="sidebar--inner" id="sideMenu"></div>
-        </div>
-        <div id="main">
-            <@content/>
-            <@footer.display/>
-        </div>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/dokka-presets/templates/includes/footer.ftl b/docs/dokka-presets/templates/includes/footer.ftl
deleted file mode 100644
index 157f0b9542..0000000000
--- a/docs/dokka-presets/templates/includes/footer.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- This is an unchanged copy of Dokka's footer.ftl -->
-<#macro display>
-    <div class="footer">
-        <span class="go-to-top-icon"><a href="#content" id="go-to-top-link"></a></span><span>${footerMessage}</span><span
-                class="pull-right"><span>Generated by </span><a
-                href="https://github.com/Kotlin/dokka"><span>dokka</span><span class="padded-icon"></span></a></span>
-    </div>
-</#macro>
\ No newline at end of file
diff --git a/docs/dokka-presets/templates/includes/header.ftl b/docs/dokka-presets/templates/includes/header.ftl
deleted file mode 100644
index 4ef1f0ed12..0000000000
--- a/docs/dokka-presets/templates/includes/header.ftl
+++ /dev/null
@@ -1,28 +0,0 @@
-<#-- This is a modified copy of Dokka's header.ftl, adding a label to the search icon to allow focusing on it. -->
-<#import "source_set_selector.ftl" as source_set_selector>
-<#macro display>
-    <nav class="navigation" id="navigation-wrapper">
-        <div class="navigation--inner">
-            <div class="navigation-title">
-                <button class="menu-toggle" id="menu-toggle" type="button">toggle menu</button>
-                <div class="library-name">
-                    <@template_cmd name="pathToRoot">
-                        <a class="library-name--link" href="${pathToRoot}index.html">
-                            <@template_cmd name="projectName">
-                                ${projectName}
-                            </@template_cmd>
-                        </a>
-                    </@template_cmd>
-                </div>
-                <div class="library-version">
-                    <#-- This can be handled by the versioning plugin -->
-                    <@version/>
-                </div>
-            </div>
-            <@source_set_selector.display/>
-        </div>
-        <div class="navigation-controls">
-            <button class="navigation-controls--btn navigation-controls--theme" id="theme-toggle-button" type="button">switch theme</button>
-        </div>
-    </nav>
-</#macro>
\ No newline at end of file
diff --git a/docs/dokka-presets/templates/includes/page_metadata.ftl b/docs/dokka-presets/templates/includes/page_metadata.ftl
deleted file mode 100644
index fbfed49067..0000000000
--- a/docs/dokka-presets/templates/includes/page_metadata.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-<#-- This is an unchanged copy of Dokka's page_metadata.ftl -->
-<#macro display>
-    <title>${pageName}</title>
-    <@template_cmd name="pathToRoot">
-    <link href="${pathToRoot}images/logo-icon.svg" rel="icon" type="image/svg">
-    </@template_cmd>
-</#macro>
diff --git a/docs/dokka-presets/templates/includes/source_set_selector.ftl b/docs/dokka-presets/templates/includes/source_set_selector.ftl
deleted file mode 100644
index 1e7ed967a8..0000000000
--- a/docs/dokka-presets/templates/includes/source_set_selector.ftl
+++ /dev/null
@@ -1,10 +0,0 @@
-<#-- This is an unchanged copy of Dokka's source_set_selector.ftl -->
-<#macro display>
-    <#if sourceSets?has_content>
-        <div class="filter-section" id="filter-section">
-            <#list sourceSets as ss>
-                <button class="platform-tag platform-selector ${ss.platform}-like" data-active="" data-filter="${ss.filter}">${ss.name}</button>
-            </#list>
-        </div>
-    </#if>
-</#macro>
\ No newline at end of file

From 5ad6cb46988efc23fe23d9d83ed3865099c7bba9 Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Fri, 24 Jan 2025 13:02:24 -0500
Subject: [PATCH 13/19] Delete changelog

---
 .changes/bff93ee1-3d3b-4e21-b19f-7f9b3a61a04c.json | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .changes/bff93ee1-3d3b-4e21-b19f-7f9b3a61a04c.json

diff --git a/.changes/bff93ee1-3d3b-4e21-b19f-7f9b3a61a04c.json b/.changes/bff93ee1-3d3b-4e21-b19f-7f9b3a61a04c.json
deleted file mode 100644
index c6bda7dc7b..0000000000
--- a/.changes/bff93ee1-3d3b-4e21-b19f-7f9b3a61a04c.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "bff93ee1-3d3b-4e21-b19f-7f9b3a61a04c",
-    "type": "misc",
-    "description": "Upgrade to Dokka v2.0.0-Beta"
-}
\ No newline at end of file

From dc115f3e08c8a5da39aaa4ab4f176af8e720e88c Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Thu, 15 May 2025 17:49:59 -0400
Subject: [PATCH 14/19] Apply same fixes as aws-sdk-kotlin

---
 .editorconfig                         |  3 ---
 build.gradle.kts                      |  1 +
 docs/dokka-presets/css/aws-styles.css | 39 +++++++++++++++++++++++++++
 gradle.properties                     |  4 ++-
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 97c8967110..3dbc6d83a4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,6 +10,3 @@ ktlint_standard_backing-property-naming = disabled
 # (https://kotlinlang.org/docs/coding-conventions.html#trailing-commas)
 ij_kotlin_allow_trailing_comma_on_call_site = true
 ij_kotlin_allow_trailing_comma = true
-
-[buildSrc/build/**]
-ktlint = disabled
diff --git a/build.gradle.kts b/build.gradle.kts
index 0d2e027b96..bdec55641a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -86,6 +86,7 @@ val lintPaths = listOf(
     "**/*.{kt,kts}",
     "!**/generated-src/**",
     "!**/smithyprojections/**",
+    "!**/build/**",
 )
 
 configureLinting(lintPaths)
diff --git a/docs/dokka-presets/css/aws-styles.css b/docs/dokka-presets/css/aws-styles.css
index 936e30b789..119670a726 100644
--- a/docs/dokka-presets/css/aws-styles.css
+++ b/docs/dokka-presets/css/aws-styles.css
@@ -41,4 +41,43 @@
 }
 .keyValue {
     display: block;
+}
+
+/* FIXME Taken from Dokka mainline. Remove these styles once Dokka 2.1.0 is released. */
+.toc--skip-link {
+    background-color: #458cff;
+    color: #fff;
+    font: 400 13px/24px Inter, system-ui, -apple-system, Segoe UI, Roboto, Ubuntu, Cantarell, Noto Sans, sans-serif, BlinkMacSystemFont, Oxygen, Droid Sans, Helvetica Neue, Arial;
+    margin-top: 36px;
+    padding: 1px;
+    position: absolute;
+    z-index: 100;
+}
+
+.toc--skip-link:not(:focus) {
+    overflow: hidden !important;
+    clip: rect(1px, 1px, 1px, 1px) !important;
+    border: 0 !important;
+    height: 1px !important;
+    padding: 0 !important;
+    width: 1px !important;
+}
+
+.toc--skip-link:focus {
+    outline: 4px solid rgb(48, 127, 255, 0.5);
+    outline-offset: 0;
+}
+
+.sidebar > .toc--skip-link {
+    margin-top: 0;
+}
+
+.toc--part_hidden > .toc--row > .toc--button ~ .toc--skip-link {
+    display: none;
+}
+
+@media (max-width: 899px) {
+    .toc--skip-link {
+        display: none;
+    }
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index bb562dcbae..2fc629eef9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,6 @@ sdkVersion=1.4.2-SNAPSHOT
 # codegen
 codegenVersion=0.34.2-SNAPSHOT
 
-org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
\ No newline at end of file
+# FIXME Remove after Dokka 2.0 Gradle plugin is stable
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true

From 779a7496cff1fff2a3d614c4e176a41bf9c6adf5 Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Thu, 15 May 2025 18:17:22 -0400
Subject: [PATCH 15/19] Fix analytics test, add template back

---
 .../main/kotlin/dokka-convention.gradle.kts   |  2 +
 docs/dokka-presets/templates/base.ftl         | 78 +++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 docs/dokka-presets/templates/base.ftl

diff --git a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
index 6527053738..0260162ba1 100644
--- a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
+++ b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
@@ -18,6 +18,8 @@ dokka {
             rootProject.file("docs/dokka-presets/scripts/accessibility.js"),
         )
 
+        templatesDir.set(rootProject.file("docs/dokka-presets/templates"))
+
         footerMessage.set("© ${java.time.LocalDate.now().year}, Amazon Web Services, Inc. or its affiliates. All rights reserved.")
         separateInheritedMembers.set(true)
     }
diff --git a/docs/dokka-presets/templates/base.ftl b/docs/dokka-presets/templates/base.ftl
new file mode 100644
index 0000000000..21fca73968
--- /dev/null
+++ b/docs/dokka-presets/templates/base.ftl
@@ -0,0 +1,78 @@
+<#--
+    This is a copy of Dokka's base.ftl, modified to add custom scripts for S_Code and Shortbread.
+    Keep in sync with Dokka.
+-->
+<#import "includes/page_metadata.ftl" as page_metadata>
+<#import "includes/header.ftl" as header>
+<#import "includes/footer.ftl" as footer>
+<!DOCTYPE html>
+<html class="no-js" lang="en">
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <@page_metadata.display/>
+    <#-- AWS Analytics tracking script - Implements site-wide analytics and tracking functionality -->
+    <script src="https://a0.awsstatic.com/s_code/js/3.0/awshome_s_code.js"></script>
+    <@template_cmd name="pathToRoot">
+        <script>var pathToRoot = "${pathToRoot}";</script></@template_cmd>
+    <script>document.documentElement.classList.replace("no-js", "js");</script>
+    <#-- This script doesn't need to be there but it is nice to have
+    since app in dark mode doesn't 'blink' (class is added before it is rendered) -->
+    <script>const storage = localStorage.getItem("dokka-dark-mode")
+        if (storage == null) {
+            const osDarkSchemePreferred = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
+            if (osDarkSchemePreferred === true) {
+                document.getElementsByTagName("html")[0].classList.add("theme-dark")
+            }
+        } else {
+            const savedDarkMode = JSON.parse(storage)
+            if (savedDarkMode === true) {
+                document.getElementsByTagName("html")[0].classList.add("theme-dark")
+            }
+        }
+    </script>
+    <#-- Scripts for AWS Shortbread -->
+    <script>var existingShortbreadEl = document.getElementById("awsccc-sb-ux-c");
+        existingShortbreadEl && existingShortbreadEl.remove();
+    </script>
+    <script src="https://prod.assets.shortbread.aws.dev/shortbread.js"></script>
+    <link href="https://prod.assets.shortbread.aws.dev/shortbread.css" rel="stylesheet">
+    <script>const shortbread = AWSCShortbread();
+        shortbread.checkForCookieConsent();
+    </script>
+    <#-- Resources (scripts, stylesheets) are handled by Dokka.
+    Use customStyleSheets and customAssets to change them. -->
+    <@resources/>
+</head>
+<body>
+<div class="root">
+    <@header.display/>
+    <div id="container">
+        <nav id="leftColumn" class="sidebar" data-item-type="SECTION" data-item-config='{"defaultSize": 280, "minSize": 200, "maxSize": 400}'>
+            <a class="toc--skip-link" href="#main">Skip to content</a>
+            <div class="dropdown theme-dark_mobile" data-role="dropdown" id="toc-dropdown">
+                <ul role="listbox" id="toc-listbox" class="dropdown--list dropdown--list_toc-list"
+                    data-role="dropdown-listbox" aria-label="Table of contents">
+                    <div class="dropdown--header">
+                            <span>
+                                <@template_cmd name="projectName">
+                                    ${projectName}
+                                </@template_cmd>
+                            </span>
+                        <button class="button" data-role="dropdown-toggle" aria-label="Close table of contents">
+                            <i class="ui-kit-icon ui-kit-icon_cross"></i>
+                        </button>
+                    </div>
+                    <div class="sidebar--inner" id="sideMenu"></div>
+                </ul>
+                <div class="dropdown--overlay"></div>
+            </div>
+        </nav>
+        <div id="resizer" class="resizer" data-item-type="BAR"></div>
+        <div id="main" data-item-type="SECTION" role="main">
+            <@content/>
+            <@footer.display/>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file

From d0cc97cc759736830875af614d46461176a432be Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Thu, 15 May 2025 18:30:51 -0400
Subject: [PATCH 16/19] CI

---
 .changes/50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changes/50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json

diff --git a/.changes/50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json b/.changes/50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json
new file mode 100644
index 0000000000..9ef75de5ed
--- /dev/null
+++ b/.changes/50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json
@@ -0,0 +1,5 @@
+{
+    "id": "50a9ce20-c4d7-4952-8fad-f9ffb38c9259",
+    "type": "misc",
+    "description": "Upgrade to Dokka 2.0.0"
+}
\ No newline at end of file

From cc6e0e5f3cd4d99b30b37df986c94e45a4994713 Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Tue, 10 Jun 2025 16:29:20 -0400
Subject: [PATCH 17/19] Remove search button

---
 .../templates/includes/header.ftl             | 34 +++++++++++++++
 .../includes/source_set_selector.ftl          | 41 +++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 docs/dokka-presets/templates/includes/header.ftl
 create mode 100644 docs/dokka-presets/templates/includes/source_set_selector.ftl

diff --git a/docs/dokka-presets/templates/includes/header.ftl b/docs/dokka-presets/templates/includes/header.ftl
new file mode 100644
index 0000000000..51e80541a6
--- /dev/null
+++ b/docs/dokka-presets/templates/includes/header.ftl
@@ -0,0 +1,34 @@
+<#--
+    This is a modified version of Dokka's header.ftl, removing the search button.
+    https://github.com/Kotlin/dokka/blob/83b0f8ad9ad920df0d842caa9c43d69e6e2c44f6/dokka-subprojects/plugin-base/src/main/resources/dokka/templates/includes/header.ftl
+ -->
+<#import "source_set_selector.ftl" as source_set_selector>
+<#macro display>
+    <header class="navigation theme-dark" id="navigation-wrapper" role="banner">
+        <@template_cmd name="pathToRoot">
+            <a class="library-name--link" href="${pathToRoot}index.html" tabindex="1">
+                <@template_cmd name="projectName">
+                    ${projectName}
+                </@template_cmd>
+            </a>
+        </@template_cmd>
+        <button class="navigation-controls--btn navigation-controls--btn_toc ui-kit_mobile-only" id="toc-toggle"
+                type="button">Toggle table of contents
+        </button>
+        <div class="navigation-controls--break ui-kit_mobile-only"></div>
+        <div class="library-version" id="library-version">
+            <#-- This can be handled by the versioning plugin -->
+            <@version/>
+        </div>
+        <div class="navigation-controls">
+            <@source_set_selector.display/>
+            <#if homepageLink?has_content>
+                <a class="navigation-controls--btn navigation-controls--btn_homepage" id="homepage-link"
+                   href="${homepageLink}"></a>
+            </#if>
+            <button class="navigation-controls--btn navigation-controls--btn_theme" id="theme-toggle-button"
+                    type="button">Switch theme
+            </button>
+        </div>
+    </header>
+</#macro>
\ No newline at end of file
diff --git a/docs/dokka-presets/templates/includes/source_set_selector.ftl b/docs/dokka-presets/templates/includes/source_set_selector.ftl
new file mode 100644
index 0000000000..7868b4f33b
--- /dev/null
+++ b/docs/dokka-presets/templates/includes/source_set_selector.ftl
@@ -0,0 +1,41 @@
+<#--
+    This is an unmodified version of Dokka's source_set_selector.ftl
+    https://github.com/Kotlin/dokka/blob/83b0f8ad9ad920df0d842caa9c43d69e6e2c44f6/dokka-subprojects/plugin-base/src/main/resources/dokka/templates/includes/source_set_selector.ftl
+-->
+<#macro display>
+    <#if sourceSets?has_content>
+        <ul class="filter-section filter-section_loading" id="filter-section" aria-label="Platform filter">
+            <#list sourceSets as ss>
+                <button class="platform-tag platform-selector ${ss.platform}-like" data-active="" aria-pressed="true"
+                        data-filter="${ss.filter}">${ss.name}</button>
+            </#list>
+            <div class="dropdown filter-section--dropdown" data-role="dropdown" id="filter-section-dropdown">
+                <button class="button button_dropdown filter-section--dropdown-toggle" role="combobox"
+                        data-role="dropdown-toggle"
+                        aria-controls="platform-tags-listbox"
+                        aria-haspopup="listbox"
+                        aria-expanded="false"
+                        aria-label="Toggle source sets"
+                ></button>
+                <ul role="listbox" id="platform-tags-listbox" class="dropdown--list" data-role="dropdown-listbox" aria-label="Platform filter">
+                    <div class="dropdown--header"><span>Platform filter</span>
+                        <button class="button" data-role="dropdown-toggle" aria-label="Close platform filter">
+                            <i class="ui-kit-icon ui-kit-icon_cross"></i>
+                        </button>
+                    </div>
+                    <#list sourceSets as ss>
+                        <li role="option" class="dropdown--option platform-selector-option ${ss.platform}-like" tabindex="0">
+                            <label class="checkbox">
+                                <input type="checkbox" class="checkbox--input" id="${ss.filter}"
+                                       data-filter="${ss.filter}"/>
+                                <span class="checkbox--icon"></span>
+                                ${ss.name}
+                            </label>
+                        </li>
+                    </#list>
+                </ul>
+                <div class="dropdown--overlay"></div>
+            </div>
+        </ul>
+    </#if>
+</#macro>
\ No newline at end of file

From 185c9d83e7447754919f22fa9b365b781541a06d Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Wed, 11 Jun 2025 08:30:01 -0400
Subject: [PATCH 18/19] Remove /build exclusion

---
 build.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index bdec55641a..0d2e027b96 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -86,7 +86,6 @@ val lintPaths = listOf(
     "**/*.{kt,kts}",
     "!**/generated-src/**",
     "!**/smithyprojections/**",
-    "!**/build/**",
 )
 
 configureLinting(lintPaths)

From 5d80218ead972078092312fe06fb53b507e6f3ec Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Wed, 11 Jun 2025 14:15:10 -0400
Subject: [PATCH 19/19] revert: Remove /build exclusion

---
 build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 0d2e027b96..bdec55641a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -86,6 +86,7 @@ val lintPaths = listOf(
     "**/*.{kt,kts}",
     "!**/generated-src/**",
     "!**/smithyprojections/**",
+    "!**/build/**",
 )
 
 configureLinting(lintPaths)