Skip to content

Commit 60de8a4

Browse files
authored
fix!: Rename package to match name inferred from git URL (#464)
1 parent e4285fe commit 60de8a4

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import PackageDescription
44

55

66
let package = Package(
7-
name: "ClientRuntime",
7+
name: "smithy-swift",
88
platforms: [
99
.macOS(.v10_15),
1010
.iOS(.v13)

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fun writePackageManifest(settings: SwiftSettings, fileManifest: FileManifest, de
5555
writer.write("name: \"${settings.moduleName}Tests\",")
5656
writer.openBlock("dependencies: [", "],") {
5757
writer.write("\$S,", settings.moduleName)
58-
writer.write(".product(name: \"SmithyTestUtil\", package: \"ClientRuntime\")")
58+
writer.write(".product(name: \"SmithyTestUtil\", package: \"smithy-swift\")")
5959
}
6060
writer.write("path: \"./${settings.moduleName}Tests\"")
6161
}
@@ -82,7 +82,7 @@ fun renderPackageDependenciesWithLocalPaths(writer: CodeWriter, distinctDependen
8282
val target = dependency.expectProperty("target", String::class.java)
8383

8484
if (localPath.isNotEmpty()) {
85-
writer.write(".package(name: \"${target}\", path: \"$localPath\"),")
85+
writer.write(".package(path: \"$localPath\"),")
8686
} else {
8787
renderPackageWithUrl(writer, dependency)
8888
}
@@ -102,7 +102,6 @@ fun renderPackageWithUrl(writer: CodeWriter, dependency: SymbolDependency) {
102102
writer.openBlock(".package(", "),") {
103103
val target = dependency.expectProperty("target", String::class.java)
104104
val dependencyURL = dependency.expectProperty("url", String::class.java)
105-
writer.write("name: \"$target\",")
106105
writer.write("url: \"$dependencyURL\",")
107106
val branch = dependency.getProperty("branch", String::class.java)
108107
if (!branch.getOrNull().isNullOrEmpty()) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ enum class SwiftDependency(
2525
"0.1.0",
2626
"https://github.com/awslabs/smithy-swift",
2727
Resources.computeAbsolutePath("smithy-swift", "", "SMITHY_SWIFT_CI_DIR"),
28-
"ClientRuntime"
28+
"smithy-swift"
2929
),
3030
XCTest("XCTest", null, "", "", "", ""),
3131
SMITHY_TEST_UTIL(
@@ -34,7 +34,7 @@ enum class SwiftDependency(
3434
"0.1.0",
3535
"https://github.com/awslabs/smithy-swift",
3636
Resources.computeAbsolutePath("smithy-swift", "", "SMITHY_SWIFT_CI_DIR"),
37-
"ClientRuntime"
37+
"smithy-swift"
3838
);
3939

4040
override fun getDependencies(): List<SymbolDependency> {

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class PackageManifestGeneratorTests {
3434
assertNotNull(packageManifest)
3535
val expectedContents = """
3636
.package(
37-
name: "ComplexModule",
3837
url: "https://github.com/apple/swift-numerics",
3938
from: "0.0.5"
4039
),
@@ -82,7 +81,7 @@ class PackageManifestGeneratorTests {
8281
" ),\n" +
8382
" .product(\n" +
8483
" name: \"ClientRuntime\",\n" +
85-
" package: \"ClientRuntime\"\n" +
84+
" package: \"smithy-swift\"\n" +
8685
" ),\n" +
8786
" ],\n" +
8887
" path: \"./MockSDK\"\n" +
@@ -91,7 +90,7 @@ class PackageManifestGeneratorTests {
9190
" name: \"MockSDKTests\",\n" +
9291
" dependencies: [\n" +
9392
" \"MockSDK\",\n" +
94-
" .product(name: \"SmithyTestUtil\", package: \"ClientRuntime\")\n" +
93+
" .product(name: \"SmithyTestUtil\", package: \"smithy-swift\")\n" +
9594
" ],\n" +
9695
" path: \"./MockSDKTests\"\n" +
9796
" )\n" +
@@ -116,7 +115,7 @@ class PackageManifestGeneratorTests {
116115
),
117116
.product(
118117
name: "ClientRuntime",
119-
package: "ClientRuntime"
118+
package: "smithy-swift"
120119
),
121120
],
122121
path: "./MockSDK"

0 commit comments

Comments
 (0)