Merge pull request #46 from adly-holler/swift-1.2

Swift 1.2 compatibility

Few-Mac/Button.swift

@@ -42,7 +42,7 @@ public class Button: Element {
 				button.enabled = enabled
 			}
 
-			let oldButton = old as Button
+			let oldButton = old as! Button
 			if isDefault != oldButton.isDefault {
 				if isDefault {
 					button.keyEquivalent = "\r"

Few-Mac/Input.swift

@@ -13,7 +13,7 @@ internal class InputDelegate: NSObject, NSTextFieldDelegate {
 	var action: (NSTextField -> ())?
 
 	override func controlTextDidChange(notification: NSNotification) {
-		let field = notification.object as NSTextField
+		let field = notification.object as! NSTextField
 		action?(field)
 	}
 }

Few-Mac/QuickLook.swift

@@ -15,6 +15,6 @@ extension Element {
 	}
 
 	public var ql: ViewType {
-		return debugQuickLookObject()! as ViewType
+		return debugQuickLookObject()! as! ViewType
 	}
 }

Few-Mac/ScrollView.swift

@@ -65,15 +65,15 @@ private class ScrollViewElement: Element {
 	}
 
 	private override func addRealizedChildView(childView: ViewType, selfView: ViewType) {
-		let scrollVew = selfView as FewScrollView
+		let scrollVew = selfView as! FewScrollView
 		scrollVew.scrollView.documentView = childView
 	}
 
 	private override func realize() -> RealizedElement {
 		let realizedElement = super.realize()
 
-		let scrollView = realizedElement.view as FewScrollView
-		let documentView = scrollView.scrollView.documentView as NSView
+		let scrollView = realizedElement.view as! FewScrollView
+		let documentView = scrollView.scrollView.documentView as! NSView
 
 		let top = CGPointMake(0, documentView.bounds.size.height);
 		documentView.scrollPoint(top)
@@ -84,7 +84,7 @@ private class ScrollViewElement: Element {
 	private override func applyDiff(old: Element, realizedSelf: RealizedElement?) {
 		super.applyDiff(old, realizedSelf: realizedSelf)
 
-		let scrollView = realizedSelf?.view as FewScrollView
+		let scrollView = realizedSelf?.view as! FewScrollView
 		scrollView.didScroll = didScroll
 	}
 }
@@ -120,7 +120,7 @@ public class ScrollView_<LOL>: Component<CGRect> {
 	}
 
 	private class func render(c: Component<CGRect>, visibleRect: CGRect) -> Element {
-		let component = c as ScrollView_
+		let component = c as! ScrollView_
 
 		let visibleElements = component.calculateVisibleElements(visibleRect)
 

Few-Mac/TableView.swift

@@ -85,7 +85,7 @@ private class TableViewHandler: NSObject, NSTableViewDelegate, NSTableViewDataSo
 		let element = elements[row]
 
 		let key = "ListCell"
-		var listCell = tableView.makeViewWithIdentifier(key, owner: nil) as FewListCell?
+		var listCell = tableView.makeViewWithIdentifier(key, owner: nil) as! FewListCell?
 		if listCell == nil {
 			let newListCell = FewListCell(frame: CGRectZero)
 			newListCell.identifier = key

Few-iOS/ScrollView.swift

@@ -43,15 +43,15 @@ private class ScrollViewElement: Element {
     }
 
     private override func addRealizedChildView(childView: ViewType, selfView: ViewType) {
-        let scrollView = selfView as FewScrollView
+        let scrollView = selfView as! FewScrollView
         scrollView.subviews.first?.removeFromSuperview()
         scrollView.addSubview(childView)
     }
 
     private override func realize() -> RealizedElement {
         let realizedElement = super.realize()
 
-        let scrollView = realizedElement.view as FewScrollView
+        let scrollView = realizedElement.view as! FewScrollView
         if let element = children.first {
             scrollView.contentSize = element.frame.size
         }
@@ -62,7 +62,7 @@ private class ScrollViewElement: Element {
     private override func applyDiff(old: Element, realizedSelf: RealizedElement?) {
         super.applyDiff(old, realizedSelf: realizedSelf)
 
-        let scrollView = realizedSelf?.view as FewScrollView
+        let scrollView = realizedSelf?.view as! FewScrollView
         scrollView.didScroll = didScroll
     }
 }
@@ -99,7 +99,7 @@ public class ScrollView_<LOL>: Component<CGRect> {
     }
 
     private class func render(c: Component<CGRect>, visibleRect: CGRect) -> Element {
-        let component = c as ScrollView_
+        let component = c as! ScrollView_
 
         let visibleElements = component.calculateVisibleElements(visibleRect)
 

Few-iOS/TableView.swift

@@ -59,7 +59,7 @@ private class TableViewHandler: NSObject, UITableViewDelegate, UITableViewDataSo
 
     // MARK: NSTableViewDelegate
 
-    private func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    @objc func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
         let element = elements[indexPath.row]
 
         let key = "ListCell"
@@ -71,20 +71,20 @@ private class TableViewHandler: NSObject, UITableViewDelegate, UITableViewDataSo
         return listCell ?? UITableViewCell()
     }
 
-    private func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
+    @objc func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
         let height = elements[indexPath.row].frame.height
         return height > CGFloat(0) ? height : defaultRowHeight
     }
 
-    private func numberOfSectionsInTableView(tableView: UITableView) -> Int {
+    @objc func numberOfSectionsInTableView(tableView: UITableView) -> Int {
         return 1
     }
 
-    private func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    @objc func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return elements.count
     }
-    
-    private func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+	
+	@objc func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
         selectionChanged?(indexPath.row)
     }
 }

Few.xcodeproj/project.pbxproj

@@ -890,7 +890,6 @@
 				);
 				INFOPLIST_FILE = "Few-iOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = Few;
 				SDKROOT = iphoneos;
@@ -911,7 +910,6 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "Few-iOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = Few;
 				SDKROOT = iphoneos;
@@ -955,6 +953,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -993,6 +992,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1111,7 +1111,6 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = "FewDemo-iOS/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1128,7 +1127,6 @@
 				COPY_PHASE_STRIP = NO;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				INFOPLIST_FILE = "FewDemo-iOS/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;

FewCore/Util.swift

@@ -16,7 +16,7 @@ public func id<T>(val: T) -> T {
 	return val
 }
 
-public func void<T>(fn: @autoclosure () -> T) {
+public func void<T>(@autoclosure fn: () -> T) {
 	fn()
 }
 
@@ -82,7 +82,7 @@ public func flip<A, B, C>(fn: (A, B) -> C) -> (B, A) -> C {
 	}
 }
 
-public func maybe<A, B>(value: A?, none: @autoclosure () -> B, some: A -> B) -> B {
+public func maybe<A, B>(value: A?, @autoclosure none: () -> B, some: A -> B) -> B {
 	if let value = value {
 		return some(value)
 	} else {

FewDemo/AppDelegate.swift

@@ -56,7 +56,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 	private let appComponent = Component(initialState: .Converter, render: renderApp)
 
 	func applicationDidFinishLaunching(notification: NSNotification) {
-		let contentView = window.contentView as NSView
+		let contentView = window.contentView as! NSView
 		appComponent.addToView(contentView)
 	}
 }

FewDemo/Demo.swift

@@ -11,8 +11,12 @@ import Few
 import AppKit
 
 struct LoginState {
-	let username: String = ""
-	let password: String = ""
+	let username: String
+	let password: String
+	init(username: String = "", password: String = "") {
+		self.username = username
+		self.password = password
+	}
 }
 
 private func renderInput(component: Few.Component<LoginState>, label: String, secure: Bool, fn: (LoginState, String) -> LoginState) -> Element {
@@ -37,8 +41,12 @@ private func renderInput(component: Few.Component<LoginState>, label: String, se
 }
 
 struct ScrollViewState {
-	let selectedRow: Int? = nil
-	let items: [Int] = Array(1...100)
+	let selectedRow: Int?
+	let items: [Int]
+	init(items: [Int] = Array(1...100), selectedRow: Int? = nil) {
+		self.items = items
+		self.selectedRow = selectedRow
+	}
 }
 
 private func keyDown(event: NSEvent, component: Few.Component<ScrollViewState>) -> Bool {
@@ -91,7 +99,7 @@ private func renderLogin() -> Element {
 		return Element()
 			.direction(.Column)
 			.children([
-				renderThingy(state.username.utf16Count),
+				renderThingy(count(state.username.utf16)),
 				renderInput(component, "Username", false) {
 					LoginState(username: $1, password: $0.password)
 				},

FewDemo/TemperatureConverter.swift

@@ -12,8 +12,12 @@ import Few
 struct ConverterState {
 	static let defaultFahrenheit: CGFloat = 32
 
-	let fahrenheit = defaultFahrenheit
-	let celcius = f2c(defaultFahrenheit)
+	let fahrenheit: CGFloat
+	let celcius: CGFloat
+	init(fahrenheit: CGFloat = defaultFahrenheit, celcius: CGFloat = f2c(defaultFahrenheit)) {
+		self.fahrenheit = fahrenheit
+		self.celcius = celcius
+	}
 }
 
 private func c2f(c: CGFloat) -> CGFloat {

FewDemo/main.swift

@@ -8,4 +8,4 @@
 
 import Cocoa
 
-NSApplicationMain(C_ARGC, C_ARGV)
+NSApplicationMain(Process.argc, Process.unsafeArgv)

FewTests/DiffTests.swift

@@ -17,7 +17,7 @@ class DiffTests: QuickSpec {
 			let view = button.realize()
 			let realizedButton = RealizedElement(element: button, children: [], view: view)
 
-			let label = Label(text: "Hey")
+			let label = Label("Hey")
 
 			it("should detect simple diffing") {
 				let diff = diffElementLists([realizedButton], [button])
@@ -51,8 +51,8 @@ class DiffTests: QuickSpec {
 				let labelView = label.realize()
 				let realizedLabel = RealizedElement(element: label, children: [], view: labelView)
 
-				let newLabel = Label(text: "No.").key("key")
-
+				let newLabel = Label("No.")
+				newLabel.key = "key"
 				let diff = diffElementLists([realizedButton, realizedLabel], [button, newLabel, label])
 				expect(diff.add.count).to(equal(1))
 				expect(diff.remove.count).to(equal(0))