feat: Publish releases on Swift Package Registry

Package.swift

@@ -133,7 +133,11 @@ let package = Package(
         ),
         .target(
             name: "SmithyTestUtil",
-            dependencies: ["ClientRuntime", "SmithyHTTPAPI"]
+            dependencies: [
+                "ClientRuntime",
+                "SmithyHTTPAPI",
+                .product(name: "AwsCommonRuntimeKit", package: "aws-crt-swift"),
+            ]
         ),
         .target(
             name: "SmithyIdentity",

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/PackageManifestGenerator.kt

@@ -8,12 +8,10 @@ import software.amazon.smithy.codegen.core.SymbolDependency
 import software.amazon.smithy.swift.codegen.integration.ProtocolGenerator
 import kotlin.jvm.optionals.getOrNull
 
-val PACKAGE_MANIFEST_NAME = "Package.swift.txt"
-
 class PackageManifestGenerator(val ctx: ProtocolGenerator.GenerationContext) {
 
     fun writePackageManifest(dependencies: List<SymbolDependency>) {
-        ctx.delegator.useFileWriter(PACKAGE_MANIFEST_NAME) { writer ->
+        ctx.delegator.useFileWriter("Package.swift") { writer ->
             writer.write("// swift-tools-version: \$L", ctx.settings.swiftVersion)
             writer.write("")
             writer.write("import PackageDescription")
@@ -30,10 +28,12 @@ class PackageManifestGenerator(val ctx: ProtocolGenerator.GenerationContext) {
                     writer.write(".library(name: \$S, targets: [\$S])", ctx.settings.moduleName, ctx.settings.moduleName)
                 }
 
-                val externalDependencies = dependencies.filter {
-                    it.getProperty("url", String::class.java).getOrNull() != null ||
-                        it.getProperty("scope", String::class.java).getOrNull() != null
-                }
+                val externalDependencies = dependencies
+                    .filter { it.expectProperty("target", String::class.java) != "SmithyTestUtil" } // SmithyTestUtil links to test target only
+                    .filter {
+                        it.getProperty("url", String::class.java).getOrNull() != null ||
+                            it.getProperty("scope", String::class.java).getOrNull() != null
+                    }
                 val dependenciesByURL = externalDependencies.distinctBy {
                     it.getProperty("url", String::class.java).getOrNull()
                         ?: "${it.getProperty("scope", String::class.java).get()}.${it.packageName}"

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/SwiftDependency.kt

@@ -38,7 +38,7 @@ class SwiftDependency(
             "",
             "",
             "",
-            SwiftDependency.DistributionMethod.GIT,
+            DistributionMethod.GIT,
         )
         val XCTest = SwiftDependency(
             "XCTest",
@@ -49,213 +49,36 @@ class SwiftDependency(
             "",
             DistributionMethod.GIT,
         )
-        val CRT = SwiftDependency(
-            "AwsCommonRuntimeKit",
-            null,
-            "0.31.0",
-            "https://github.com/awslabs/aws-crt-swift",
-            "",
-            "aws-crt-swift",
-            DistributionMethod.GIT,
-        )
-        val CLIENT_RUNTIME = SwiftDependency(
-            "ClientRuntime",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY = SwiftDependency(
-            "Smithy",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_IDENTITY_API = SwiftDependency(
-            "SmithyIdentityAPI",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_IDENTITY = SwiftDependency(
-            "SmithyIdentity",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_RETRIES_API = SwiftDependency(
-            "SmithyRetriesAPI",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_RETRIES = SwiftDependency(
-            "SmithyRetries",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_HTTP_API = SwiftDependency(
-            "SmithyHTTPAPI",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_HTTP_AUTH_API = SwiftDependency(
-            "SmithyHTTPAuthAPI",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_HTTP_AUTH = SwiftDependency(
-            "SmithyHTTPAuth",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_CHECKSUMS_API = SwiftDependency(
-            "SmithyChecksumsAPI",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_CHECKSUMS = SwiftDependency(
-            "SmithyChecksums",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_STREAMS = SwiftDependency(
-            "SmithyStreams",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_EVENT_STREAMS_API = SwiftDependency(
-            "SmithyEventStreamsAPI",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_EVENT_STREAMS_AUTH_API = SwiftDependency(
-            "SmithyEventStreamsAuthAPI",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_EVENT_STREAMS = SwiftDependency(
-            "SmithyEventStreams",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_TEST_UTIL = SwiftDependency(
-            "SmithyTestUtil",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_READ_WRITE = SwiftDependency(
-            "SmithyReadWrite",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_TIMESTAMPS = SwiftDependency(
-            "SmithyTimestamps",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_XML = SwiftDependency(
-            "SmithyXML",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_JSON = SwiftDependency(
-            "SmithyJSON",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_FORM_URL = SwiftDependency(
-            "SmithyFormURL",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
-        val SMITHY_WAITERS_API = SwiftDependency(
-            "SmithyWaitersAPI",
-            "main",
-            "0.0.1",
-            "aws-sdk-swift",
-            "../../../smithy-swift",
-            "smithy-swift",
-            DistributionMethod.SPR,
-        )
+        val CLIENT_RUNTIME = smithySwiftTargetNamed("ClientRuntime")
+        val SMITHY = smithySwiftTargetNamed("Smithy")
+        val SMITHY_IDENTITY = smithySwiftTargetNamed("SmithyIdentity")
+        val SMITHY_RETRIES_API = smithySwiftTargetNamed("SmithyRetriesAPI")
+        val SMITHY_RETRIES = smithySwiftTargetNamed("SmithyRetries")
+        val SMITHY_HTTP_API = smithySwiftTargetNamed("SmithyHTTPAPI")
+        val SMITHY_HTTP_AUTH_API = smithySwiftTargetNamed("SmithyHTTPAuthAPI")
+        val SMITHY_HTTP_AUTH = smithySwiftTargetNamed("SmithyHTTPAuth")
+        val SMITHY_STREAMS = smithySwiftTargetNamed("SmithyStreams")
+        val SMITHY_EVENT_STREAMS_API = smithySwiftTargetNamed("SmithyEventStreamsAPI")
+        val SMITHY_EVENT_STREAMS = smithySwiftTargetNamed("SmithyEventStreams")
+        val SMITHY_TEST_UTIL = smithySwiftTargetNamed("SmithyTestUtil")
+        val SMITHY_READ_WRITE = smithySwiftTargetNamed("SmithyReadWrite")
+        val SMITHY_TIMESTAMPS = smithySwiftTargetNamed("SmithyTimestamps")
+        val SMITHY_XML = smithySwiftTargetNamed("SmithyXML")
+        val SMITHY_JSON = smithySwiftTargetNamed("SmithyJSON")
+        val SMITHY_FORM_URL = smithySwiftTargetNamed("SmithyFormURL")
+        val SMITHY_WAITERS_API = smithySwiftTargetNamed("SmithyWaitersAPI")
+
+        private fun smithySwiftTargetNamed(name: String): SwiftDependency {
+            return SwiftDependency(
+                name,
+                "main",
+                "0.54.0",
+                "https://github.com/awslabs/smithy-swift",
+                "../../../smithy-swift",
+                "smithy-swift",
+                DistributionMethod.GIT,
+            )
+        }
     }
 
     override fun getDependencies(): List<SymbolDependency> {

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/SwiftSettings.kt

@@ -40,7 +40,7 @@ class SwiftSettings(
     val gitRepo: String,
     val swiftVersion: String,
     val mergeModels: Boolean,
-    val copyrightNotice: String
+    val copyrightNotice: String,
 ) {
 
     companion object {
@@ -68,7 +68,7 @@ class SwiftSettings(
                     GIT_REPO,
                     SWIFT_VERSION,
                     MERGE_MODELS,
-                    COPYRIGHT_NOTICE
+                    COPYRIGHT_NOTICE,
                 )
             )
 
@@ -77,7 +77,7 @@ class SwiftSettings(
                 .orElseGet { inferService(model) }
 
             val moduleName = config.expectStringMember(MODULE_NAME).value
-            val version = config.expectStringMember(MODULE_VERSION).value
+            val moduleVersion = config.expectStringMember(MODULE_VERSION).value
             val desc = config.getStringMemberOrDefault(MODULE_DESCRIPTION, "$moduleName client")
             val homepage = config.expectStringMember(HOMEPAGE).value
             val author = config.expectStringMember(AUTHOR).value
@@ -93,15 +93,15 @@ class SwiftSettings(
             return SwiftSettings(
                 serviceId,
                 moduleName,
-                version,
+                moduleVersion,
                 desc,
                 author,
                 homepage,
                 sdkId,
                 gitRepo,
                 swiftVersion,
                 mergeModels,
-                copyrightNotice
+                copyrightNotice,
             )
         }
 

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/SwiftWriter.kt

@@ -162,7 +162,7 @@ class SwiftWriter(
         //
         // Also leave out the headers when JSON or the version file is being written,
         // as indicated by the file extension.
-        val isPackageManifest = listOf(PACKAGE_MANIFEST_NAME, (PACKAGE_MANIFEST_NAME + ".swift")).contains(fullPackageName)
+        val isPackageManifest = "Package.swift".contains(fullPackageName)
         val isNonSwiftSourceFile = listOf(".json", ".version").any { fullPackageName.endsWith(it) }
         val noHeader = isPackageManifest || isNonSwiftSourceFile
         return contents.takeIf { noHeader } ?: (copyrightNotice + imports + contents)

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpProtocolServiceClient.kt

@@ -30,6 +30,7 @@ open class HttpProtocolServiceClient(
             ClientRuntimeTypes.Core.Client,
         ) {
             writer.write("public static let clientName = \$S", serviceSymbol.name)
+            writer.write("public static let version = \$S", ctx.settings.moduleVersion)
             writer.write("let client: \$N", ClientRuntimeTypes.Http.SdkHttpClient)
             writer.write("let config: \$L", serviceConfig.typeName)
             writer.write("let serviceName = \$S", serviceName)

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/swiftmodules/SmithyTestUtilTypes.kt

@@ -1,17 +1,18 @@
 package software.amazon.smithy.swift.codegen.swiftmodules
 
 import software.amazon.smithy.codegen.core.Symbol
+import software.amazon.smithy.swift.codegen.SwiftDeclaration
 import software.amazon.smithy.swift.codegen.SwiftDependency
-import software.amazon.smithy.swift.codegen.model.buildSymbol
 
 object SmithyTestUtilTypes {
-    val TestInitializer = runtimeSymbol("TestInitializer")
-    val TestBaseError = runtimeSymbol("TestBaseError")
-    val SelectNoAuthScheme = runtimeSymbol("SelectNoAuthScheme")
+    val TestInitializer = runtimeSymbol("TestInitializer", SwiftDeclaration.ENUM)
+    val TestBaseError = runtimeSymbol("TestBaseError", SwiftDeclaration.STRUCT)
 }
 
-private fun runtimeSymbol(name: String): Symbol = buildSymbol {
-    this.name = name
-    this.namespace = SwiftDependency.SMITHY_TEST_UTIL.target
-    dependency(SwiftDependency.SMITHY_TEST_UTIL)
-}
+private fun runtimeSymbol(name: String, declaration: SwiftDeclaration? = null): Symbol = SwiftSymbol.make(
+    name,
+    declaration,
+    SwiftDependency.SMITHY_TEST_UTIL,
+    emptyList(),
+    emptyList(),
+)

smithy-swift-codegen/src/test/kotlin/HttpProtocolClientGeneratorTests.kt

@@ -17,6 +17,7 @@ class HttpProtocolClientGeneratorTests {
         val expected = """
 public class RestJsonProtocolClient: ClientRuntime.Client {
     public static let clientName = "RestJsonProtocolClient"
+    public static let version = "2019-12-16"
     let client: ClientRuntime.SdkHttpClient
     let config: RestJsonProtocolClient.RestJsonProtocolClientConfiguration
     let serviceName = "Rest Json Protocol"