Merge branch 'main' of github.com:smithy-lang/smithy-kotlin into kn-main-ci-merge

Author: lauzadis

.changes/39ca59b7-65d6-44da-85a6-84c26ad481e7.json

@@ -0,0 +1,8 @@
+{
+    "id": "39ca59b7-65d6-44da-85a6-84c26ad481e7",
+    "type": "feature",
+    "description": "Add additional TLS configuration options to HTTP engines.",
+    "issues": [
+        "awslabs/smithy-kotlin#820"
+    ]
+}

.changes/47e8421b-f037-4968-9592-13cc3e237448.json

@@ -0,0 +1,5 @@
+{
+    "id": "47e8421b-f037-4968-9592-13cc3e237448",
+    "type": "misc",
+    "description": "Upgrade to Gradle 9.0.0"
+}

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.5.6] - 08/21/2025
+
+### Fixes
+* [#1285](https://github.com/awslabs/smithy-kotlin/issues/1285) ⚠️ **IMPORTANT**: Correctly return number of bytes read from chunked streams
+
 ## [1.5.5] - 08/13/2025
 
 ## [1.5.4] - 08/07/2025

build.gradle.kts

@@ -5,6 +5,7 @@
 import aws.sdk.kotlin.gradle.dsl.configureJReleaser
 import aws.sdk.kotlin.gradle.dsl.configureLinting
 import aws.sdk.kotlin.gradle.util.typedProp
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
     // NOTE: buildscript classpath for the root project is the parent classloader for the subprojects, we
@@ -46,9 +47,9 @@ val testJavaVersion = typedProp<String>("test.java.version")?.let {
 }
 
 allprojects {
-    if (rootProject.typedProp<Boolean>("kotlinWarningsAsErrors") == true) {
-        tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-            compilerOptions.allWarningsAsErrors = true
+    tasks.withType<KotlinCompile> {
+        compilerOptions {
+            allWarningsAsErrors = true
         }
     }
 

codegen/protocol-tests/build.gradle.kts

@@ -95,51 +95,35 @@ tasks.generateSmithyProjections {
     }
 }
 
-abstract class ProtocolTestTask @Inject constructor(private val project: Project) : DefaultTask() {
-    /**
-     * The projection
-     */
-    @get:Input
-    abstract val projectionName: Property<String>
-
-    /**
-     * The projection root directory
-     */
-    @get:Input
-    abstract val projectionRootDirectory: Property<String>
-
-    @TaskAction
-    fun runTests() {
-        val projectionRootDir = project.file(projectionRootDirectory.get())
-        println("[$projectionName] buildDir: $projectionRootDir")
-        if (!projectionRootDir.exists()) {
-            throw GradleException("$projectionRootDir does not exist")
-        }
-        val wrapper = if (System.getProperty("os.name").lowercase().contains("windows")) "gradlew.bat" else "gradlew"
-        val gradlew = project.rootProject.file(wrapper).absolutePath
-
-        // NOTE - this still requires us to publish to maven local.
-        project.exec {
-            workingDir = projectionRootDir
-            executable = gradlew
-            args = listOf("test")
-        }
-    }
-}
-
 smithyBuild.projections.forEach {
     val protocolName = it.name
+    val dirProvider = smithyBuild
+        .smithyKotlinProjectionPath(protocolName)
+        .map { file(it.toString()) }
 
-    tasks.register<ProtocolTestTask>("testProtocol-$protocolName") {
-        dependsOn(tasks.generateSmithyProjections)
+    tasks.register<Exec>("testProtocol-$protocolName") {
         group = "Verification"
-        projectionName.set(it.name)
-        projectionRootDirectory.set(smithyBuild.smithyKotlinProjectionPath(it.name).map { it.toString() })
+        dependsOn(tasks.generateSmithyProjections)
+
+        doFirst {
+            val dir = dirProvider.get()
+            require(dir.exists()) { "$dir does not exist" }
+
+            val wrapper = if (System.getProperty("os.name").lowercase().contains("windows")) {
+                "gradlew.bat"
+            } else {
+                "gradlew"
+            }
+            val gradlew = rootProject.layout.projectDirectory.file(wrapper).asFile.absolutePath
+
+            workingDir = dir
+            executable = gradlew
+            args = listOf("test")
+        }
     }
 }
 
 tasks.register("testAllProtocols") {
     group = "Verification"
-    val allTests = tasks.withType<ProtocolTestTask>()
-    dependsOn(allTests)
+    dependsOn(tasks.matching { it.name.startsWith("testProtocol-") })
 }

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/KotlinJmespathExpressionVisitor.kt

@@ -164,6 +164,7 @@ class KotlinJmespathExpressionVisitor(
 
         val codegen = buildString {
             val nullables = buildList {
+                // FIXME In some cases we are unnecessarily handling nulls here, leading to compiler warnings. SDK-KT-786
                 if (left.shape?.isNullable == true || left.nullable) add("${left.identifier} == null")
                 if (right.shape?.isNullable == true || right.nullable) add("${right.identifier} == null")
             }

dokka-smithy/build.gradle.kts

@@ -35,7 +35,6 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
         freeCompilerArgs.add("-Xjdk-release=1.8")
-        allWarningsAsErrors.set(false) // FIXME Dokka bundles stdlib into the classpath, causing an unfixable warning
     }
 }
 

gradle.properties

@@ -14,10 +14,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.5.6-SNAPSHOT
+sdkVersion=1.5.7-SNAPSHOT
 
 # codegen
-codegenVersion=0.35.6-SNAPSHOT
+codegenVersion=0.35.7-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 kotlin-version = "2.2.0"
 dokka-version = "2.0.0"
 
-aws-kotlin-repo-tools-version = "0.4.30-kn"
+aws-kotlin-repo-tools-version = "0.4.43"
 
 # libs
 coroutines-version = "1.10.2"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists