Skip to content

Commit 291c31b

Browse files
inamiyinamiy
committed
Merge pull request #6 from inamiy/Xcode6.1-GM
Fix code for Xcode6.1-GM.
2 parents ce4f439 + a28a617 commit 291c31b

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎SwiftTask.xcodeproj/project.pbxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,11 @@
1616
1F46DEFD199EE2C200F97868 /* _TestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFC199EE2C200F97868 /* _TestCase.swift */; };
1717
1F53421819B4998A00CB93D9 /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F46DED4199EDF1000F97868 /* SwiftTask.framework */; };
1818
1F6A8CA319A4E4F200369A5D /* SwiftTaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEE3199EDF1000F97868 /* SwiftTaskTests.swift */; };
19-
1F6A8CA619A5090E00369A5D /* AlamofireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */; };
20-
1FA4634919A8D73300DD8729 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA4631719A8D70A00DD8729 /* Alamofire.swift */; };
2119
4822F0DC19D00B2300F5F572 /* _TestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFC199EE2C200F97868 /* _TestCase.swift */; };
2220
4822F0DD19D00B2300F5F572 /* BasicTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F20250119ADA8FD00DE0495 /* BasicTests.swift */; };
2321
4822F0DE19D00B2300F5F572 /* SwiftTaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEE3199EDF1000F97868 /* SwiftTaskTests.swift */; };
2422
4822F0DF19D00B2300F5F572 /* CustomOperatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F2024FE19AD97A700DE0495 /* CustomOperatorTests.swift */; };
2523
4822F0E019D00B2300F5F572 /* RetainCycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48511C5A19C17563002FE03C /* RetainCycleTests.swift */; };
26-
4822F0E119D00B2300F5F572 /* AlamofireTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F5FA35619A374E600975FB9 /* AlamofireTests.swift */; };
27-
4822F0E219D00B2E00F5F572 /* Alamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FA4631719A8D70A00DD8729 /* Alamofire.swift */; };
2824
4822F0E319D00B3100F5F572 /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F0E282319C1DEA0005EF467 /* Async.swift */; };
2925
48511C5B19C17563002FE03C /* RetainCycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48511C5A19C17563002FE03C /* RetainCycleTests.swift */; };
3026
48797D6619B42CEF0085D80F /* SwiftState.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FA4634319A8D70A00DD8729 /* SwiftState.framework */; };
@@ -452,9 +448,7 @@
452448
buildActionMask = 2147483647;
453449
files = (
454450
1F2024FF19AD97A700DE0495 /* CustomOperatorTests.swift in Sources */,
455-
1FA4634919A8D73300DD8729 /* Alamofire.swift in Sources */,
456451
1F20250219ADA8FD00DE0495 /* BasicTests.swift in Sources */,
457-
1F6A8CA619A5090E00369A5D /* AlamofireTests.swift in Sources */,
458452
1F0E284019C1DEA0005EF467 /* Async.swift in Sources */,
459453
1F6A8CA319A4E4F200369A5D /* SwiftTaskTests.swift in Sources */,
460454
48511C5B19C17563002FE03C /* RetainCycleTests.swift in Sources */,
@@ -468,12 +462,10 @@
468462
files = (
469463
4822F0DE19D00B2300F5F572 /* SwiftTaskTests.swift in Sources */,
470464
4822F0DD19D00B2300F5F572 /* BasicTests.swift in Sources */,
471-
4822F0E119D00B2300F5F572 /* AlamofireTests.swift in Sources */,
472465
4822F0DF19D00B2300F5F572 /* CustomOperatorTests.swift in Sources */,
473466
4822F0E319D00B3100F5F572 /* Async.swift in Sources */,
474467
4822F0DC19D00B2300F5F572 /* _TestCase.swift in Sources */,
475468
4822F0E019D00B2300F5F572 /* RetainCycleTests.swift in Sources */,
476-
4822F0E219D00B2E00F5F572 /* Alamofire.swift in Sources */,
477469
);
478470
runOnlyForDeploymentPostprocessing = 0;
479471
};

‎SwiftTask/SwiftTask.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ public enum TaskState: String, StateType, Printable
1919

2020
case Cancelled = "Cancelled" // NOTE: .Cancelled is never added to StateMachine's routes, but is returned via `task.state`
2121

22-
public static func convertFromNilLiteral() -> TaskState
22+
public init(nilLiteral: Void)
2323
{
24-
return Any
24+
self = Any
2525
}
2626

2727
public var description: String
2828
{
29-
return self.toRaw()
29+
return self.rawValue
3030
}
3131
}
3232

@@ -40,14 +40,14 @@ public enum TaskEvent: String, StateEventType, Printable
4040
case Reject = "Reject" // also used in cancellation for simplicity
4141
case Any = "Any"
4242

43-
public static func convertFromNilLiteral() -> TaskEvent
43+
public init(nilLiteral: Void)
4444
{
45-
return Any
45+
self = Any
4646
}
4747

4848
public var description: String
4949
{
50-
return self.toRaw()
50+
return self.rawValue
5151
}
5252
}
5353

‎SwiftTaskTests/CustomOperatorTests.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,10 @@ class CustomOperatorTests: _TestCase
105105

106106
if self.isAsync {
107107
// 0.0 <= progress <= 1.0
108-
XCTAssertGreaterThanOrEqual(progress, 0)
109-
XCTAssertLessThanOrEqual(progress, 1)
108+
// XCTAssertGreaterThanOrEqual(progress, 0) // Xcode6.1-GM bug
109+
// XCTAssertLessThanOrEqual(progress, 1) // Xcode6.1-GM bug
110+
XCTAssertTrue(progress >= 0)
111+
XCTAssertTrue(progress <= 1)
110112

111113
// 1 <= progressCount <= 5
112114
XCTAssertGreaterThanOrEqual(progressCount, 1)

‎SwiftTaskTests/SwiftTaskTests.swift

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,10 @@ class SwiftTaskTests: _TestCase
443443

444444
if self.isAsync {
445445
// 0.0 <= progress <= 1.0
446-
XCTAssertGreaterThanOrEqual(progress, 0)
447-
XCTAssertLessThanOrEqual(progress, 1)
446+
// XCTAssertGreaterThanOrEqual(progress, 0) // TODO: Xcode6.1-GM bug
447+
// XCTAssertLessThanOrEqual(progress, 1) // TODO: Xcode6.1-GM bug
448+
XCTAssertTrue(progress >= 0)
449+
XCTAssertTrue(progress <= 1)
448450

449451
// 1 <= progressCount <= 5
450452
XCTAssertGreaterThanOrEqual(progressCount, 1)
@@ -541,8 +543,10 @@ class SwiftTaskTests: _TestCase
541543
progressCount++
542544

543545
// 0.0 <= progress <= 0.5 (not 1.0)
544-
XCTAssertGreaterThanOrEqual(progress, 0)
545-
XCTAssertLessThanOrEqual(progress, 0.5)
546+
// XCTAssertGreaterThanOrEqual(progress, 0) // TODO: Xcode6.1-GM bug
547+
// XCTAssertLessThanOrEqual(progress, 0.5) // TODO: Xcode6.1-GM bug
548+
XCTAssertTrue(progress >= 0)
549+
XCTAssertTrue(progress <= 0.5)
546550

547551
// 1 <= progressCount <= 3 (not 5)
548552
XCTAssertGreaterThanOrEqual(progressCount, 1)
@@ -648,13 +652,15 @@ class SwiftTaskTests: _TestCase
648652
task.pause()
649653

650654
XCTAssertEqual(task.state, TaskState.Paused)
651-
XCTAssertEqual(task.progress!, 0.5)
655+
// XCTAssertEqual(task.progress!, 0.5) // TODO: Xcode6.1-GM bug
656+
XCTAssertTrue(task.progress! == 0.5)
652657

653658
// resume after 300ms (t=600ms)
654659
Async.main(after: 0.3) {
655660

656661
XCTAssertEqual(task.state, TaskState.Paused)
657-
XCTAssertEqual(task.progress!, 0.5)
662+
// XCTAssertEqual(task.progress!, 0.5) // TODO: Xcode6.1-GM bug
663+
XCTAssertTrue(task.progress! == 0.5)
658664

659665
task.resume()
660666
XCTAssertEqual(task.state, TaskState.Running)

‎Vendor/SwiftState

0 commit comments

Comments
 (0)