From 19d4fcf606cec67cfc7659aede00c03b98b2056a Mon Sep 17 00:00:00 2001
From: Raphael Oliveira <raphael.oliveira@schibsted.com.br>
Date: Mon, 25 May 2015 15:59:44 -0300
Subject: [PATCH] Update project to iOS 8.3

---
 VIPER-SWIFT/Base.lproj/Main.storyboard        | 16 ++++----
 VIPER-SWIFT/Classes/AppDelegate.swift         |  4 +-
 .../NSCalendar+CalendarAdditions.swift        | 38 +++++++++----------
 .../Classes/Common/Store/CoreDataStore.swift  | 12 +++---
 .../Classes/Common/View/RootWireframe.swift   |  2 +-
 .../Interactor/AddInteractor.swift            |  2 +-
 .../Manager/AddDataManager.swift              |  6 +--
 .../Transition/AddDismissalTransition.swift   |  6 +--
 .../AddPresentationTransition.swift           |  8 ++--
 .../View/AddViewController.swift              |  6 +--
 .../Wireframe/AddWireframe.swift              |  6 +--
 .../Interactor/ListInteractor.swift           |  4 +-
 .../Interactor/ListInteractorIO.swift         |  2 +-
 .../Interactor/UpcomingItem.swift             | 12 ++++--
 .../Manager/ListDataManager.swift             | 10 ++---
 .../Presenter/ListPresenter.swift             |  6 +--
 .../Presenter/UpcomingDisplayData.swift       |  9 +++--
 .../UpcomingDisplayDataCollection.swift       | 20 +++++-----
 .../Presenter/UpcomingDisplayItem.swift       |  9 ++++-
 .../Presenter/UpcomingDisplaySection.swift    | 20 +++++++---
 .../View/ListViewController.swift             | 18 ++++-----
 .../Wireframe/ListWireframe.swift             |  2 +-
 22 files changed, 121 insertions(+), 97 deletions(-)

diff --git a/VIPER-SWIFT/Base.lproj/Main.storyboard b/VIPER-SWIFT/Base.lproj/Main.storyboard
index 20f9ede..4ef0ec6 100755
--- a/VIPER-SWIFT/Base.lproj/Main.storyboard
+++ b/VIPER-SWIFT/Base.lproj/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6154.17" systemVersion="14A238x" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="F64-Qc-pGf">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E17e" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="F64-Qc-pGf">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6153.11"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <scenes>
         <!--Navigation Controller-->
@@ -36,13 +36,15 @@
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
                         <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="empty" translatesAutoresizingMaskIntoConstraints="NO" id="IUm-Nr-pH8">
-                            <rect key="frame" x="80" y="204" width="160" height="160"/>
+                            <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         </imageView>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <constraints>
-                        <constraint firstItem="IUm-Nr-pH8" firstAttribute="centerX" secondItem="LnP-t5-94n" secondAttribute="centerX" id="gRj-qi-rft"/>
-                        <constraint firstItem="IUm-Nr-pH8" firstAttribute="centerY" secondItem="LnP-t5-94n" secondAttribute="centerY" id="kx6-eL-hJB"/>
+                        <constraint firstItem="IUm-Nr-pH8" firstAttribute="top" secondItem="LnP-t5-94n" secondAttribute="top" id="PzM-nb-Pkl"/>
+                        <constraint firstItem="IUm-Nr-pH8" firstAttribute="leading" secondItem="LnP-t5-94n" secondAttribute="leading" id="YwI-Zb-0Ov"/>
+                        <constraint firstAttribute="trailing" secondItem="IUm-Nr-pH8" secondAttribute="trailing" id="jMv-1S-TcB"/>
+                        <constraint firstAttribute="bottom" secondItem="IUm-Nr-pH8" secondAttribute="bottom" id="rQW-eL-fsK"/>
                     </constraints>
                 </view>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Dwl-V3-Jpn">
@@ -50,7 +52,7 @@
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                     <prototypes>
-                        <tableViewCell contentMode="scaleToFill" ambiguous="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ListEntryCell" textLabel="NBj-2E-azl" detailTextLabel="1oT-NU-IFa" style="IBUITableViewCellStyleValue1" id="Rhp-dv-i8T">
+                        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ListEntryCell" textLabel="NBj-2E-azl" detailTextLabel="1oT-NU-IFa" style="IBUITableViewCellStyleValue1" id="Rhp-dv-i8T">
                             <rect key="frame" x="0.0" y="55" width="320" height="44"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Rhp-dv-i8T" id="gVg-IG-mur">
@@ -133,7 +135,7 @@
                             <datePicker contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="date" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="gW8-Uc-U23">
                                 <rect key="frame" x="0.0" y="102" width="260" height="162"/>
                                 <date key="date" timeIntervalSinceReferenceDate="422464776.95016199">
-                                    <!--<__NSDate Class=2014-05-22 15:19:36 +0000 timeInterval=422464776.950162 ISO8601=2014-05-22T08:19:36.950-0700>-->
+                                    <!--2014-05-22 15:19:36 +0000-->
                                 </date>
                             </datePicker>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Due Date" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hIS-VJ-zb9">
diff --git a/VIPER-SWIFT/Classes/AppDelegate.swift b/VIPER-SWIFT/Classes/AppDelegate.swift
index 3ba121a..017d576 100755
--- a/VIPER-SWIFT/Classes/AppDelegate.swift
+++ b/VIPER-SWIFT/Classes/AppDelegate.swift
@@ -14,10 +14,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     
     let appDependencies = AppDependencies()
 
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: NSDictionary?) -> Bool {
+    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject : AnyObject]?) -> Bool {
         appDependencies.installRootViewControllerIntoWindow(window!)
         
         return true
-    }
+    }    
 }
 
diff --git a/VIPER-SWIFT/Classes/Common/Categories/NSCalendar+CalendarAdditions.swift b/VIPER-SWIFT/Classes/Common/Categories/NSCalendar+CalendarAdditions.swift
index 316fd4c..5634687 100755
--- a/VIPER-SWIFT/Classes/Common/Categories/NSCalendar+CalendarAdditions.swift
+++ b/VIPER-SWIFT/Classes/Common/Categories/NSCalendar+CalendarAdditions.swift
@@ -10,7 +10,7 @@ import Foundation
 
 extension NSCalendar {
     class func gregorianCalendar() -> NSCalendar {
-        return NSCalendar(calendarIdentifier: NSGregorianCalendar)
+        return NSCalendar(calendarIdentifier: NSCalendarIdentifierGregorian)!
     }
     
     func dateWithYear(year: Int, month: Int, day: Int) -> NSDate {
@@ -19,26 +19,26 @@ extension NSCalendar {
         components.month = month
         components.day = day
         components.hour = 12
-        return dateFromComponents(components)
+        return dateFromComponents(components)!
     }
     
     func dateForTomorrowRelativeToToday(today: NSDate) -> NSDate {
         let tomorrowComponents = NSDateComponents()
         tomorrowComponents.day = 1
-        return dateByAddingComponents(tomorrowComponents, toDate: today, options: nil)
+        return dateByAddingComponents(tomorrowComponents, toDate: today, options: nil)!
     }
     
     func dateForEndOfWeekWithDate(date: NSDate) -> NSDate {
         let daysRemainingThisWeek = daysRemainingInWeekWithDate(date)
         let remainingDaysComponent = NSDateComponents()
         remainingDaysComponent.day = daysRemainingThisWeek
-        return dateByAddingComponents(remainingDaysComponent, toDate: date, options: nil)
+        return dateByAddingComponents(remainingDaysComponent, toDate: date, options: nil)!
     }
     
     func dateForBeginningOfDay(date: NSDate) -> NSDate {
-        let newComponent = components((NSCalendarUnit.YearCalendarUnit | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay), fromDate: date)
+        let newComponent = components(.CalendarUnitYear | .CalendarUnitMonth | .CalendarUnitDay, fromDate: date)
         let newDate = dateFromComponents(newComponent)
-        return newDate
+        return newDate!
     }
     
     func dateForEndOfDay(date: NSDate) -> NSDate {
@@ -46,13 +46,13 @@ extension NSCalendar {
         components.day = 1
         let toDate = dateForBeginningOfDay(date)
         let nextDay = dateByAddingComponents(components, toDate: toDate, options: nil)
-        let endDay = nextDay.dateByAddingTimeInterval(-1)
-        return nextDay
+        let endDay = nextDay!.dateByAddingTimeInterval(-1)
+        return nextDay!
     }
     
     func daysRemainingInWeekWithDate(date: NSDate) -> Int {
-        let weekdayComponent = components(NSCalendarUnit.WeekdayCalendarUnit, fromDate: date)
-        let daysRange = rangeOfUnit(NSCalendarUnit.WeekdayCalendarUnit, inUnit: NSCalendarUnit.WeekCalendarUnit, forDate: date)
+        let weekdayComponent = components(.CalendarUnitWeekday, fromDate: date)
+        let daysRange = rangeOfUnit(.CalendarUnitWeekday, inUnit: .CalendarUnitWeekOfMonth, forDate: date)
         let daysPerWeek = daysRange.length
         let daysRemaining = daysPerWeek - weekdayComponent.weekday
         return daysRemaining
@@ -61,9 +61,9 @@ extension NSCalendar {
     func dateForEndOfFollowingWeekWithDate(date: NSDate) -> NSDate {
         let endOfWeek = dateForEndOfWeekWithDate(date)
         let nextWeekComponent = NSDateComponents()
-        nextWeekComponent.setWeek(1)
+        nextWeekComponent.weekOfYear = 1
         let followingWeekDate = dateByAddingComponents(nextWeekComponent, toDate: endOfWeek, options: nil)
-        return followingWeekDate
+        return followingWeekDate!
     }
     
     func isDate(date: NSDate, beforeYearMonthDay: NSDate) -> Bool {
@@ -79,17 +79,17 @@ extension NSCalendar {
     }
     
     func isDate(date: NSDate, duringSameWeekAsDate: NSDate) -> Bool {
-        let dateComponents = components(NSCalendarUnit.WeekCalendarUnit, fromDate: date)
-        let duringSameWeekComponents = components(NSCalendarUnit.WeekCalendarUnit, fromDate: duringSameWeekAsDate)
-        let result = dateComponents.week() == duringSameWeekComponents.week()
+        let dateComponents = components(.CalendarUnitWeekOfMonth, fromDate: date)
+        let duringSameWeekComponents = components(.CalendarUnitWeekOfMonth, fromDate: duringSameWeekAsDate)
+        let result = dateComponents.weekOfMonth == duringSameWeekComponents.weekOfMonth
         return result
     }
     
     func isDate(date: NSDate, duringWeekAfterDate: NSDate) -> Bool {
         let nextWeek = dateForEndOfFollowingWeekWithDate(duringWeekAfterDate)
-        let dateComponents = components(NSCalendarUnit.WeekCalendarUnit, fromDate: date)
-        let nextWeekComponents = components(NSCalendarUnit.WeekCalendarUnit, fromDate: nextWeek)
-        let result = dateComponents.week() == nextWeekComponents.week()
+        let dateComponents = components(.CalendarUnitWeekOfMonth, fromDate: date)
+        let nextWeekComponents = components(.CalendarUnitWeekOfMonth, fromDate: nextWeek)
+        let result = dateComponents.weekOfMonth == nextWeekComponents.weekOfMonth
         return result
     }
     
@@ -111,7 +111,7 @@ extension NSCalendar {
     }
     
     func yearMonthDayComponentsFromDate(date: NSDate) -> NSDateComponents {
-        let newComponents = components((NSCalendarUnit.YearCalendarUnit | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay), fromDate: date)
+        let newComponents = components(.CalendarUnitYear | .CalendarUnitMonth | .CalendarUnitDay, fromDate: date)
         return newComponents
     }
     
diff --git a/VIPER-SWIFT/Classes/Common/Store/CoreDataStore.swift b/VIPER-SWIFT/Classes/Common/Store/CoreDataStore.swift
index 0921a62..04af47b 100755
--- a/VIPER-SWIFT/Classes/Common/Store/CoreDataStore.swift
+++ b/VIPER-SWIFT/Classes/Common/Store/CoreDataStore.swift
@@ -23,10 +23,10 @@ class CoreDataStore : NSObject {
     var managedObjectModel : NSManagedObjectModel?
     var managedObjectContext : NSManagedObjectContext?
     
-    init() {
+    override init() {
         managedObjectModel = NSManagedObjectModel.mergedModelFromBundles(nil)
         
-        persistentStoreCoordinator = NSPersistentStoreCoordinator(managedObjectModel: managedObjectModel)
+        persistentStoreCoordinator = NSPersistentStoreCoordinator(managedObjectModel: managedObjectModel!)
         
         let domains = NSSearchPathDomainMask.UserDomainMask
         let directory = NSSearchPathDirectory.DocumentDirectory
@@ -46,21 +46,21 @@ class CoreDataStore : NSObject {
         super.init()
     }
     
-    func fetchEntriesWithPredicate(predicate: NSPredicate, sortDescriptors: AnyObject[], completionBlock: ((ManagedTodoItem[]) -> Void)!) {
+    func fetchEntriesWithPredicate(predicate: NSPredicate, sortDescriptors: [AnyObject], completionBlock: (([ManagedTodoItem]) -> Void)!) {
         let fetchRequest = NSFetchRequest(entityName: "TodoItem")
         fetchRequest.predicate = predicate
         fetchRequest.sortDescriptors = []
         
         managedObjectContext?.performBlock {
             let queryResults = self.managedObjectContext?.executeFetchRequest(fetchRequest, error: nil)
-            let managedResults = queryResults! as ManagedTodoItem[]
+            let managedResults = queryResults! as! [ManagedTodoItem]
             completionBlock(managedResults)
         }
     }
     
     func newTodoItem() -> ManagedTodoItem {
-        let entityDescription = NSEntityDescription.entityForName("TodoItem", inManagedObjectContext: managedObjectContext)
-        let newEntry = NSManagedObject(entity: entityDescription, insertIntoManagedObjectContext: managedObjectContext) as ManagedTodoItem
+        let entityDescription = NSEntityDescription.entityForName("TodoItem", inManagedObjectContext: managedObjectContext!)
+        let newEntry = NSManagedObject(entity: entityDescription!, insertIntoManagedObjectContext: managedObjectContext) as! ManagedTodoItem
         
         return newEntry
     }
diff --git a/VIPER-SWIFT/Classes/Common/View/RootWireframe.swift b/VIPER-SWIFT/Classes/Common/View/RootWireframe.swift
index 66e38cc..e9e15b2 100755
--- a/VIPER-SWIFT/Classes/Common/View/RootWireframe.swift
+++ b/VIPER-SWIFT/Classes/Common/View/RootWireframe.swift
@@ -16,7 +16,7 @@ class RootWireframe : NSObject {
     }
     
     func navigationControllerFromWindow(window: UIWindow) -> UINavigationController {
-        let navigationController = window.rootViewController as UINavigationController
+        let navigationController = window.rootViewController as! UINavigationController
         return navigationController
     }
 }
\ No newline at end of file
diff --git a/VIPER-SWIFT/Classes/Modules/Add/Application Logic/Interactor/AddInteractor.swift b/VIPER-SWIFT/Classes/Modules/Add/Application Logic/Interactor/AddInteractor.swift
index 4830bb0..647c6e4 100755
--- a/VIPER-SWIFT/Classes/Modules/Add/Application Logic/Interactor/AddInteractor.swift	
+++ b/VIPER-SWIFT/Classes/Modules/Add/Application Logic/Interactor/AddInteractor.swift	
@@ -12,7 +12,7 @@ class AddInteractor : NSObject {
     var addDataManager : AddDataManager?
     
     func saveNewEntryWithName(name: NSString, dueDate: NSDate) {
-        let newEntry = TodoItem(dueDate: dueDate, name: name)
+        let newEntry = TodoItem(dueDate: dueDate, name: name as String)
         addDataManager?.addNewEntry(newEntry)
     }
 }
\ No newline at end of file
diff --git a/VIPER-SWIFT/Classes/Modules/Add/Application Logic/Manager/AddDataManager.swift b/VIPER-SWIFT/Classes/Modules/Add/Application Logic/Manager/AddDataManager.swift
index fadd6d8..d44f3d0 100755
--- a/VIPER-SWIFT/Classes/Modules/Add/Application Logic/Manager/AddDataManager.swift	
+++ b/VIPER-SWIFT/Classes/Modules/Add/Application Logic/Manager/AddDataManager.swift	
@@ -12,9 +12,9 @@ class AddDataManager : NSObject {
     var dataStore : CoreDataStore?
     
     func addNewEntry(entry: TodoItem) {
-        let newEntry = dataStore?.newTodoItem() as ManagedTodoItem
-        newEntry.name = entry.name
-        newEntry.date = entry.dueDate;
+        let newEntry = dataStore?.newTodoItem()
+        newEntry!.name = entry.name
+        newEntry!.date = entry.dueDate;
         
         dataStore?.save()
     }
diff --git a/VIPER-SWIFT/Classes/Modules/Add/User Interface/Transition/AddDismissalTransition.swift b/VIPER-SWIFT/Classes/Modules/Add/User Interface/Transition/AddDismissalTransition.swift
index 81ba22a..46f2fcb 100755
--- a/VIPER-SWIFT/Classes/Modules/Add/User Interface/Transition/AddDismissalTransition.swift	
+++ b/VIPER-SWIFT/Classes/Modules/Add/User Interface/Transition/AddDismissalTransition.swift	
@@ -10,12 +10,12 @@ import Foundation
 import UIKit
 
 class AddDismissalTransition : NSObject, UIViewControllerAnimatedTransitioning {
-    func transitionDuration(transitionContext: UIViewControllerContextTransitioning!) -> NSTimeInterval {
+    func transitionDuration(transitionContext: UIViewControllerContextTransitioning) -> NSTimeInterval {
         return 0.72
     }
 
-    func animateTransition(transitionContext: UIViewControllerContextTransitioning!) {
-        let fromVC = transitionContext.viewControllerForKey(UITransitionContextFromViewControllerKey) as AddViewController
+    func animateTransition(transitionContext: UIViewControllerContextTransitioning) {
+        let fromVC = transitionContext.viewControllerForKey(UITransitionContextFromViewControllerKey) as! AddViewController
         
         let finalCenter = CGPointMake(160.0, (fromVC.view.bounds.size.height / 2) - 1000.0)
         
diff --git a/VIPER-SWIFT/Classes/Modules/Add/User Interface/Transition/AddPresentationTransition.swift b/VIPER-SWIFT/Classes/Modules/Add/User Interface/Transition/AddPresentationTransition.swift
index 88a7205..2c12101 100755
--- a/VIPER-SWIFT/Classes/Modules/Add/User Interface/Transition/AddPresentationTransition.swift	
+++ b/VIPER-SWIFT/Classes/Modules/Add/User Interface/Transition/AddPresentationTransition.swift	
@@ -10,13 +10,13 @@ import Foundation
 import UIKit
 
 class AddPresentationTransition: NSObject, UIViewControllerAnimatedTransitioning {
-    func transitionDuration(transitionContext: UIViewControllerContextTransitioning!) -> NSTimeInterval {
+    func transitionDuration(transitionContext: UIViewControllerContextTransitioning) -> NSTimeInterval {
         return 0.72
     }
     
-    func animateTransition(transitionContext: UIViewControllerContextTransitioning!) {
+    func animateTransition(transitionContext: UIViewControllerContextTransitioning) {
         let fromVC = transitionContext.viewControllerForKey(UITransitionContextFromViewControllerKey)
-        let toVC = transitionContext.viewControllerForKey(UITransitionContextToViewControllerKey) as AddViewController
+        let toVC = transitionContext.viewControllerForKey(UITransitionContextToViewControllerKey) as! AddViewController
         
         toVC.transitioningBackgroundView.backgroundColor = UIColor.darkGrayColor()
         toVC.transitioningBackgroundView.alpha = 0.0
@@ -29,7 +29,7 @@ class AddPresentationTransition: NSObject, UIViewControllerAnimatedTransitioning
         let toViewFrame = CGRectMake(0, 0, 260, 300)
         toVC.view.frame = toViewFrame
         
-        let finalCenter = CGPointMake(fromVC.view.bounds.size.width / 2, 20 + toViewFrame.size.height / 2)
+        let finalCenter = CGPointMake(fromVC!.view.bounds.size.width / 2, 20 + toViewFrame.size.height / 2)
         toVC.view.center = CGPointMake(finalCenter.x, finalCenter.y - 1000)
         
         let options = UIViewAnimationOptions.CurveEaseIn
diff --git a/VIPER-SWIFT/Classes/Modules/Add/User Interface/View/AddViewController.swift b/VIPER-SWIFT/Classes/Modules/Add/User Interface/View/AddViewController.swift
index ec50fdc..a1ae0ea 100755
--- a/VIPER-SWIFT/Classes/Modules/Add/User Interface/View/AddViewController.swift	
+++ b/VIPER-SWIFT/Classes/Modules/Add/User Interface/View/AddViewController.swift	
@@ -12,7 +12,7 @@ import UIKit
 class AddViewController: UIViewController, UITextFieldDelegate, AddViewInterface {
     var eventHandler : AddModuleInterface?
 
-    @IBOutlet var nameTextField : UITextField
+    @IBOutlet var nameTextField : UITextField!
     @IBOutlet var datePicker : UIDatePicker?
     
     var minimumDate : NSDate = NSDate()
@@ -53,7 +53,7 @@ class AddViewController: UIViewController, UITextFieldDelegate, AddViewInterface
     }
     
     func setEntryName(name: NSString) {
-        nameTextField.text = name
+        nameTextField.text = name as String
     }
     
     func setEntryDueDate(date: NSDate) {
@@ -70,7 +70,7 @@ class AddViewController: UIViewController, UITextFieldDelegate, AddViewInterface
         }
     }
     
-    func textFieldShouldReturn(textField: UITextField!) -> Bool {
+    func textFieldShouldReturn(textField: UITextField) -> Bool {
         textField.resignFirstResponder()
         
         return true
diff --git a/VIPER-SWIFT/Classes/Modules/Add/User Interface/Wireframe/AddWireframe.swift b/VIPER-SWIFT/Classes/Modules/Add/User Interface/Wireframe/AddWireframe.swift
index f1fd62a..fe70bdb 100755
--- a/VIPER-SWIFT/Classes/Modules/Add/User Interface/Wireframe/AddWireframe.swift	
+++ b/VIPER-SWIFT/Classes/Modules/Add/User Interface/Wireframe/AddWireframe.swift	
@@ -35,7 +35,7 @@ class AddWireframe : NSObject, UIViewControllerTransitioningDelegate {
     
     func addViewController() -> AddViewController {
         let storyboard = mainStoryboard()
-        let addViewController: AddViewController = storyboard.instantiateViewControllerWithIdentifier(AddViewControllerIdentifier) as AddViewController
+        let addViewController: AddViewController = storyboard.instantiateViewControllerWithIdentifier(AddViewControllerIdentifier) as! AddViewController
         return addViewController
     }
     
@@ -44,11 +44,11 @@ class AddWireframe : NSObject, UIViewControllerTransitioningDelegate {
         return storyboard
     }
     
-    func animationControllerForDismissedController(dismissed: UIViewController!) -> UIViewControllerAnimatedTransitioning! {
+    func animationControllerForDismissedController(dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
         return AddDismissalTransition()
     }
     
-   func animationControllerForPresentedController(presented: UIViewController!, presentingController presenting: UIViewController!, sourceController source: UIViewController!) -> UIViewControllerAnimatedTransitioning! {
+   func animationControllerForPresentedController(presented: UIViewController, presentingController presenting: UIViewController, sourceController source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
         return AddPresentationTransition()
     }
 }
\ No newline at end of file
diff --git a/VIPER-SWIFT/Classes/Modules/List/Application Logic/Interactor/ListInteractor.swift b/VIPER-SWIFT/Classes/Modules/List/Application Logic/Interactor/ListInteractor.swift
index f3b38d3..b3d9744 100755
--- a/VIPER-SWIFT/Classes/Modules/List/Application Logic/Interactor/ListInteractor.swift	
+++ b/VIPER-SWIFT/Classes/Modules/List/Application Logic/Interactor/ListInteractor.swift	
@@ -31,10 +31,10 @@ class ListInteractor : NSObject, ListInteractorInput {
         })
     }
     
-    func upcomingItemsFromToDoItems(todoItems: TodoItem[]) -> UpcomingItem[] {
+    func upcomingItemsFromToDoItems(todoItems: [TodoItem]) -> [UpcomingItem] {
         let calendar = NSCalendar.autoupdatingCurrentCalendar()
         
-        var upcomingItems : UpcomingItem[] = []
+        var upcomingItems : [UpcomingItem] = []
         
         for todoItem in todoItems {
             var dateRelation = calendar.nearTermRelationForDate(todoItem.dueDate, relativeToToday: clock.today())
diff --git a/VIPER-SWIFT/Classes/Modules/List/Application Logic/Interactor/ListInteractorIO.swift b/VIPER-SWIFT/Classes/Modules/List/Application Logic/Interactor/ListInteractorIO.swift
index 6be6403..6114b0a 100755
--- a/VIPER-SWIFT/Classes/Modules/List/Application Logic/Interactor/ListInteractorIO.swift	
+++ b/VIPER-SWIFT/Classes/Modules/List/Application Logic/Interactor/ListInteractorIO.swift	
@@ -14,5 +14,5 @@ protocol ListInteractorInput {
 }
 
 protocol ListInteractorOutput {
-    func foundUpcomingItems(upcomingItems: UpcomingItem[])
+    func foundUpcomingItems(upcomingItems: [UpcomingItem])
 }
diff --git a/VIPER-SWIFT/Classes/Modules/List/Application Logic/Interactor/UpcomingItem.swift b/VIPER-SWIFT/Classes/Modules/List/Application Logic/Interactor/UpcomingItem.swift
index 01c694e..9ae20ce 100755
--- a/VIPER-SWIFT/Classes/Modules/List/Application Logic/Interactor/UpcomingItem.swift	
+++ b/VIPER-SWIFT/Classes/Modules/List/Application Logic/Interactor/UpcomingItem.swift	
@@ -9,9 +9,15 @@
 import Foundation
 
 struct UpcomingItem : Equatable {
-    let title : String = ""
-    let dueDate : NSDate = NSDate()
-    let dateRelation : NearTermDateRelation = NearTermDateRelation.OutOfRange
+    let title : String
+    let dueDate : NSDate
+    let dateRelation : NearTermDateRelation
+    
+    init() {
+        title = ""
+        dueDate = NSDate()
+        dateRelation = .OutOfRange
+    }
     
     init(title: String, dueDate: NSDate, dateRelation: NearTermDateRelation) {
         self.title = title
diff --git a/VIPER-SWIFT/Classes/Modules/List/Application Logic/Manager/ListDataManager.swift b/VIPER-SWIFT/Classes/Modules/List/Application Logic/Manager/ListDataManager.swift
index 546c714..085f3d4 100755
--- a/VIPER-SWIFT/Classes/Modules/List/Application Logic/Manager/ListDataManager.swift	
+++ b/VIPER-SWIFT/Classes/Modules/List/Application Logic/Manager/ListDataManager.swift	
@@ -12,7 +12,7 @@ import Foundation
 class ListDataManager : NSObject {
     var coreDataStore : CoreDataStore?
 
-    func todoItemsBetweenStartDate(startDate: NSDate, endDate: NSDate, completion: ((TodoItem[]) -> Void)!) {
+    func todoItemsBetweenStartDate(startDate: NSDate, endDate: NSDate, completion: (([TodoItem]) -> Void)!) {
         let calendar = NSCalendar.autoupdatingCurrentCalendar()
         let beginning = calendar.dateForBeginningOfDay(startDate)
         let end = calendar.dateForEndOfDay(endDate)
@@ -21,18 +21,18 @@ class ListDataManager : NSObject {
         let sortDescriptors = []
         
         coreDataStore?.fetchEntriesWithPredicate(predicate,
-            sortDescriptors: sortDescriptors,
+            sortDescriptors: sortDescriptors as [AnyObject],
             completionBlock: { entries in
                 let todoItems = self.todoItemsFromDataStoreEntries(entries)
                 completion(todoItems)
         })
     }
     
-    func todoItemsFromDataStoreEntries(entries: ManagedTodoItem[]) -> TodoItem[] {
-        var todoItems : TodoItem[] = []
+    func todoItemsFromDataStoreEntries(entries: [ManagedTodoItem]) -> [TodoItem] {
+        var todoItems : [TodoItem] = []
         
         for managedTodoItem in entries {
-            let todoItem = TodoItem(dueDate: managedTodoItem.date, name: managedTodoItem.name)
+            let todoItem = TodoItem(dueDate: managedTodoItem.date, name: managedTodoItem.name as String)
             todoItems.append(todoItem)
         }
         
diff --git a/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/ListPresenter.swift b/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/ListPresenter.swift
index bd24ab0..5cf947e 100755
--- a/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/ListPresenter.swift	
+++ b/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/ListPresenter.swift	
@@ -18,7 +18,7 @@ class ListPresenter : NSObject, ListInteractorOutput, ListModuleInterface, AddMo
         listInteractor?.findUpcomingItems()
     }
     
-    func foundUpcomingItems(upcomingItems: UpcomingItem[]) {
+    func foundUpcomingItems(upcomingItems: [UpcomingItem]) {
         if upcomingItems.count == 0 {
             userInterface?.showNoContentMessage()
         } else {
@@ -26,12 +26,12 @@ class ListPresenter : NSObject, ListInteractorOutput, ListModuleInterface, AddMo
         }
     }
     
-    func updateUserInterfaceWithUpcomingItems(upcomingItems: UpcomingItem[]) {
+    func updateUserInterfaceWithUpcomingItems(upcomingItems: [UpcomingItem]) {
         let upcomingDisplayData = upcomingDisplayDataWithItems(upcomingItems)
         userInterface?.showUpcomingDisplayData(upcomingDisplayData)
     }
     
-    func upcomingDisplayDataWithItems(upcomingItems: UpcomingItem[]) -> UpcomingDisplayData {
+    func upcomingDisplayDataWithItems(upcomingItems: [UpcomingItem]) -> UpcomingDisplayData {
         let collection = UpcomingDisplayDataCollection()
         collection.addUpcomingItems(upcomingItems)
         return collection.collectedDisplayData()
diff --git a/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplayData.swift b/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplayData.swift
index 9c0a93b..fd31912 100755
--- a/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplayData.swift	
+++ b/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplayData.swift	
@@ -9,11 +9,14 @@
 import Foundation
 
 struct UpcomingDisplayData : Equatable {
-    let sections : UpcomingDisplaySection[] = []
+    let sections : [UpcomingDisplaySection]
     
-    init(sections: UpcomingDisplaySection[]) {
+    init() {
+        sections = []
+    }
+    
+    init(sections: [UpcomingDisplaySection]) {
         self.sections = sections
-        self.sections.unshare()
     }
 }
 
diff --git a/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplayDataCollection.swift b/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplayDataCollection.swift
index d152667..eefbd6a 100755
--- a/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplayDataCollection.swift	
+++ b/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplayDataCollection.swift	
@@ -10,13 +10,13 @@ import Foundation
 
 class UpcomingDisplayDataCollection {
     let dayFormatter = NSDateFormatter()
-    var sections : Dictionary<NearTermDateRelation, UpcomingDisplayItem[]> = Dictionary()
+    var sections : Dictionary<NearTermDateRelation, [UpcomingDisplayItem]> = Dictionary()
     
     init() {
         dayFormatter.dateFormat = NSDateFormatter.dateFormatFromTemplate("EEEE", options: 0, locale: NSLocale.autoupdatingCurrentLocale())
     }
     
-    func addUpcomingItems(upcomingItems: UpcomingItem[]) {
+    func addUpcomingItems(upcomingItems: [UpcomingItem]) {
         for upcomingItem in upcomingItems {
             addUpcomingItem(upcomingItem)
         }
@@ -28,11 +28,11 @@ class UpcomingDisplayDataCollection {
     }
     
     func addDisplayItem(displayItem: UpcomingDisplayItem, dateRelation: NearTermDateRelation) {
-        if var realSection : UpcomingDisplayItem[] = sections[dateRelation] {
+        if var realSection : [UpcomingDisplayItem] = sections[dateRelation] {
             realSection.append(displayItem)
             sections[dateRelation] = realSection
         } else {
-            var newSection : UpcomingDisplayItem[] = []
+            var newSection : [UpcomingDisplayItem] = []
             newSection.append(displayItem)
             sections[dateRelation] = newSection
         }
@@ -53,7 +53,7 @@ class UpcomingDisplayDataCollection {
     }
     
     func collectedDisplayData() -> UpcomingDisplayData {
-        let collectedSections : UpcomingDisplaySection[] = sortedUpcomingDisplaySections()
+        let collectedSections : [UpcomingDisplaySection] = sortedUpcomingDisplaySections()
         return UpcomingDisplayData(sections: collectedSections)
     }
     
@@ -65,14 +65,14 @@ class UpcomingDisplayDataCollection {
         return UpcomingDisplaySection(name: sectionTitle, imageName: imageName, items: items)
     }
     
-    func sortedUpcomingDisplaySections() -> UpcomingDisplaySection[] {
+    func sortedUpcomingDisplaySections() -> [UpcomingDisplaySection] {
         let keys = sortedNearTermDateRelations()
-        var displaySections : UpcomingDisplaySection[] = []
+        var displaySections : [UpcomingDisplaySection] = []
         
         for dateRelation in keys {
             var itemArray = sections[dateRelation]
             
-            if itemArray {
+            if (itemArray != nil) {
                 var displaySection = displaySectionForDateRelation(dateRelation)
                 displaySections.insert(displaySection, atIndex: displaySections.endIndex)
             }
@@ -81,8 +81,8 @@ class UpcomingDisplayDataCollection {
         return displaySections
     }
     
-    func sortedNearTermDateRelations() -> NearTermDateRelation[] {
-        var array : NearTermDateRelation[] = []
+    func sortedNearTermDateRelations() -> [NearTermDateRelation] {
+        var array : [NearTermDateRelation] = []
         array.insert(NearTermDateRelation.Today, atIndex: 0)
         array.insert(NearTermDateRelation.Tomorrow, atIndex: 1)
         array.insert(NearTermDateRelation.LaterThisWeek, atIndex: 2)
diff --git a/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplayItem.swift b/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplayItem.swift
index ac3ec88..4f468ce 100755
--- a/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplayItem.swift	
+++ b/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplayItem.swift	
@@ -9,13 +9,18 @@
 import Foundation
 
 struct UpcomingDisplayItem : Equatable, Printable {
-    let title : String = ""
-    let dueDate : String = ""
+    let title : String
+    let dueDate : String
     
     var description : String { get {
         return "\(title) -- \(dueDate)"
     }}
     
+    init() {
+        title = ""
+        dueDate = ""
+    }
+    
     init(title: String, dueDate: String) {
         self.title = title
         self.dueDate = dueDate
diff --git a/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplaySection.swift b/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplaySection.swift
index 5164a31..aafef9d 100755
--- a/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplaySection.swift	
+++ b/VIPER-SWIFT/Classes/Modules/List/User Interface/Presenter/UpcomingDisplaySection.swift	
@@ -10,17 +10,25 @@
 import Foundation
 
 struct UpcomingDisplaySection : Equatable {
-    let name : String = ""
-    let imageName : String = ""
-    var items : UpcomingDisplayItem[] = []
+    let name : String
+    let imageName : String
+    var items : [UpcomingDisplayItem]
     
-    init(name: String, imageName: String, items: UpcomingDisplayItem[]?) {
+    init() {
+        name = ""
+        imageName = ""
+        items = []
+    }
+    
+    init(name: String, imageName: String, items: [UpcomingDisplayItem]?) {
         self.name = name
         self.imageName = imageName
         
-        if items {
+        if (items != nil) {
             self.items = items!
-            self.items.unshare()
+        }
+        else {
+            self.items = []
         }
     }
 }
diff --git a/VIPER-SWIFT/Classes/Modules/List/User Interface/View/ListViewController.swift b/VIPER-SWIFT/Classes/Modules/List/User Interface/View/ListViewController.swift
index 954c4bd..0264c2e 100755
--- a/VIPER-SWIFT/Classes/Modules/List/User Interface/View/ListViewController.swift	
+++ b/VIPER-SWIFT/Classes/Modules/List/User Interface/View/ListViewController.swift	
@@ -16,7 +16,7 @@ class ListViewController : UITableViewController, ListViewInterface {
     var dataProperty : UpcomingDisplayData?
     var strongTableView : UITableView?
     
-    @IBOutlet var noContentView : UIView
+    @IBOutlet var noContentView : UIView!
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -58,7 +58,7 @@ class ListViewController : UITableViewController, ListViewInterface {
         tableView.reloadData()
     }
     
-    override func numberOfSectionsInTableView(tableView: UITableView!) -> Int {
+    override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
         var numberOfSections = dataProperty?.sections.count
         
         if dataProperty?.sections.count == nil {
@@ -68,25 +68,25 @@ class ListViewController : UITableViewController, ListViewInterface {
         return numberOfSections!
     }
     
-    override func tableView(tableView: UITableView!, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         let upcomingSection = dataProperty?.sections[section]
         return upcomingSection!.items.count
     }
     
-    override func tableView(tableView: UITableView!, titleForHeaderInSection section: Int) -> String! {
+    override func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         let upcomingSection = dataProperty?.sections[section]
         return upcomingSection!.name
     }
     
-    override func tableView(tableView: UITableView!, cellForRowAtIndexPath indexPath: NSIndexPath!) -> UITableViewCell! {
+    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
         let upcomingSection = dataProperty?.sections[indexPath.section]
         let upcomingItem = upcomingSection!.items[indexPath.row]
         
-        let cell = tableView.dequeueReusableCellWithIdentifier(ListEntryCellIdentifier, forIndexPath: indexPath) as UITableViewCell
+        let cell = tableView.dequeueReusableCellWithIdentifier(ListEntryCellIdentifier, forIndexPath: indexPath) as! UITableViewCell
         
-        cell.textLabel.text = upcomingItem.title;
-        cell.detailTextLabel.text = upcomingItem.dueDate;
-        cell.imageView.image = UIImage(named: upcomingSection!.imageName)
+        cell.textLabel!.text = upcomingItem.title;
+        cell.detailTextLabel!.text = upcomingItem.dueDate;
+        cell.imageView!.image = UIImage(named: upcomingSection!.imageName)
         cell.selectionStyle = UITableViewCellSelectionStyle.None;
 
         return cell
diff --git a/VIPER-SWIFT/Classes/Modules/List/User Interface/Wireframe/ListWireframe.swift b/VIPER-SWIFT/Classes/Modules/List/User Interface/Wireframe/ListWireframe.swift
index 1cdbc9c..3b9b6b7 100755
--- a/VIPER-SWIFT/Classes/Modules/List/User Interface/Wireframe/ListWireframe.swift	
+++ b/VIPER-SWIFT/Classes/Modules/List/User Interface/Wireframe/ListWireframe.swift	
@@ -31,7 +31,7 @@ class ListWireframe : NSObject {
     
     func listViewControllerFromStoryboard() -> ListViewController {
         let storyboard = mainStoryboard()
-        let viewController = storyboard.instantiateViewControllerWithIdentifier(ListViewControllerIdentifier) as ListViewController
+        let viewController = storyboard.instantiateViewControllerWithIdentifier(ListViewControllerIdentifier) as! ListViewController
         return viewController
     }