Skip to content

Commit 0c82197

Browse files
committed
Merge branch 'main' of https://github.com/awslabs/smithy-kotlin into jmespath-flatten
2 parents 4593844 + 03cdfb4 commit 0c82197

File tree

14 files changed

+320
-94
lines changed

14 files changed

+320
-94
lines changed

CHANGELOG.md

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

3+
## [1.3.20] - 11/07/2024
4+
35
## [1.3.19] - 11/05/2024
46

57
## [1.3.18] - 10/31/2024

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ data class KotlinDependency(
129129
val IDENTITY_API = KotlinDependency(GradleConfiguration.Implementation, "$RUNTIME_ROOT_NS", RUNTIME_GROUP, "identity-api", RUNTIME_VERSION)
130130
val SMITHY_RPCV2_PROTOCOLS = KotlinDependency(GradleConfiguration.Implementation, "$RUNTIME_ROOT_NS.awsprotocol.rpcv2", RUNTIME_GROUP, "smithy-rpcv2-protocols", RUNTIME_VERSION)
131131
val SMITHY_RPCV2_PROTOCOLS_CBOR = KotlinDependency(GradleConfiguration.Implementation, "$RUNTIME_ROOT_NS.awsprotocol.rpcv2.cbor", RUNTIME_GROUP, "smithy-rpcv2-protocols", RUNTIME_VERSION)
132+
val AWS_SIGNING_CRT = KotlinDependency(GradleConfiguration.Implementation, "$RUNTIME_ROOT_NS.auth.awssigning.crt", RUNTIME_GROUP, "aws-signing-crt", RUNTIME_VERSION)
132133

133134
// External third-party dependencies
134135
val KOTLIN_STDLIB = KotlinDependency(GradleConfiguration.Implementation, "kotlin", "org.jetbrains.kotlin", "kotlin-stdlib", KOTLIN_COMPILER_VERSION)

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ object RuntimeTypes {
116116

117117
object SmokeTests : RuntimeTypePackage(KotlinDependency.CORE, "smoketests") {
118118
val exitProcess = symbol("exitProcess")
119+
val printExceptionStackTrace = symbol("printExceptionStackTrace")
120+
val SmokeTestsException = symbol("SmokeTestsException")
119121
}
120122

121123
object Collections : RuntimeTypePackage(KotlinDependency.CORE, "collections") {
@@ -378,6 +380,10 @@ object RuntimeTypes {
378380
val sigV4 = symbol("sigV4")
379381
val sigV4A = symbol("sigV4A")
380382
}
383+
384+
object AwsSigningCrt : RuntimeTypePackage(KotlinDependency.AWS_SIGNING_CRT) {
385+
val CrtAwsSigner = symbol("CrtAwsSigner")
386+
}
381387
}
382388

383389
object Observability {

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/lang/DocumentationPreprocessor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class DocumentationPreprocessor : KotlinIntegration {
104104
"li" -> {
105105
// If this list item holds a sublist, then we essentially just want to line break right away and
106106
// render the nested list as normal.
107-
val prefix = if (node.childNode(0).nodeName() == "ul") "\n" else ""
107+
val prefix = if (node.childNodes().firstOrNull()?.nodeName() == "ul") "\n" else ""
108108
builder.append("$listPrefix+ $prefix")
109109
}
110110
"ul", "ol" -> {

0 commit comments

Comments
 (0)