chore: Update to Smithy 1.53.0 (#866)

smithy-lang · Dec 19, 2024 · b4ba0ad · b4ba0ad
1 parent de5a56e
commit b4ba0ad
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ kotlin.code.style=official
 # config
 
 # codegen
-smithyVersion=1.52.1
+smithyVersion=1.53.0
 smithyGradleVersion=0.6.0
 
 # kotlin

diff --git a/...swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/ShapeValueGenerator.kt b/...swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/ShapeValueGenerator.kt
@@ -28,6 +28,7 @@ import software.amazon.smithy.model.traits.EnumTrait
 import software.amazon.smithy.model.traits.StreamingTrait
 import software.amazon.smithy.swift.codegen.model.hasTrait
 import software.amazon.smithy.swift.codegen.model.toMemberNames
+import software.amazon.smithy.swift.codegen.swiftmodules.FoundationTypes
 import software.amazon.smithy.swift.codegen.swiftmodules.SmithyStreamsTypes
 import software.amazon.smithy.swift.codegen.swiftmodules.SmithyTimestampsTypes
 import software.amazon.smithy.swift.codegen.swiftmodules.SmithyTypes
@@ -160,11 +161,12 @@ class ShapeValueGenerator(
             }
             ShapeType.BLOB -> {
                 if (shape.hasTrait<StreamingTrait>()) {
-                    writer.writeInline(".stream(\$N(data: ", SmithyStreamsTypes.Core.BufferedStream)
-                    ".data(using: .utf8)!, isClosed: true))"
+                    writer.writeInline(".stream(\$N(data: \$N(", SmithyStreamsTypes.Core.BufferedStream, FoundationTypes.Data)
+                    ".utf8), isClosed: true))"
                 } else {
                     // TODO: properly handle this optional with an unwrapped statement before it's passed as a value to a shape.
-                    ".data(using: .utf8)!"
+                    writer.writeInline("\$N(", FoundationTypes.Data)
+                    ".utf8)"
                 }
             }
             else -> { "" }

diff --git a/...swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/SwiftSymbolProvider.kt b/...swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/SwiftSymbolProvider.kt
@@ -380,14 +380,14 @@ class SwiftSymbolProvider(private val model: Model, val swiftSettings: SwiftSett
             if (shape.hasTrait<StreamingTrait>()) {
                 { writer ->
                     writer.format(
-                        "\$N.data(\$N(\"$literal\".utf8))",
+                        "\$N.data(\$N(base64Encoded: \"$literal\"))",
                         SmithyTypes.ByteStream,
                         FoundationTypes.Data
                     )
                 }
             } else {
                 { writer ->
-                    writer.format("\$N(\"$literal\".utf8)", FoundationTypes.Data)
+                    writer.format("\$N(base64Encoded: \"$literal\")", FoundationTypes.Data)
                 }
             }
         )

diff --git a/...ftware/amazon/smithy/swift/codegen/integration/serde/member/MemberShapeDecodeGenerator.kt b/...ftware/amazon/smithy/swift/codegen/integration/serde/member/MemberShapeDecodeGenerator.kt
@@ -243,14 +243,16 @@ open class MemberShapeDecodeGenerator(
         writer.addImport(FoundationTypes.Data)
         return if (targetShape.hasTrait<StreamingTrait>()) {
             writer.format(
-                " ?? \$N.data(\$N(\"$value\".utf8))",
+                " ?? \$N.data(\$N(base64Encoded: \$S))",
                 SmithyTypes.ByteStream,
-                FoundationTypes.Data
+                FoundationTypes.Data,
+                value,
             )
         } else {
             writer.format(
-                " ?? \$N(\"$value\".utf8)",
-                FoundationTypes.Data
+                " ?? \$N(base64Encoded: \$S)",
+                FoundationTypes.Data,
+                value,
             )
         }
     }