change to swift3

uber · Jun 7, 2017 · 8b06b41 · 8b06b41
1 parent 41efd09
commit 8b06b41
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode8
 env:
   global:
   - LC_CTYPE=en_US.UTF-8

diff --git a/UberSignals.xcodeproj/project.pbxproj b/UberSignals.xcodeproj/project.pbxproj
@@ -911,6 +911,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_OBJC_BRIDGING_HEADER = "UberSignalsTests/UberSignalsTests-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -924,6 +925,7 @@
 				PRODUCT_NAME = UberSignalsTests;
 				SDKROOT = iphoneos;
 				SWIFT_OBJC_BRIDGING_HEADER = "UberSignalsTests/UberSignalsTests-Bridging-Header.h";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

diff --git a/UberSignalsTests/SwiftTests.swift b/UberSignalsTests/SwiftTests.swift
@@ -50,7 +50,7 @@ class SwiftTests: XCTestCase {
 
         let signal2 = UBArraySignal()
         signal2.addObserver(self) { (listener, result) in
-            XCTAssertEqual(result, NSArray(objects: "result"), "Should have signaled correct result")
+            XCTAssertEqual(result as NSArray, NSArray(objects: "result"), "Should have signaled correct result")
             observed += 1
         }
         signal2.fire()(["result"])
@@ -109,7 +109,7 @@ class SwiftTests: XCTestCase {
         }
 
         observer.onSwiftSignal.fire()("1")
-        observer.onSwiftDoubleSignal.fire()("1", NSNumber(integer: 2))
+        observer.onSwiftDoubleSignal.fire()("1", 2)
         XCTAssertEqual(observed, 2, "Should have fired callback")
     }
 }