Merge remote-tracking branch 'origin/main' into feat/micrometer-telemetry-provider

 Conflicts:
	gradle/libs.versions.toml

Author: monosoul

.brazil.json

@@ -1,19 +1,13 @@
 {
   "dependencies": {
-    "org.jetbrains.kotlin:kotlin-stdlib-common:2.0.*": "KotlinStdlibCommon-2.x",
     "org.jetbrains.kotlin:kotlin-stdlib:2.0.*": "KotlinStdlib-2.x",
-    "org.jetbrains.kotlinx:atomicfu:0.*.*": "Atomicfu-0.x",
     "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.*": "KotlinxCoroutinesCoreJvm-1.8.x",
-    "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.*": "KotlinxCoroutinesCore-1.8.x",
-    "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.8.*": "KotlinxCoroutinesJdk8-1.8.x",
 
     "com.squareup.okhttp3:okhttp-coroutines:5.*": "OkHttp3Coroutines-5.x",
     "com.squareup.okhttp3:okhttp:5.*": "OkHttp3-5.x",
     "com.squareup.okio:okio-jvm:3.*": "OkioJvm-3.x",
-    "com.squareup.okio:okio:3.*": "Okio-3.x",
     "io.opentelemetry:opentelemetry-api:1.*": "Maven-io-opentelemetry_opentelemetry-api-1.x",
     "org.slf4j:slf4j-api:2.*": "Maven-org-slf4j_slf4j-api-2.x",
-    "software.amazon.awssdk.crt:aws-crt:0.*": "Aws-crt-java-1.0.x",
     "aws.sdk.kotlin.crt:aws-crt-kotlin:0.8.*": "AwsCrtKotlin-0.8.x"
   },
   "packageHandlingRules": {
@@ -47,28 +41,6 @@
       ],
       "com.squareup.okio:okio-jvm:3.*": [
         "KotlinStdlib-2.x"
-      ],
-      "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.*": [
-        "KotlinxCoroutinesCoreJvm-1.8.x",
-        "KotlinStdlib-2.x"
-      ],
-      "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.*": [
-        "KotlinxCoroutinesCoreJvm-1.8.x",
-        "KotlinStdlib-2.x"
-      ],
-      "org.jetbrains.kotlin:kotlin-stdlib:2.*": [
-        "KotlinStdlib-2.x"
-      ],
-      "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.*": [
-        "KotlinStdlibCommon-1.9.x",
-        "KotlinStdlibJdk8-1.9.x",
-        "KotlinxCoroutinesCoreJvm-1.7.x"
-      ],
-      "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.*": [
-        "KotlinStdlibJdk8-1.9.x"
-      ],
-      "org.jetbrains.kotlin:kotlin-stdlib:1.9.*": [
-        "KotlinStdlib-1.9.x"
       ]
     }
   }

.changes/29e93882-7346-4a2f-bbcd-1cdf478a3b10.json

@@ -0,0 +1,5 @@
+{
+    "id": "29e93882-7346-4a2f-bbcd-1cdf478a3b10",
+    "type": "feature",
+    "description": "Add new `ISO_8601_FULL` timestamp format for untruncated precision"
+}

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [1.3.3] - 08/07/2024
+
+### Miscellaneous
+* Upgrade to Kotlin 2.0.10
+
+## [1.3.2] - 08/02/2024
+
+### Fixes
+* Close HttpStreams in CrtHttpEngine after call completion
+
 ## [1.3.1] - 07/26/2024
 
 ## [1.3.0] - 07/25/2024

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt

@@ -37,7 +37,7 @@ private fun getDefaultRuntimeVersion(): String {
 // publishing info
 const val RUNTIME_GROUP: String = "aws.smithy.kotlin"
 val RUNTIME_VERSION: String = System.getProperty("smithy.kotlin.codegen.clientRuntimeVersion", getDefaultRuntimeVersion())
-val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "2.0.0")
+val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "2.0.10")
 
 enum class SourceSet {
     CommonMain,

docs/dokka-presets/css/aws-styles.css

@@ -56,6 +56,10 @@
     overflow-wrap: break-word;
 }
 
+.keyValue {
+    display: block;
+}
+
 /*
     Disable the playground run button for generated samples
     https://github.com/Kotlin/dokka/issues/3041

docs/dokka-presets/scripts/accessibility.js

@@ -17,6 +17,11 @@ if (document.readyState === "interactive" || document.readyState === "complete"
  * Fixes accessibility violation: "Provide a mechanism for skipping past repetitive content"
  */
 function applySkipLinks() {
+    document.querySelectorAll('#content').forEach(function(contentDiv) {
+        contentDiv.setAttribute('role', 'main');
+        contentDiv.setAttribute('tabindex', '-1');
+    });
+
     function insertSkipLink(element) {
         if (element.querySelectorAll(".skip-to-content").length > 0) { return }
 
@@ -71,10 +76,17 @@ 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');
-        navButton.setAttribute('aria-expanded', 'false');
+
+        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')
@@ -107,49 +119,9 @@ window.addEventListener('navigationLoaded', ensureNavButtonInteractable);
  * Fixes accessibility violation: "Ensure pages reflow without requiring two-dimensional scrolling without loss of content or functionality"
  */
 function ensureContentReflow() {
-    const MIN_WINDOW_SIZE = 550
-
-    // Function to insert 'toggle content' button
-    function insertToggleContentButton(element) {
-        if (element.parentNode.querySelectorAll(".aws-toggle-content-btn").length > 0) { return }
-
-        const initiallyVisible = window.innerWidth >= MIN_WINDOW_SIZE
-
-        const toggleContent = document.createElement('button');
-        toggleContent.className = 'aws-toggle-content-btn';
-        toggleContent.textContent = initiallyVisible ? '▼' : '▶'
-        toggleContent.setAttribute('aria-expanded', initiallyVisible.toString());
-        toggleContent.setAttribute('aria-label', 'Toggle code block for' + element.getAttribute("data-togglable"));
-        toggleContent.setAttribute('aria-controls', element.id);
-
-        // Set initial visibility based on window size
-        element.style.display = initiallyVisible ? 'block' : 'none'
-
-        // Toggle visibility onclick
-        toggleContent.onclick = function() {
-            const isExpanded = toggleContent.getAttribute('aria-expanded') === 'true';
-            toggleContent.setAttribute('aria-expanded', (!isExpanded).toString());
-            element.style.display = isExpanded ? 'none' : 'block'
-            toggleContent.textContent = isExpanded ? '▶' : '▼'
-        };
-
-        element.parentNode.insertBefore(toggleContent, element);
-    }
-
-    document.querySelectorAll('.content[data-togglable]').forEach(insertToggleContentButton);
-
-    // Update content visibility on resize
-    window.addEventListener('resize', function() {
-        document.querySelectorAll('.content[data-togglable]').forEach(function(element) {
-            const toggleContent = element.previousSibling;
-            if (window.innerWidth < MIN_WINDOW_SIZE) {
-                element.style.display = 'none';
-                toggleContent.setAttribute('aria-expanded', 'false');
-            } else {
-                element.style.display = 'block';
-                toggleContent.setAttribute('aria-expanded', 'true');
-            }
-        });
+    // Ensure `content` sections are reflowable
+    document.querySelectorAll('.content[data-togglable]').forEach(function(content) {
+        content.style.display = 'block'
     });
 }
-window.addEventListener('navigationLoaded', ensureContentReflow);
+window.addEventListener('navigationLoaded', ensureContentReflow);

docs/dokka-presets/templates/base.ftl

@@ -33,6 +33,7 @@
     <@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">

gradle.properties

@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.3.2-SNAPSHOT
+sdkVersion=1.3.4-SNAPSHOT
 
 # codegen
-codegenVersion=0.33.2-SNAPSHOT
+codegenVersion=0.33.4-SNAPSHOT

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-kotlin-version = "2.0.0"
+kotlin-version = "2.0.10"
 dokka-version = "1.9.10"
 
-aws-kotlin-repo-tools-version = "0.4.9"
+aws-kotlin-repo-tools-version = "0.4.10"
 
 # libs
 coroutines-version = "1.8.1"
@@ -12,7 +12,7 @@ okio-version = "3.9.0"
 otel-version = "1.32.0"
 slf4j-version = "2.0.9"
 slf4j-v1x-version = "1.7.36"
-crt-kotlin-version = "0.8.7"
+crt-kotlin-version = "0.8.8"
 micrometer-version = "1.13.2"
 
 # codegen

runtime/protocol/http-client-engines/http-client-engine-crt/jvm/src/aws/smithy/kotlin/runtime/http/engine/crt/CrtHttpEngine.kt

@@ -79,6 +79,10 @@ public class CrtHttpEngine(public override val config: CrtHttpEngineConfig) : Ht
             }
         }
 
+        callContext.job.invokeOnCompletion {
+            stream.close()
+        }
+
         if (request.isChunked) {
             withContext(SdkDispatchers.IO) {
                 stream.sendChunkedBody(request.body)