Skip to content

Commit e18b0ef

Browse files
author
Greg Bolsinga
authored
Merge pull request #127 from pinterest/PreserveSpacesInValues
Preserve spaces in copts values
2 parents 4a3d4da + 47acacc commit e18b0ef

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

Sources/PodToBUILD/UserConfigurable.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ extension UserConfigurable {
5656
let components = keyPathOperator.components(separatedBy: opt.rawValue)
5757
guard components.count > 1 else { continue }
5858

59-
let key = components[0].replacingOccurrences(of: " ", with: "")
59+
let key = components[0].trimmingCharacters(in: .whitespaces)
6060
let values = components[1].components(separatedBy: ",")
6161
for value in values {
62-
let value = value.replacingOccurrences(of: " ", with: "")
62+
let value = value.trimmingCharacters(in: .whitespaces)
6363
copy.add(configurableKey: key, value: value)
6464
}
6565
}

Tests/PodToBUILDTests/UserConfigurableTests.swift

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,15 @@ class UserConfigurableTests: XCTestCase {
9191
let outputCopts = outputLib.copts.basic
9292
XCTAssertEqual(outputCopts?[0], "TargetConditionals.h")
9393
}
94+
95+
func testUserOptionPresevesSpaces() {
96+
let target = TestTarget()
97+
let attributes = UserConfigurableTargetAttributes(keyPathOperators: ["TestTarget.copts += --include TargetConditionals.h"])
98+
let output = UserConfigurableTransform.executeUserOptionsTransform(onConvertibles: [target], copts: [String](), userAttributes: attributes)
99+
let outputLib = output[0] as! TestTarget
100+
let outputCopts = outputLib.copts.basic
101+
XCTAssertEqual(outputCopts?[0], "--include TargetConditionals.h")
102+
}
94103
}
95104

96105

0 commit comments

Comments
 (0)