fix!: Rename package to match name inferred from git URL (#464)

smithy-lang · Nov 9, 2022 · 60de8a4 · 60de8a4
1 parent e4285fe
commit 60de8a4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/Package.swift b/Package.swift
@@ -4,7 +4,7 @@ import PackageDescription
 
 
 let package = Package(
-    name: "ClientRuntime",
+    name: "smithy-swift",
     platforms: [
         .macOS(.v10_15),
         .iOS(.v13)

diff --git a/...-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/PackageManifestGenerator.kt b/...-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/PackageManifestGenerator.kt
@@ -55,7 +55,7 @@ fun writePackageManifest(settings: SwiftSettings, fileManifest: FileManifest, de
                     writer.write("name: \"${settings.moduleName}Tests\",")
                     writer.openBlock("dependencies: [", "],") {
                         writer.write("\$S,", settings.moduleName)
-                        writer.write(".product(name: \"SmithyTestUtil\", package: \"ClientRuntime\")")
+                        writer.write(".product(name: \"SmithyTestUtil\", package: \"smithy-swift\")")
                     }
                     writer.write("path: \"./${settings.moduleName}Tests\"")
                 }
@@ -82,7 +82,7 @@ fun renderPackageDependenciesWithLocalPaths(writer: CodeWriter, distinctDependen
             val target = dependency.expectProperty("target", String::class.java)
 
             if (localPath.isNotEmpty()) {
-                writer.write(".package(name: \"${target}\", path: \"$localPath\"),")
+                writer.write(".package(path: \"$localPath\"),")
             } else {
                 renderPackageWithUrl(writer, dependency)
             }
@@ -102,7 +102,6 @@ fun renderPackageWithUrl(writer: CodeWriter, dependency: SymbolDependency) {
     writer.openBlock(".package(", "),") {
         val target = dependency.expectProperty("target", String::class.java)
         val dependencyURL = dependency.expectProperty("url", String::class.java)
-        writer.write("name: \"$target\",")
         writer.write("url: \"$dependencyURL\",")
         val branch = dependency.getProperty("branch", String::class.java)
         if (!branch.getOrNull().isNullOrEmpty()) {

diff --git a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/SwiftDependency.kt b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/SwiftDependency.kt
@@ -25,7 +25,7 @@ enum class SwiftDependency(
         "0.1.0",
         "https://github.com/awslabs/smithy-swift",
         Resources.computeAbsolutePath("smithy-swift", "", "SMITHY_SWIFT_CI_DIR"),
-        "ClientRuntime"
+        "smithy-swift"
     ),
     XCTest("XCTest", null, "", "", "", ""),
     SMITHY_TEST_UTIL(
@@ -34,7 +34,7 @@ enum class SwiftDependency(
         "0.1.0",
         "https://github.com/awslabs/smithy-swift",
         Resources.computeAbsolutePath("smithy-swift", "", "SMITHY_SWIFT_CI_DIR"),
-        "ClientRuntime"
+        "smithy-swift"
     );
 
     override fun getDependencies(): List<SymbolDependency> {

diff --git a/smithy-swift-codegen/src/test/kotlin/PackageManifestGeneratorTests.kt b/smithy-swift-codegen/src/test/kotlin/PackageManifestGeneratorTests.kt
@@ -34,7 +34,6 @@ class PackageManifestGeneratorTests {
         assertNotNull(packageManifest)
         val expectedContents = """
         .package(
-            name: "ComplexModule",
             url: "https://github.com/apple/swift-numerics",
             from: "0.0.5"
         ),
@@ -82,7 +81,7 @@ class PackageManifestGeneratorTests {
                 "                ),\n" +
                 "                .product(\n" +
                 "                    name: \"ClientRuntime\",\n" +
-                "                    package: \"ClientRuntime\"\n" +
+                "                    package: \"smithy-swift\"\n" +
                 "                ),\n" +
                 "            ],\n" +
                 "            path: \"./MockSDK\"\n" +
@@ -91,7 +90,7 @@ class PackageManifestGeneratorTests {
                 "            name: \"MockSDKTests\",\n" +
                 "            dependencies: [\n" +
                 "                \"MockSDK\",\n" +
-                "                .product(name: \"SmithyTestUtil\", package: \"ClientRuntime\")\n" +
+                "                .product(name: \"SmithyTestUtil\", package: \"smithy-swift\")\n" +
                 "            ],\n" +
                 "            path: \"./MockSDKTests\"\n" +
                 "        )\n" +
@@ -116,7 +115,7 @@ class PackageManifestGeneratorTests {
                 ),
                 .product(
                     name: "ClientRuntime",
-                    package: "ClientRuntime"
+                    package: "smithy-swift"
                 ),
             ],
             path: "./MockSDK"