diff --git a/README.md b/README.md index 0f632757..d46326ca 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ and `carton` 0.15. All version combinations of `carton` and JavaScriptKit higher other. You still have to keep in mind that older versions of SwiftWasm may be incompatible with newer `carton`. You can follow -the compatibility matrix if you need to use older verions: +the compatibility matrix if you need to use older versions: | `carton` version | SwiftWasm version | JavaScriptKit version | Tokamak version | | ---------------- | ----------------- | --------------------- | --------------- | @@ -172,7 +172,7 @@ Refer to [the pre-commit documentation page](https://pre-commit.com/) for more d and installation instructions for other platforms. SwiftFormat and SwiftLint also run on CI for every PR and thus a CI build can -fail with incosistent formatting or style. We require CI builds to pass for all +fail with inconsistent formatting or style. We require CI builds to pass for all PRs before merging. ### Code of Conduct diff --git a/Sources/CartonDriver/CartonDriverCommand.swift b/Sources/CartonDriver/CartonDriverCommand.swift index 603ec917..aecc56ae 100644 --- a/Sources/CartonDriver/CartonDriverCommand.swift +++ b/Sources/CartonDriver/CartonDriverCommand.swift @@ -147,7 +147,7 @@ func pluginSubcommand(subcommand: String, argv0: String, arguments: [String]) as ) var env: [String: String] = ProcessInfo.processInfo.environment - if ToolchainSystem.isSnapshotVersion(swiftPath.verison), + if ToolchainSystem.isSnapshotVersion(swiftPath.version), swiftPath.toolchain.extension == "xctoolchain" { env["DYLD_LIBRARY_PATH"] = swiftPath.toolchain.appending( diff --git a/Sources/CartonKit/Parsers/DiagnosticsParser.swift b/Sources/CartonKit/Parsers/DiagnosticsParser.swift index 9025f7b5..7732a326 100644 --- a/Sources/CartonKit/Parsers/DiagnosticsParser.swift +++ b/Sources/CartonKit/Parsers/DiagnosticsParser.swift @@ -16,7 +16,7 @@ import Foundation /// Parses and re-formats diagnostics output by the Swift compiler. /// -/// The compiler output often repeats iteself, and the diagnostics can sometimes be +/// The compiler output often repeats itself, and the diagnostics can sometimes be /// difficult to read. /// This reformats them to a more readable output. struct DiagnosticsParser { diff --git a/Sources/SwiftToolchain/ToolchainManagement.swift b/Sources/SwiftToolchain/ToolchainManagement.swift index 3071e6c6..a9156a46 100644 --- a/Sources/SwiftToolchain/ToolchainManagement.swift +++ b/Sources/SwiftToolchain/ToolchainManagement.swift @@ -201,7 +201,7 @@ public class ToolchainSystem { #endif terminal.logLookup( - "Response succesfully parsed, choosing from this number of assets: ", + "Response successfully parsed, choosing from this number of assets: ", release.assets.count ) let nameSuffixes = platformSuffixes.map { "\($0)_\(archSuffix)" } @@ -236,7 +236,7 @@ public class ToolchainSystem { } public struct SwiftPath { - public var verison: String + public var version: String public var swift: AbsolutePath public var toolchain: AbsolutePath } @@ -262,7 +262,7 @@ public class ToolchainSystem { for resolver in resolvers { let toolchain = resolver.toolchain(for: swiftVersion) if let path = try checkAndLog(installationPath: toolchain, terminal) { - return SwiftPath(verison: swiftVersion, swift: path, toolchain: toolchain) + return SwiftPath(version: swiftVersion, swift: path, toolchain: toolchain) } } @@ -295,7 +295,7 @@ public class ToolchainSystem { throw ToolchainError.invalidInstallationArchive(installationPath) } - return SwiftPath(verison: swiftVersion, swift: path, toolchain: installationPath) + return SwiftPath(version: swiftVersion, swift: path, toolchain: installationPath) } public func fetchAllSwiftVersions() throws -> [String] { diff --git a/Sources/SwiftToolchain/Utilities/ProgressAnimation.swift b/Sources/SwiftToolchain/Utilities/ProgressAnimation.swift index 7a84ca18..daf6a4bd 100644 --- a/Sources/SwiftToolchain/Utilities/ProgressAnimation.swift +++ b/Sources/SwiftToolchain/Utilities/ProgressAnimation.swift @@ -21,7 +21,7 @@ public protocol ProgressAnimationProtocol { /// Complete the animation. /// - Parameters: - /// - success: Defines if the operation the animation represents was succesful. + /// - success: Defines if the operation the animation represents was successful. func complete(success: Bool) /// Clear the animation.