Skip to content

Commit 58fbdfa

Browse files
author
Joe Newton
committed
Fixed issue where Half wasn't buildable from the command line
1 parent 5e05a8e commit 58fbdfa

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
Half.xcodeproj/project.xcworkspace
22
Half.xcodeproj/xcuserdata
3+
.swiftpm
4+
.build

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ let package = Package(
2121
.testTarget(name: "HalfTests", dependencies: ["Half"])
2222
],
2323

24-
swiftLanguageVersions: [.version("4.0"), .version("4.2"), .version("5.0")]
24+
swiftLanguageVersions: [.version("4"), .version("4.2"), .version("5")]
2525
)

Tests/HalfTests/Half+CodingTests.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class HalfCodingTests: XCTestCase {
3131

3232
XCTAssertNoThrow(data = try JSONEncoder().encode(simple))
3333
XCTAssertNoThrow(decoded = try JSONDecoder().decode(Simple.self, from: data))
34-
try XCTAssertEqual(XCTUnwrap(decoded), simple)
34+
XCTAssertEqual(decoded, simple)
3535
}
3636
do {
3737
let values: [Half] = [1.0, 2.0, 3.0]
@@ -40,7 +40,7 @@ class HalfCodingTests: XCTestCase {
4040

4141
XCTAssertNoThrow(data = try JSONEncoder().encode(values))
4242
XCTAssertNoThrow(decoded = try JSONDecoder().decode([Half].self, from: data))
43-
try XCTAssertEqual(XCTUnwrap(decoded), values)
43+
XCTAssertEqual(decoded, values)
4444
}
4545
do {
4646
let values: [Simple] = [Simple(half: 1.5, int: 1), Simple(half: 2.5, int: 2), Simple(half: 3.5, int: 3)]
@@ -49,7 +49,7 @@ class HalfCodingTests: XCTestCase {
4949

5050
XCTAssertNoThrow(data = try JSONEncoder().encode(values))
5151
XCTAssertNoThrow(decoded = try JSONDecoder().decode([Simple].self, from: data))
52-
try XCTAssertEqual(XCTUnwrap(decoded), values)
52+
XCTAssertEqual(decoded, values)
5353
}
5454
do {
5555
let simple = Simple(half: .infinity, int: 0)
@@ -65,8 +65,8 @@ class HalfCodingTests: XCTestCase {
6565
XCTAssertNoThrow(data = try encoder.encode(simple))
6666
XCTAssertNoThrow(decoded = try decoder.decode(Simple.self, from: data))
6767

68-
try XCTAssertEqual(XCTUnwrap(decoded).int, simple.int)
69-
try XCTAssertTrue(XCTUnwrap(decoded).half.isInfinite)
68+
XCTAssertEqual(decoded.int, simple.int)
69+
XCTAssertTrue(decoded.half.isInfinite)
7070
}
7171
do {
7272
let simple = Simple(half: -.infinity, int: 0)
@@ -82,8 +82,8 @@ class HalfCodingTests: XCTestCase {
8282
XCTAssertNoThrow(data = try encoder.encode(simple))
8383
XCTAssertNoThrow(decoded = try decoder.decode(Simple.self, from: data))
8484

85-
try XCTAssertEqual(XCTUnwrap(decoded).int, simple.int)
86-
try XCTAssertTrue(XCTUnwrap(decoded).half.isInfinite)
85+
XCTAssertEqual(decoded.int, simple.int)
86+
XCTAssertTrue(decoded.half.isInfinite)
8787
}
8888
do {
8989
let simple = Simple(half: .nan, int: 0)
@@ -99,8 +99,8 @@ class HalfCodingTests: XCTestCase {
9999
XCTAssertNoThrow(data = try encoder.encode(simple))
100100
XCTAssertNoThrow(decoded = try decoder.decode(Simple.self, from: data))
101101

102-
try XCTAssertEqual(XCTUnwrap(decoded).int, simple.int)
103-
try XCTAssertTrue(XCTUnwrap(decoded).half.isNaN)
102+
XCTAssertEqual(decoded.int, simple.int)
103+
XCTAssertTrue(decoded.half.isNaN)
104104
}
105105
do {
106106
let simple = Simple(half: .signalingNaN, int: 0)
@@ -116,8 +116,8 @@ class HalfCodingTests: XCTestCase {
116116
XCTAssertNoThrow(data = try encoder.encode(simple))
117117
XCTAssertNoThrow(decoded = try decoder.decode(Simple.self, from: data))
118118

119-
try XCTAssertEqual(XCTUnwrap(decoded).int, simple.int)
120-
try XCTAssertTrue(XCTUnwrap(decoded).half.isNaN)
119+
XCTAssertEqual(decoded.int, simple.int)
120+
XCTAssertTrue(decoded.half.isNaN)
121121
}
122122
}
123123

Tests/HalfTests/HalfTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class HalfTests: XCTestCase {
158158
XCTAssertEqual(Half(uint), 1.0)
159159
XCTAssertEqual(Half(uint), 1)
160160

161-
try XCTAssertEqual(XCTUnwrap(Half(exactly: 8)), 8.0)
161+
XCTAssertEqual(Half(exactly: 8), 8.0)
162162
XCTAssertNil(Half(exactly: Int64.max))
163163
}
164164

0 commit comments

Comments
 (0)