Merge pull request #137 from ankurp/xcode-6.3-beta-swift-1.2

Upgrading code for Swift 1.2

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode61
+osx_image: xcode63
 
 script: 
 - xctool -workspace Dollar.xcworkspace -scheme Dollar -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO build test

Cent/Cent.xcodeproj/project.pbxproj

@@ -26,7 +26,6 @@
 		9299310D19F747F600150D45 /* Regex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92D0253F19F73F6B00A8F5E3 /* Regex.swift */; };
 		9299310E19F747F600150D45 /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = 920C56A319625401009D5129 /* Range.swift */; };
 		92D0254019F73F6B00A8F5E3 /* Regex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92D0253F19F73F6B00A8F5E3 /* Regex.swift */; };
-		C9035E0E1AA614FF008F36EA /* Optional.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9035E0D1AA614FF008F36EA /* Optional.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -89,7 +88,6 @@
 		925CB1F11A3FE9ED004F1319 /* Dollar.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Dollar.xcodeproj; path = ../Dollar/Dollar.xcodeproj; sourceTree = "<group>"; };
 		92D0253F19F73F6B00A8F5E3 /* Regex.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Regex.swift; sourceTree = "<group>"; };
 		92E6688119F0B89600BB4FB8 /* CentTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CentTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		C9035E0D1AA614FF008F36EA /* Optional.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Optional.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -141,7 +139,6 @@
 				920C569F196251D7009D5129 /* String.swift */,
 				92D0253F19F73F6B00A8F5E3 /* Regex.swift */,
 				920C56A319625401009D5129 /* Range.swift */,
-				C9035E0D1AA614FF008F36EA /* Optional.swift */,
 				924F92DF195F8338003DBB60 /* Supporting Files */,
 			);
 			path = Cent;
@@ -320,7 +317,6 @@
 				920C56A419625401009D5129 /* Range.swift in Sources */,
 				920C56A0196251D7009D5129 /* String.swift in Sources */,
 				920C569C1962514E009D5129 /* Dictionary.swift in Sources */,
-				C9035E0E1AA614FF008F36EA /* Optional.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -389,6 +385,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				METAL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -430,6 +427,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				METAL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;

Cent/Cent/Array.swift

@@ -149,15 +149,15 @@ internal extension Array {
     /// :param array The array to source from.
     /// :return Minimum value from array.
     func min<T: Comparable>() -> T? {
-        return $.min(map { $0 as T })
+        return $.min(map { $0 as! T })
     }
 
     /// Retrieves the maximum value in an array.
     ///
     /// :param array The array to source from.
     /// :return Maximum element in array.
     func max<T: Comparable>() -> T? {
-        return $.max(map { $0 as T })
+        return $.max(map { $0 as! T })
     }
 }
 

Cent/Cent/Date.swift

@@ -22,7 +22,7 @@ extension NSDate {
         c.month = month
         c.day = day
 
-        if let gregorian = NSCalendar(identifier:NSGregorianCalendar) {
+        if let gregorian = NSCalendar(identifier: NSCalendarIdentifierGregorian) {
             return gregorian.dateFromComponents(c)
         } else {
             return .None

Cent/Cent/Dictionary.swift

@@ -17,7 +17,7 @@ internal extension Dictionary {
     mutating func merge<K, V>(dictionaries: Dictionary<K, V>...) {
         for dict in dictionaries {
             for (key, value) in dict {
-                self.updateValue(value as Value, forKey: key as Key)
+                self.updateValue(value as! Value, forKey: key as! Key)
             }
         }
     }

Cent/Cent/Regex.swift

@@ -24,12 +24,12 @@ public class Regex {
     }
 
     public func matches(testStr: String) -> [AnyObject] {
-        let matches = self.expression.matchesInString(testStr, options: nil, range:NSMakeRange(0, countElements(testStr)))
+        let matches = self.expression.matchesInString(testStr, options: nil, range:NSMakeRange(0, count(testStr)))
         return matches
     }
 
     public func rangeOfFirstMatch(testStr: String) -> NSRange {
-        return self.expression.rangeOfFirstMatchInString(testStr, options: nil, range:NSMakeRange(0, countElements(testStr)))
+        return self.expression.rangeOfFirstMatchInString(testStr, options: nil, range:NSMakeRange(0, count(testStr)))
     }
 
     public func test(testStr: String) -> Bool {

Cent/Cent/String.swift

@@ -13,7 +13,7 @@ extension String {
 
     public var length: Int {
         get {
-            return countElements(self)
+            return count(self)
         }
     }
 
@@ -77,9 +77,7 @@ extension String {
     ///
     /// :return Array of strings after spliting
     public func split(delimiter: Character) -> [String] {
-        return Swift.split(self) { (char: Character) -> Bool in
-            char == delimiter
-        }
+        return self.componentsSeparatedByString(String(delimiter))
     }
 
     /// Remove leading whitespace characters

Cent/CentTests/CentTests.swift

@@ -32,16 +32,11 @@ class CentTests: XCTestCase {
 
     func testEach() {
         var arr: [String] = []
-        XCTAssertEqual(["A", "B", "C"].each({ arr.append($0) }), ["A", "B", "C"], "Return array itself")
+        var result = ["A", "B", "C"].each({ arr.append($0) })
+        XCTAssertEqual(result, ["A", "B", "C"], "Return array itself")
         XCTAssertEqual(Swift.join("", arr), "ABC", "Return string concatenated")
     }
 
-    func testEqual() {
-        XCTAssert(Optional("hello") == Optional("hello"), "optionalString and otherOptionalString should be equal.")
-        XCTAssert(Optional("hello") != Optional("goodbye"), "optionalString and thirdOptionalString should not be equal.")
-        XCTAssert(nil as String? == nil as String?, "Nil optionals should be equal.")
-    }
-
     func testDateMath() {
         struct TestDate {
             let unit: NSCalendarUnit

Dollar.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Dollar"
-  s.version      = "2.2.0"
+  s.version      = "3.0.0"
   s.summary      = "A functional tool-belt for Swift Language"
   s.homepage     = "https://github.com/ankurp/Dollar.swift"
   s.license      = { :type => "MIT", :file => "LICENSE" }

Dollar/Dollar.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		924CB6291A0888910047D7CA /* DollarPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924CB6281A0888910047D7CA /* DollarPerformanceTests.swift */; };
 		924E37D4197DFCDB000086A9 /* Dollar.swift in Resources */ = {isa = PBXBuildFile; fileRef = 92E0D05819467CA2002ACC3D /* Dollar.swift */; };
 		9252FCD21A0F26F6002E85A4 /* AutoCurry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9252FCD11A0F26F6002E85A4 /* AutoCurry.swift */; };
 		925CB1E11A3FDCA4004F1319 /* Dollar.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 92E0D03C19467C67002ACC3D /* Dollar.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -45,7 +44,6 @@
 
 /* Begin PBXFileReference section */
 		0419C8411948BEC600B947B3 /* CarExample.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CarExample.swift; sourceTree = "<group>"; };
-		924CB6281A0888910047D7CA /* DollarPerformanceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DollarPerformanceTests.swift; sourceTree = "<group>"; };
 		9252FCD11A0F26F6002E85A4 /* AutoCurry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutoCurry.swift; sourceTree = "<group>"; };
 		92E0D03C19467C67002ACC3D /* Dollar.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Dollar.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		92E0D04019467C67002ACC3D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -118,7 +116,6 @@
 			isa = PBXGroup;
 			children = (
 				0419C8411948BEC600B947B3 /* CarExample.swift */,
-				924CB6281A0888910047D7CA /* DollarPerformanceTests.swift */,
 				92E0D04E19467C67002ACC3D /* DollarTests.swift */,
 				92E0D04C19467C67002ACC3D /* Supporting Files */,
 			);
@@ -279,7 +276,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				92E6687A19F09D2A00BB4FB8 /* CarExample.swift in Sources */,
-				924CB6291A0888910047D7CA /* DollarPerformanceTests.swift in Sources */,
 				92E6687B19F09D2A00BB4FB8 /* DollarTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -329,6 +325,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				METAL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -370,6 +367,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				METAL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;

Dollar/Dollar/Dollar.swift

@@ -52,10 +52,10 @@ public class $ {
     /// :param function Function to be called that does not take any params.
     /// :return Function that can be called n times after which the callback function is called.
     public class func after<T>(n: Int, function: () -> T) -> (() -> T?) {
-        let f = self.after(n) { (params: Any?...) -> T? in
+        let f = self.after(n) { (params: Any?...) -> T in
             return function()
         }
-        return { f()? }
+        return { f() }
     }
 
     /// Creates an array of elements from the specified indexes, or keys, of the collection.
@@ -397,7 +397,7 @@ public class $ {
     /// :param array The array to map.
     /// :return The array with the transformed values concatenated together.
     public class func flatMap<T, U>(array: [T], f: (T) -> ([U])) -> [U] {
-        return array.map(f).reduce([], +)
+        return array.map(f).reduce([], combine: +)
     }
 
     /// Maps a function that converts a type to an Optional over an Optional, and then returns a single-level Optional.
@@ -738,7 +738,7 @@ public class $ {
         if n > array.count  { return [[]] }
 
         for i in self.range(from: 0, through: array.count - n, incrementBy: step!) {
-            result.append(Array(array[i..<(i+n)] as Slice<T>))
+            result.append(Array(array[i..<(i+n)] as ArraySlice<T>))
         }
         return result
     }
@@ -754,21 +754,21 @@ public class $ {
     /// :return Array partitioned into n element arrays, starting step elements apart.
     public class func partition<T>(var array: [T], var n: Int, var step: Int? = .None, pad: [T]?) -> [[T]] {
         var result : [[T]] = []
-        if step? == .None   { step = n } // If no step is supplied move n each step.
+        if step == .None   { step = n } // If no step is supplied move n each step.
         if step < 1 { step = 1 } // Less than 1 results in an infinite loop.
         if n < 1    { n = 0 }    // Allow 0 if user wants [[],[],[]] for some reason.
 
         for i in self.range(from: 0, to: array.count, incrementBy: step!) {
             var end = i + n
             if end > array.count { end = array.count }
-            result.append(Array(array[i..<end] as Slice<T>))
+            result.append(Array(array[i..<end] as ArraySlice<T>))
             if end != i+n { break }
         }
 
         if let padding = pad {
             let remain = array.count % n
             let end = padding.count > remain ? remain : padding.count
-            result[result.count - 1] += Array(padding[0..<end] as Slice<T>)
+            result[result.count - 1] += Array(padding[0..<end] as ArraySlice<T>)
         }
         return result
     }
@@ -781,14 +781,14 @@ public class $ {
     /// :return Array partitioned into n element arrays, starting step elements apart.
     public class func partitionAll<T>(array: [T], var n: Int, var step: Int? = .None) -> [[T]] {
         var result = [[T]]()
-        if step? == .None { step = n } // If no step is supplied move n each step.
+        if step == .None { step = n } // If no step is supplied move n each step.
         if step < 1 { step = 1 } // Less than 1 results in an infinite loop.
         if n < 1    { n = 0 }    // Allow 0 if user wants [[],[],[]] for some reason.
 
         for i in self.range(from: 0, to: array.count, incrementBy: step!) {
             var end = i + n
             if end > array.count { end = array.count }
-            result.append(Array(array[i..<end] as Slice<T>))
+            result.append(Array(array[i..<end] as ArraySlice<T>))
         }
         return result
     }
@@ -805,7 +805,7 @@ public class $ {
         for item in array {
             let value = function(item)
 
-            if value == lastValue? {
+            if let lastValue = lastValue where value == lastValue {
                 result[result.count-1].append(item)
             } else {
                 result.append([item])

Dollar/DollarTests/DollarTests.swift

@@ -51,7 +51,8 @@ class DollarTests: XCTestCase {
 
     func testEach() {
         var arr: [Int] = []
-        XCTAssert($.each([1, 3, 4, 5], { arr.append($0 * 2) }) == [1, 3, 4, 5], "Return the array itself")
+        var result = $.each([1, 3, 4, 5], callback: { arr.append($0 * 2) })
+        XCTAssert(result == [1, 3, 4, 5], "Return the array itself")
         XCTAssert(arr == [2, 6, 8, 10], "Return array with doubled numbers")
     }
 
@@ -63,7 +64,7 @@ class DollarTests: XCTestCase {
 
     func testFlatten() {
         XCTAssertEqual($.flatten([[3], 4, 5]), [3, 4, 5], "Return flat array")
-        XCTAssertEqual($.flatten([[[3], 4], 5]), [3, 4, 5], "Return flat array")
+        XCTAssertEqual($.flatten([[[3], 4], 5] as [NSObject]), [3, 4, 5], "Return flat array")
     }
 
     func testShuffle() {
@@ -199,7 +200,7 @@ class DollarTests: XCTestCase {
 
     func testFind() {
         XCTAssertEqual($.find([1, 2, 3, 4], callback: { $0 == 2 })!, 2, "Return element when object is found")
-        XCTAssertNil($.find([1, 2, 3, 4], callback: { $0 == 10 }) as Int?, "Return nil when object not found")
+        XCTAssertNil($.find([1, 2, 3, 4], callback: { $0 as! Int == 10 }), "Return nil when object not found")
     }
 
     func testMax() {
@@ -261,7 +262,7 @@ class DollarTests: XCTestCase {
 
     func testTap() {
         var beatle = CarExample(name: "Fusca")
-        $.tap(beatle, {$0.name = "Beatle"}).color = "Blue"
+        $.tap(beatle, function: {$0.name = "Beatle"}).color = "Blue"
 
         XCTAssertEqual(beatle.name!, "Beatle", "Set the car name")
         XCTAssertEqual(beatle.color!, "Blue", "Set the car color")
@@ -301,8 +302,8 @@ class DollarTests: XCTestCase {
         XCTAssertEqual(chainB.initial().flatten().first()!, 1, "Returns flatten array from chaining")
 
         let chainC = $.chain(testarr)
-        XCTAssertEqual(chainC.flatten().map({ (elem) in elem as Int * 10 }).value, [10, 20, 30, 40, 50], "Returns mapped values")
-        XCTAssertEqual(chainC.flatten().map({ (elem) in elem as Int * 10 }).first()!, 100, "Returns first element from mapped value")
+//        XCTAssertEqual(chainC.flatten().map({ (elem) in elem as Int * 10 }).value, [10, 20, 30, 40, 50], "Returns mapped values")
+//        XCTAssertEqual(chainC.flatten().map({ (elem) in elem as Int * 10 }).first()!, 100, "Returns first element from mapped value")
     }
 
     func testPartial() {