Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
polac24 authored May 31, 2023
1 parent 532484c commit 867bbb6
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ extension IntegrateContext {
var swiftcBinaryName = "swiftc"
var buildSettingsAppenderOptions: BuildSettingsIntegrateAppenderOption = []
// Keep the legacy behaviour (supported in Xcode 14 and lower)
if !config.enableSwifDriverIntegration {
if !config.enableSwiftDriverIntegration {
buildSettingsAppenderOptions.insert(.disableSwiftDriverIntegration)
swiftcBinaryName = "xcswiftc"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ enum SwiftFrontendArgInputError: Error, Equatable {
// -target is required
case emitMissingTarget
// -moduleName is required
case emiMissingModuleName
case emitMissingModuleName
}

public struct SwiftFrontendArgInput {
Expand Down Expand Up @@ -224,7 +224,7 @@ public struct SwiftFrontendArgInput {
throw SwiftFrontendArgInputError.emitMissingTarget
}
guard let moduleName = moduleName else {
throw SwiftFrontendArgInputError.emiMissingModuleName
throw SwiftFrontendArgInputError.emitMissingModuleName
}

if compile {
Expand Down
8 changes: 4 additions & 4 deletions Sources/XCRemoteCache/Config/XCRemoteCacheConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public struct XCRemoteCacheConfig: Encodable {
/// That might useful on CI, where a shallow clone is used
var gracefullyHandleMissingCommonSha: Bool = false
/// Enable experimental integration with swift driver, added in Xcode 14
var enableSwifDriverIntegration: Bool = false
var enableSwiftDriverIntegration: Bool = false
}

extension XCRemoteCacheConfig {
Expand Down Expand Up @@ -217,7 +217,7 @@ extension XCRemoteCacheConfig {
merge.irrelevantDependenciesPaths = scheme.irrelevantDependenciesPaths ?? irrelevantDependenciesPaths
merge.gracefullyHandleMissingCommonSha =
scheme.gracefullyHandleMissingCommonSha ?? gracefullyHandleMissingCommonSha
merge.enableSwifDriverIntegration = scheme.enableSwifDriverIntegration ?? enableSwifDriverIntegration
merge.enableSwiftDriverIntegration = scheme.enableSwiftDriverIntegration ?? enableSwiftDriverIntegration
return merge
}

Expand Down Expand Up @@ -286,7 +286,7 @@ struct ConfigFileScheme: Decodable {
let customRewriteEnvs: [String]?
let irrelevantDependenciesPaths: [String]?
let gracefullyHandleMissingCommonSha: Bool?
let enableSwifDriverIntegration: Bool?
let enableSwiftDriverIntegration: Bool?

// Yams library doesn't support encoding strategy, see https://github.com/jpsim/Yams/issues/84
enum CodingKeys: String, CodingKey {
Expand Down Expand Up @@ -338,7 +338,7 @@ struct ConfigFileScheme: Decodable {
case customRewriteEnvs = "custom_rewrite_envs"
case irrelevantDependenciesPaths = "irrelevant_dependencies_paths"
case gracefullyHandleMissingCommonSha = "gracefully_handle_missing_common_sha"
case enableSwifDriverIntegration = "enable_swift_driver_integration"
case enableSwiftDriverIntegration = "enable_swift_driver_integration"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class IntegrateTests: FileXCTestCase {
}

func testEnablesDriverOnRequest() throws {
config.enableSwifDriverIntegration = true
config.enableSwiftDriverIntegration = true
let context = try IntegrateContext(
input: "project.xcodeproj",
config: config,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class SwiftFrontendArgInputTests: FileXCTestCase {
target = "Target"
buildInput()

assertGenerationError(SwiftFrontendArgInputError.emiMissingModuleName)
assertGenerationError(SwiftFrontendArgInputError.emitMissingModuleName)
}

func testFailsIfNoCompileHasNoPrimaryInputs() throws {
Expand Down

0 comments on commit 867bbb6

Please sign in to comment.