diff --git a/AWSSDKSwiftCLI/Package.resolved b/AWSSDKSwiftCLI/Package.resolved index f320ccd88a7..c2576cbf22b 100644 --- a/AWSSDKSwiftCLI/Package.resolved +++ b/AWSSDKSwiftCLI/Package.resolved @@ -18,15 +18,6 @@ "version" : "1.3.1" } }, - { - "identity" : "swift-llbuild", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-llbuild.git", - "state" : { - "revision" : "fb7ebf0b06c0d7c45ca8e18b3371424503a38b5c", - "version" : "0.3.0" - } - }, { "identity" : "swift-log", "kind" : "remoteSourceControl", @@ -44,24 +35,6 @@ "revision" : "0a5bc04095a675662cf24757cc0640aa2204253b", "version" : "1.0.2" } - }, - { - "identity" : "swift-package-manager", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-package-manager", - "state" : { - "revision" : "f5ea3972d7d6c574e8bb16a19b2a7bca98ea131b", - "version" : "0.6.0" - } - }, - { - "identity" : "swift-tools-support-core", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-tools-support-core.git", - "state" : { - "revision" : "98a5916a811fcaaed770f1ed812e9405be762945", - "version" : "0.1.0" - } } ], "version" : 2 diff --git a/AWSSDKSwiftCLI/Package.swift b/AWSSDKSwiftCLI/Package.swift index 3b1b86f1040..ef65a290fe8 100644 --- a/AWSSDKSwiftCLI/Package.swift +++ b/AWSSDKSwiftCLI/Package.swift @@ -12,7 +12,6 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.0"), - .package(url: "https://github.com/apple/swift-package-manager", from: "0.6.0"), .package(url: "https://github.com/apple/swift-algorithms", from: "1.0.0"), .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"), ], @@ -34,7 +33,6 @@ let package = Package( dependencies: [ .product(name: "ArgumentParser", package: "swift-argument-parser"), .product(name: "Logging", package: "swift-log"), - .product(name: "PackageDescription", package: "swift-package-manager"), ] ), .testTarget( diff --git a/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Git.swift b/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Git.swift index a8aaa603fae..9db5ef13ba6 100644 --- a/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Git.swift +++ b/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Git.swift @@ -6,7 +6,6 @@ // import Foundation -import PackageDescription import struct ArgumentParser.ExitCode public extension Process { diff --git a/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Swift.swift b/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Swift.swift index 6d452578c40..b4213a3a227 100644 --- a/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Swift.swift +++ b/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Swift.swift @@ -6,7 +6,6 @@ // import Foundation -import PackageDescription public extension Process { struct Swift { diff --git a/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Utils.swift b/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Utils.swift index 25a76634b58..4c499e4a86c 100644 --- a/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Utils.swift +++ b/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Utils.swift @@ -49,6 +49,14 @@ public func _run(_ process: Process) throws { } public func _runReturningStdOut(_ process: Process) throws -> String? { + // If debug and we have a non-nil test runner, then use that + // This allows developers to intercept processes when they run to assert that it is the expected process + #if DEBUG + if let testRunner = ProcessRunner.testRunner { + try testRunner.run(process) + return nil + } + #endif let stdOut = Pipe() process.standardOutput = stdOut diff --git a/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Version+Utils.swift b/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Version.swift similarity index 63% rename from AWSSDKSwiftCLI/Sources/AWSCLIUtils/Version+Utils.swift rename to AWSSDKSwiftCLI/Sources/AWSCLIUtils/Version.swift index c82099e650e..ec42553cc34 100644 --- a/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Version+Utils.swift +++ b/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Version.swift @@ -7,15 +7,46 @@ import Foundation import ArgumentParser -import PackageDescription -// MARK: - Decodable +public struct Version: Equatable { + public let major: Int + public let minor: Int + public let patch: Int + + private var versionString: String { "\(major).\(minor).\(patch)" } + + init(_ major: Int, _ minor: Int, _ patch: Int) { + self.major = major + self.minor = minor + self.patch = patch + } + + public init(_ value: String) throws { + let components = value.split(separator: ".") + guard components.count == 3 else { + throw Error("Version does not have three components") + } + guard let major = Int(components[0]), let minor = Int(components[1]), let patch = Int(components[2]) else { + throw Error("Version components are not all Int") + } + self.init(major, minor, patch) + } +} + +extension Version: CustomStringConvertible { + public var description: String { versionString } +} + +// MARK: - Codable + +extension Version: Codable { -extension Version: Decodable { public init(from decoder: Decoder) throws { - let container = try decoder.singleValueContainer() - let value = try container.decode(String.self) - self.init(stringLiteral: value) + try self.init(try String(from: decoder)) + } + + public func encode(to encoder: any Encoder) throws { + try versionString.encode(to: encoder) } } @@ -37,11 +68,7 @@ public extension Version { let normalizedVersionString = versionString.trimmingCharacters(in: .whitespacesAndNewlines) - guard let version = Version.init(normalizedVersionString) else { - throw Error("Failed to parse version from string \(normalizedVersionString)") - } - - return version + return try Version(normalizedVersionString) } } @@ -55,9 +82,7 @@ public extension Version { Version( self.major + 1, 0, - 0, - prereleaseIdentifiers: prereleaseIdentifiers, - buildMetadataIdentifiers: buildMetadataIdentifiers + 0 ) } @@ -68,9 +93,7 @@ public extension Version { Version( self.major, self.minor + 1, - 0, - prereleaseIdentifiers: prereleaseIdentifiers, - buildMetadataIdentifiers: buildMetadataIdentifiers + 0 ) } @@ -81,9 +104,7 @@ public extension Version { Version( self.major, self.minor, - self.patch + 1, - prereleaseIdentifiers: prereleaseIdentifiers, - buildMetadataIdentifiers: buildMetadataIdentifiers + self.patch + 1 ) } } @@ -91,7 +112,8 @@ public extension Version { // MARK: - ExpressibleByArgument extension Version: ExpressibleByArgument { + public init?(argument: String) { - self.init(argument) + try? self.init(argument) } } diff --git a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/GeneratePackageManifest.swift b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/GeneratePackageManifest.swift index e25e1f812d6..fa2925f6d9f 100644 --- a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/GeneratePackageManifest.swift +++ b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/GeneratePackageManifest.swift @@ -7,7 +7,6 @@ import ArgumentParser import Foundation -import PackageDescription import AWSCLIUtils // MARK: - Command diff --git a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/PrepareRelease.swift b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/PrepareRelease.swift index 2aee189d19e..c20706e1bbf 100644 --- a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/PrepareRelease.swift +++ b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/PrepareRelease.swift @@ -7,7 +7,6 @@ import ArgumentParser import Foundation -import PackageDescription import AWSCLIUtils // MARK: - Command @@ -147,7 +146,7 @@ struct PrepareRelease { func createNewVersion(_ previousVersion: Version) throws -> Version { let newVersion = previousVersion.incrementingMinor() do { - try "\(newVersion)".write(toFile: "Package.version" , atomically: true, encoding: .utf8) + try "\(newVersion)".write(toFile: "Package.version" , atomically: true, encoding: .utf8) } catch { throw Error("Failed to write version \(newVersion) to Package.version") } diff --git a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/SyncClientRuntimeVersion.swift b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/SyncClientRuntimeVersion.swift index 2d08594d12d..be3904e75d6 100644 --- a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/SyncClientRuntimeVersion.swift +++ b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/SyncClientRuntimeVersion.swift @@ -7,7 +7,6 @@ import ArgumentParser import Foundation -import PackageDescription import AWSCLIUtils // MARK: - Command diff --git a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/TestAWSSDK.swift b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/TestAWSSDK.swift index efa47b3d1b2..d8a507b02b7 100644 --- a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/TestAWSSDK.swift +++ b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/TestAWSSDK.swift @@ -8,7 +8,6 @@ import Algorithms import ArgumentParser import Foundation -import PackageDescription import AWSCLIUtils // MARK: - Command diff --git a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/DocIndexBuilder.swift b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/DocIndexBuilder.swift index 7f401f29e4d..06321360d70 100644 --- a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/DocIndexBuilder.swift +++ b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/DocIndexBuilder.swift @@ -6,7 +6,6 @@ // import Foundation -import PackageDescription import AWSCLIUtils /// Builds the contents of the package manifest file. diff --git a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/PackageDependencies.swift b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/PackageDependencies.swift index 74a89bdb7c3..c53ce8bc867 100644 --- a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/PackageDependencies.swift +++ b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/PackageDependencies.swift @@ -6,7 +6,7 @@ // import Foundation -import PackageDescription +import AWSCLIUtils /// `PackageDependencies` is a representation of contents of the .plist stored at packageDependencies.plist struct PackageDependencies: Codable { diff --git a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/PackageManifestBuilder.swift b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/PackageManifestBuilder.swift index dad382bdbbb..0f7e71b244f 100644 --- a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/PackageManifestBuilder.swift +++ b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/PackageManifestBuilder.swift @@ -6,7 +6,6 @@ // import Foundation -import PackageDescription import AWSCLIUtils /// Builds the contents of the package manifest file. diff --git a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/ReleaseManifest.swift b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/ReleaseManifest.swift index e7e50aff6b0..0adb5c1eb9a 100644 --- a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/ReleaseManifest.swift +++ b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/ReleaseManifest.swift @@ -6,7 +6,6 @@ // import Foundation -import PackageDescription struct ReleaseManifest: Codable { let name: String diff --git a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/ReleaseNotesBuilder.swift b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/ReleaseNotesBuilder.swift index eaaca9be4b6..da4451fe660 100644 --- a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/ReleaseNotesBuilder.swift +++ b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/ReleaseNotesBuilder.swift @@ -6,7 +6,6 @@ // import Foundation -import PackageDescription import AWSCLIUtils // Builds the release notes diff --git a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/GeneratePackageManifestTests.swift b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/GeneratePackageManifestTests.swift index 77aa1c0e67a..9eae63e02bd 100644 --- a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/GeneratePackageManifestTests.swift +++ b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/GeneratePackageManifestTests.swift @@ -6,7 +6,7 @@ // @testable import AWSSDKSwiftCLI -import PackageDescription +import AWSCLIUtils import XCTest class GeneratePackageManifestTests: CLITestCase { @@ -16,10 +16,10 @@ class GeneratePackageManifestTests: CLITestCase { func createPackageDependencies( crtVersion: String, clientRuntimeVersion: String - ) { - let packageDependencies = PackageDependencies( - awsCRTSwiftVersion: .init(crtVersion)!, - clientRuntimeVersion: .init(clientRuntimeVersion)! + ) throws { + let packageDependencies = try PackageDependencies( + awsCRTSwiftVersion: .init(crtVersion), + clientRuntimeVersion: .init(clientRuntimeVersion) ) try! packageDependencies.save() } @@ -41,11 +41,11 @@ class GeneratePackageManifestTests: CLITestCase { // MARK: Golden Path - func testGoldenPath() { + func testGoldenPath() throws { let clientRuntimeVersion = "1.2.3" let crtVersion = "3.2.1" let services = ["EC2", "S3"] - createPackageDependencies( + try createPackageDependencies( crtVersion: crtVersion, clientRuntimeVersion: clientRuntimeVersion ) @@ -61,10 +61,10 @@ class GeneratePackageManifestTests: CLITestCase { // MARK: resolveVersions() - func testResolveVersionsRetrievesVersionsFromPackageDependencies() { + func testResolveVersionsRetrievesVersionsFromPackageDependencies() throws { let clientRuntimeVersion = "1.2.3" let crtVersion = "3.2.1" - createPackageDependencies( + try createPackageDependencies( crtVersion: crtVersion, clientRuntimeVersion: clientRuntimeVersion ) @@ -74,10 +74,10 @@ class GeneratePackageManifestTests: CLITestCase { XCTAssertEqual(versions.crt.description, crtVersion) } - func testResolveVersionsWithExplicitVersions() { + func testResolveVersionsWithExplicitVersions() throws { let clientRuntimeVersion = "1.2.3" let crtVersion = "3.2.1" - let subject = GeneratePackageManifest.mock( + let subject = try GeneratePackageManifest.mock( clientRuntimeVersion: .init(clientRuntimeVersion), crtVersion: .init(crtVersion) ) diff --git a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/PrepareReleaseTests.swift b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/PrepareReleaseTests.swift index 59aa1539581..3c49095c6ab 100644 --- a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/PrepareReleaseTests.swift +++ b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/PrepareReleaseTests.swift @@ -6,7 +6,6 @@ // @testable import AWSSDKSwiftCLI -import PackageDescription import XCTest import AWSCLIUtils @@ -26,14 +25,14 @@ class PrepareReleaseTests: CLITestCase { // MARK: Golden Path - func testGoldenPath() { + func testGoldenPath() throws { var commands: [String] = [] let runner = ProcessRunner { commands.append($0.commandString) } ProcessRunner.testRunner = runner - let previousVersion = Version("1.2.3") - let newVersion = Version("1.3.0") + let previousVersion = try Version("1.2.3") + let newVersion = try Version("1.3.0") createPackageVersion(previousVersion) let subject = PrepareRelease.mock(diffChecker: { _,_ in true }) @@ -54,13 +53,13 @@ class PrepareReleaseTests: CLITestCase { XCTAssertTrue(commands[4].contains("git status")) } - func testRunBailsEarlyIfThereAreNoChanges() { + func testRunBailsEarlyIfThereAreNoChanges() throws { var commands: [String] = [] let runner = ProcessRunner { commands.append($0.commandString) } ProcessRunner.testRunner = runner - let previousVersion = Version("1.2.3") + let previousVersion = try Version("1.2.3") createPackageVersion(previousVersion) let subject = PrepareRelease.mock(diffChecker: { _,_ in false }) @@ -74,9 +73,9 @@ class PrepareReleaseTests: CLITestCase { // MARK: createNewVersion() - func testCreateNewVersion() { - let previousVersion = Version("1.2.3") - let newVersion = Version("1.3.0") + func testCreateNewVersion() throws { + let previousVersion = try Version("1.2.3") + let newVersion = try Version("1.3.0") let subject = PrepareRelease.mock() let result = try! subject.createNewVersion(previousVersion) XCTAssertEqual(result, newVersion) @@ -87,8 +86,8 @@ class PrepareReleaseTests: CLITestCase { // MARK: getPreviousVersion() - func testGetPreviousVersionFromPackageVersion() { - let version = Version("1.2.3") + func testGetPreviousVersionFromPackageVersion() throws { + let version = try Version("1.2.3") createPackageVersion(version) let subject = PrepareRelease.mock() let result = try! subject.getPreviousVersion() diff --git a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/SyncClientRuntimeVersionTests.swift b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/SyncClientRuntimeVersionTests.swift index ed2919910c8..337268fd224 100644 --- a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/SyncClientRuntimeVersionTests.swift +++ b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/SyncClientRuntimeVersionTests.swift @@ -6,14 +6,13 @@ // @testable import AWSSDKSwiftCLI -import PackageDescription import XCTest class SyncClientRuntimeVersionTests: CLITestCase { // MARK: - Helpers - func createGoldenPathEnvironment() { + func createGoldenPathEnvironment() throws { try! FileManager.default.createDirectory( atPath: "aws-sdk-swift", withIntermediateDirectories: false @@ -27,7 +26,7 @@ class SyncClientRuntimeVersionTests: CLITestCase { atomically: true, encoding: .utf8 ) - let dependencies = PackageDependencies( + let dependencies = try PackageDependencies( awsCRTSwiftVersion: .init("0.0.1"), clientRuntimeVersion: .init("0.0.1") ) @@ -38,13 +37,13 @@ class SyncClientRuntimeVersionTests: CLITestCase { // MARK: Golden Path - func testGoldenPath() { - createGoldenPathEnvironment() + func testGoldenPath() throws { + try createGoldenPathEnvironment() let subject = SyncClientRuntimeVersion.mock(repoPath: "aws-sdk-swift") try! subject.run() let result = try! PackageDependencies.load() - XCTAssertEqual(result.clientRuntimeVersion, .init("1.2.3")) - XCTAssertEqual(result.awsCRTSwiftVersion, .init("0.0.1")) + try XCTAssertEqual(result.clientRuntimeVersion, .init("1.2.3")) + try XCTAssertEqual(result.awsCRTSwiftVersion, .init("0.0.1")) } // MARK: resolveSmithySwiftPath() diff --git a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/TestAWSSDKTests.swift b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/TestAWSSDKTests.swift index 1b17a84d9d4..98364600c18 100644 --- a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/TestAWSSDKTests.swift +++ b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/TestAWSSDKTests.swift @@ -7,7 +7,6 @@ @testable import AWSSDKSwiftCLI import Algorithms -import PackageDescription import XCTest import AWSCLIUtils @@ -24,14 +23,14 @@ class TestAWSSDKTests: CLITestCase { } } - func createGoldenPathEnvironment() { + func createGoldenPathEnvironment() throws { let services = ["A", "B", "C", "D", "E", "F", "G", "H"] // Create services createServiceFolders(services) // Create packageDependencies.plist - let deps = PackageDependencies( + let deps = try PackageDependencies( awsCRTSwiftVersion: .init("1.2.3"), clientRuntimeVersion: .init("3.2.1") ) @@ -49,9 +48,9 @@ class TestAWSSDKTests: CLITestCase { // MARK: Golden Path - func testGoldenPath() { - createGoldenPathEnvironment() - + func testGoldenPath() throws { + try createGoldenPathEnvironment() + var commands: [String] = [] let runner = ProcessRunner { commands.append($0.commandString) diff --git a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Models/PackageManifestBuilderTests.swift b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Models/PackageManifestBuilderTests.swift index e06039553be..4d9dde10a64 100644 --- a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Models/PackageManifestBuilderTests.swift +++ b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Models/PackageManifestBuilderTests.swift @@ -39,8 +39,8 @@ addResolvedTargets() """ - func testBuild() { - let subject = PackageManifestBuilder( + func testBuild() throws { + let subject = try PackageManifestBuilder( clientRuntimeVersion: .init("1.2.3"), crtVersion: .init("4.5.6"), services: ["A","B","C","D","E"].map { PackageManifestBuilder.Service(name: $0) }, diff --git a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Utils/ProcessUtilsTests.swift b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Utils/ProcessUtilsTests.swift index fc81690d763..d55edb5b23a 100644 --- a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Utils/ProcessUtilsTests.swift +++ b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Utils/ProcessUtilsTests.swift @@ -6,7 +6,6 @@ // @testable import AWSSDKSwiftCLI -import PackageDescription import ArgumentParser import XCTest import AWSCLIUtils diff --git a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Utils/VersionUtilsTests.swift b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Utils/VersionUtilsTests.swift index 30c8c809eb3..211cc3bfb35 100644 --- a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Utils/VersionUtilsTests.swift +++ b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Utils/VersionUtilsTests.swift @@ -6,27 +6,27 @@ // @testable import AWSSDKSwiftCLI -import PackageDescription +import AWSCLIUtils import XCTest class VersionUtilsTests: XCTestCase { - func testIncrementingMajor() { - XCTAssertEqual( + func testIncrementingMajor() throws { + try XCTAssertEqual( Version("1.2.1").incrementingMajor(), Version("2.0.0") ) } - func testIncrementingMinor() { - XCTAssertEqual( + func testIncrementingMinor() throws { + try XCTAssertEqual( Version("1.2.1").incrementingMinor(), Version("1.3.0") ) } - func testIncrementingPatch() { - XCTAssertEqual( + func testIncrementingPatch() throws { + try XCTAssertEqual( Version("1.2.1").incrementingPatch(), Version("1.2.2") )