Skip to content

Commit 7c78344

Browse files
committed
Merge branch 'feature/logging'
2 parents eae37c9 + 62ce88d commit 7c78344

File tree

2 files changed

+29
-6
lines changed

2 files changed

+29
-6
lines changed

Sources/SwiftTools/Build/Domain/BuildInteractor.swift

+20-5
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,22 @@ final class BuildInteractorImpl: BuildInteractor {
2626
}
2727

2828
func build(with arguments: BuildArguments) throws {
29-
let arguments = try makeArguments(scheme: arguments.scheme, platform: arguments.platform, arguments: arguments.arguments)
29+
let arguments = try makeArguments(
30+
scheme: arguments.scheme,
31+
platform: arguments.platform,
32+
arguments: arguments.arguments,
33+
isQuiet: !verboseController.isVerbose()
34+
)
3035
try shellService.execute(arguments: arguments)
3136
}
3237

3338
func getBuildSettings(with arguments: BuildArguments) throws -> String {
34-
let arguments = try makeArguments(scheme: arguments.scheme, platform: arguments.platform, arguments: arguments.arguments + ["-showBuildSettings"])
39+
let arguments = try makeArguments(
40+
scheme: arguments.scheme,
41+
platform: arguments.platform,
42+
arguments: arguments.arguments + ["-showBuildSettings"],
43+
isQuiet: !verboseController.isVerbose()
44+
)
3545
return try shellService.executeWithResult(arguments: arguments)
3646
}
3747

@@ -53,16 +63,21 @@ final class BuildInteractorImpl: BuildInteractor {
5363
if arguments.isCodeCoverageEnabled {
5464
additionalArguments += ["-enableCodeCoverage", "YES"]
5565
}
56-
return try makeArguments(scheme: arguments.scheme, platform: arguments.platform, arguments: additionalArguments)
66+
return try makeArguments(
67+
scheme: arguments.scheme,
68+
platform: arguments.platform,
69+
arguments: additionalArguments,
70+
isQuiet: arguments.isQuiet
71+
)
5772
}
5873

59-
private func makeArguments(scheme: String, platform: Platform?, arguments: [String]) throws -> [String] {
74+
private func makeArguments(scheme: String, platform: Platform?, arguments: [String], isQuiet: Bool) throws -> [String] {
6075
var buildArguments = ["xcodebuild", "-scheme", scheme]
6176
if let platform = platform {
6277
let destination = try getDestination(for: platform, scheme: scheme)
6378
buildArguments += ["-destination", destination]
6479
}
65-
if !verboseController.isVerbose() {
80+
if isQuiet {
6681
buildArguments += ["-quiet"]
6782
}
6883
return buildArguments + arguments

Sources/SwiftTools/Build/Domain/TestArguments.swift

+9-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,19 @@ public struct TestArguments {
1010
public let platform: Platform
1111
public let testPlan: String?
1212
public let isCodeCoverageEnabled: Bool
13+
public let isQuiet: Bool
1314

14-
public init(scheme: String, platform: Platform, testPlan: String? = nil, isCodeCoverageEnabled: Bool = false) {
15+
public init(
16+
scheme: String,
17+
platform: Platform,
18+
testPlan: String? = nil,
19+
isCodeCoverageEnabled: Bool = false,
20+
isQuiet: Bool = true
21+
) {
1522
self.scheme = scheme
1623
self.platform = platform
1724
self.testPlan = testPlan
1825
self.isCodeCoverageEnabled = isCodeCoverageEnabled
26+
self.isQuiet = isQuiet
1927
}
2028
}

0 commit comments

Comments
 (0)