Merge pull request #21 from Fueled/modernisation

chore(project): Update Swift version and dependencies.

Cartfile

@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" ~> 7.0
+github "ReactiveCocoa/ReactiveCocoa" ~> 8.0

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "ReactiveCocoa/ReactiveCocoa" "7.0.1"
-github "ReactiveCocoa/ReactiveSwift" "3.0.0"
-github "antitypical/Result" "3.2.4"
+github "ReactiveCocoa/ReactiveCocoa" "8.0.0"
+github "ReactiveCocoa/ReactiveSwift" "4.0.0"
+github "antitypical/Result" "4.0.0"

FueledUtils.xcodeproj/project.pbxproj

@@ -167,12 +167,12 @@
 		02DE3C151D258C79002B58E2 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = Fueled;
 				TargetAttributes = {
 					02DE3C1D1D258C79002B58E2 = {
 						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1000;
 					};
 				};
 			};
@@ -246,12 +246,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -302,12 +304,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -360,7 +364,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -384,7 +388,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.fueled.FueledUtils;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

FueledUtils.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

FueledUtils/ButtonWithTitleAdjustment.swift

@@ -23,33 +23,33 @@ open class ButtonWithTitleAdjustment: UIButton {
 		self.updateAdjustedTitles()
 	}
 
-	override open func setTitleColor(_ color: UIColor?, for state: UIControlState) {
+	override open func setTitleColor(_ color: UIColor?, for state: UIControl.State) {
 		super.setTitleColor(color, for: state)
 		self.updateAdjustedTitles()
 	}
 
-	override open func setTitle(_ title: String?, for state: UIControlState) {
+	override open func setTitle(_ title: String?, for state: UIControl.State) {
 		super.setTitle(title, for: state)
 		self.updateAdjustedTitles()
 	}
 
 	private func updateAdjustedTitles() {
-		let states: [UIControlState] = [.normal, .highlighted, .selected, .disabled, [.selected, .highlighted], [.selected, .disabled]]
+		let states: [UIControl.State] = [.normal, .highlighted, .selected, .disabled, [.selected, .highlighted], [.selected, .disabled]]
 		for state in states {
 			self.setAdjustedTitle(self.title(for: state), for: state)
 		}
 	}
 
-	private func setAdjustedTitle(_ title: String?, for state: UIControlState) {
+	private func setAdjustedTitle(_ title: String?, for state: UIControl.State) {
 		let adjustedString = title.map { title -> NSAttributedString in
 			let paragraphStyle = NSMutableParagraphStyle()
 			paragraphStyle.lineSpacing = self.adjustmentLineSpacing
-			var attributes: [NSAttributedStringKey: Any] = [
-				NSAttributedStringKey.paragraphStyle: paragraphStyle,
-				NSAttributedStringKey.kern: self.adjustmentKerning,
+			var attributes: [NSAttributedString.Key: Any] = [
+				NSAttributedString.Key.paragraphStyle: paragraphStyle,
+				NSAttributedString.Key.kern: self.adjustmentKerning,
 			]
 			if let titleColor = self.titleColor(for: state) {
-				attributes[NSAttributedStringKey.foregroundColor] = titleColor
+				attributes[NSAttributedString.Key.foregroundColor] = titleColor
 			}
 			return NSAttributedString(string: title, attributes: attributes)
 		}

FueledUtils/KeyboardInsetHelper.swift

@@ -21,32 +21,32 @@ open class KeyboardInsetHelper: NSObject {
 		nc.addObserver(
 			self,
 			selector: #selector(handleKeyboardNotification(_:)),
-			name: NSNotification.Name.UIKeyboardWillShow,
+			name: UIResponder.keyboardWillShowNotification,
 			object: nil
 		)
 		nc.addObserver(
 			self,
 			selector: #selector(handleKeyboardNotification(_:)),
-			name: NSNotification.Name.UIKeyboardWillHide,
+			name: UIResponder.keyboardWillHideNotification,
 			object: nil
 		)
 	}
 
 	deinit {
 		let nc = NotificationCenter.default
-		nc.removeObserver(self, name: NSNotification.Name.UIKeyboardWillShow, object: nil)
-		nc.removeObserver(self, name: NSNotification.Name.UIKeyboardWillHide, object: nil)
+		nc.removeObserver(self, name: UIResponder.keyboardWillShowNotification, object: nil)
+		nc.removeObserver(self, name: UIResponder.keyboardWillHideNotification, object: nil)
 	}
 
 	@objc fileprivate func handleKeyboardNotification(_ notification: Notification) {
 		guard let referenceView = referenceView,
 			let userInfo = (notification as NSNotification).userInfo,
-			let curve = userInfo[UIKeyboardAnimationCurveUserInfoKey] as? UInt,
-			let duration = userInfo[UIKeyboardAnimationDurationUserInfoKey] as? Double,
-			let keyboardFrameValue = userInfo[UIKeyboardFrameEndUserInfoKey] as? NSValue
+			let curve = userInfo[UIResponder.keyboardAnimationCurveUserInfoKey] as? UInt,
+			let duration = userInfo[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double,
+			let keyboardFrameValue = userInfo[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue
 			else { return }
 		let keyboardFrame = referenceView.convert(keyboardFrameValue.cgRectValue, from: referenceView.window)
-		let curveOption = UIViewAnimationOptions(rawValue: curve << 16)
+		let curveOption = UIView.AnimationOptions(rawValue: curve << 16)
 		let animationOptions = curveOption.union(.beginFromCurrentState)
 		let inset = max(baseInset, referenceView.bounds.maxY - keyboardFrame.minY)
 		UIView.performWithoutAnimation {

FueledUtils/LabelWithTitleAdjustment.swift

@@ -57,8 +57,8 @@ open class LabelWithTitleAdjustment: UILabel {
 		let attributedString = NSMutableAttributedString(attributedString: text)
 		attributedString.addAttributes(
 			[
-				NSAttributedStringKey.paragraphStyle: paragraphStyle,
-				NSAttributedStringKey.kern: self.adjustmentKerning,
+				NSAttributedString.Key.paragraphStyle: paragraphStyle,
+				NSAttributedString.Key.kern: self.adjustmentKerning,
 			],
 			range: NSRange(location: 0, length: attributedString.string.utf16.count))
 		super.attributedText = attributedString

FueledUtils/RACExtensions.swift

@@ -7,7 +7,7 @@ import Result
 public func animatingContext(
 	_ duration: TimeInterval,
 	delay: TimeInterval = 0,
-	options: UIViewAnimationOptions = [],
+	options: UIView.AnimationOptions = [],
 	layoutView: UIView? = nil,
 	completion: ((Bool) -> Void)? = nil)
 	-> ((@escaping () -> Void) -> Void)
@@ -30,7 +30,7 @@ public func transitionContext(
 	with view: UIView,
 	duration: TimeInterval,
 	delay: TimeInterval = 0,
-	options: UIViewAnimationOptions = [],
+	options: UIView.AnimationOptions = [],
 	completion: ((Bool) -> Void)? = nil)
 	-> ((@escaping () -> Void) -> Void)
 {

FueledUtils/ReactiveLifetimeProvider.swift

@@ -12,7 +12,7 @@ open class Lifetimed: ReactiveLifetimeProvider {
 	}
 }
 
-public extension Reactive where Base: ReactiveLifetimeProvider {
+public extension Reactive where Base: AnyObject, Base: ReactiveLifetimeProvider {
 	public var lifetime: Lifetime {
 		return Lifetime(self.base.lifetimeToken)
 	}

FueledUtils/SignalingAlert.swift

@@ -11,21 +11,21 @@ public final class SignalingAlert<T> {
 	public let signal: Signal<T, NoError>
 	fileprivate let observer: Signal<T, NoError>.Observer
 
-	public init(title: String?, message: String?, preferredStyle: UIAlertControllerStyle) {
+	public init(title: String?, message: String?, preferredStyle: UIAlertController.Style) {
 		(signal, observer) = Signal<T, NoError>.pipe()
 		controller = UIAlertController(title: title, message: message, preferredStyle: preferredStyle)
 		controller.reactive.lifetime.ended.observeCompleted { [observer] in
 			observer.sendInterrupted()
 		}
 	}
 
-	public func addAction(title: String, style: UIAlertActionStyle, event: Signal<T, NoError>.Event) {
+	public func addAction(title: String, style: UIAlertAction.Style, event: Signal<T, NoError>.Event) {
 		controller.addAction(UIAlertAction(title: title, style: style) { [observer] _ in
 			observer.send(event)
 		})
 	}
 
-	public func addAction(title: String, style: UIAlertActionStyle, value: T) {
+	public func addAction(title: String, style: UIAlertAction.Style, value: T) {
 		controller.addAction(UIAlertAction(title: title, style: style) { [observer] _ in
 			observer.send(value: value)
 			observer.sendCompleted()
@@ -35,7 +35,7 @@ public final class SignalingAlert<T> {
 	public static func producer(
 		title: String? = nil,
 		message: String? = nil,
-		preferredStyle: UIAlertControllerStyle,
+		preferredStyle: UIAlertController.Style,
 		presentingController: UIViewController,
 		sourceView: UIView,
 		configure: @escaping (SignalingAlert) -> () = { _ in })

FueledUtils/UIExtensions.swift

@@ -82,7 +82,7 @@ public extension UITextField {
 		set {
 			if let color = newValue, let placeholder = self.placeholder {
 				attributedPlaceholder = NSAttributedString(string: placeholder, attributes: [
-					NSAttributedStringKey.foregroundColor: color
+					NSAttributedString.Key.foregroundColor: color
 				])
 			}
 		}