Skip to content

Commit d1fe22f

Browse files
committed
Merge branch 'main' of github.com:smithy-lang/smithy-kotlin into misc-sonatype-api
2 parents b284087 + d845a3c commit d1fe22f

File tree

9 files changed

+15
-13
lines changed

9 files changed

+15
-13
lines changed

.changes/4855cecf-6a96-4622-b7ff-5d09e54f6564.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changes/ebc2a1ba-151a-48ed-afcd-0679c9d3a9ef.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## [1.5.12] - 10/02/2025
4+
5+
## [1.5.11] - 10/01/2025
6+
7+
### Fixes
8+
* Overwrite `Content-Length` header rather than appending in `CrtHttpEngine`
9+
* Address issues caused by shape members named result
10+
311
## [1.5.10] - 09/22/2025
412

513
### Documentation

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ abstract class AwsHttpBindingProtocolGenerator : HttpBindingProtocolGenerator()
9696
}
9797
}
9898

99+
@Suppress("DEPRECATION")
99100
private fun renderThrowOperationError(
100101
ctx: ProtocolGenerator.GenerationContext,
101102
op: OperationShape,

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/model/knowledge/SerdeIndex.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ class SerdeIndex(private val model: Model) : KnowledgeIndex {
8585
.toMutableSet()
8686

8787
// add shapes reachable from operational errors
88+
@Suppress("DEPRECATION")
8889
val modeledErrors = operations
8990
.flatMap { it.errors }
9091
.flatMap { model.expectShape(it).members() }

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ open class ServiceExceptionBaseClassGenerator(
8282
protected open fun renderExtra(ctx: CodegenContext, writer: KotlinWriter) { }
8383

8484
// Compare generated base exception name with all error type names. Throw exception if not unique.
85+
@Suppress("DEPRECATION")
8586
private fun checkForCollision(ctx: CodegenContext, exceptionSymbol: Symbol) {
8687
val topDownIndex = TopDownIndex.of(ctx.model)
8788
val operations = topDownIndex.getContainedOperations(ctx.settings.service)

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpBindingProtocolGenerator.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
122122
}
123123
}
124124

125+
@Suppress("DEPRECATION")
125126
private fun generateDeserializers(ctx: ProtocolGenerator.GenerationContext) {
126127
val resolver = getProtocolHttpBindingResolver(ctx.model, ctx.service)
127128
// render HttpDeserialize for all operation outputs

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
1414
org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
1515

1616
# SDK
17-
sdkVersion=1.5.12-SNAPSHOT
17+
sdkVersion=1.5.13-SNAPSHOT
1818

1919
# codegen
20-
codegenVersion=0.35.12-SNAPSHOT
20+
codegenVersion=0.35.13-SNAPSHOT
2121

2222
# FIXME Remove after Dokka 2.0 Gradle plugin is stable
2323
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ kotlin-multiplatform-bignum-version = "0.3.10"
2020
kotlinx-datetime-version = "0.6.1"
2121

2222
# codegen
23-
smithy-version = "1.61.0"
23+
smithy-version = "1.62.0"
2424

2525
# testing
2626
junit-version = "5.13.4"

0 commit comments

Comments
 (0)