Swift 4.2!

README.md

@@ -34,9 +34,9 @@ Requirements:
 To get started, you'll need the following installed:
 * [Git](http://git-scm.com/book/en/Getting-Started-Installing-Git)
 
-* The latest **public** build of [Xcode](https://developer.apple.com/xcode/) (and a compatible Mac). *Currently Xcode 9* (You can get this from the [Mac App Store](https://itunes.apple.com/us/app/xcode/id497799835?mt=12) if you want easy updates)
+* The latest **public** build of [Xcode](https://developer.apple.com/xcode/) (and a compatible Mac). *Currently Xcode 10* (You can get this from the [Mac App Store](https://itunes.apple.com/us/app/xcode/id497799835?mt=12) if you want easy updates)
 
-* The latest **public** release of Swift. *Currently Swift 4.0* (bundled with Xcode)
+* The latest **public** release of Swift. *Currently Swift 4.2* (bundled with Xcode)
 
 * Cocoapods, for dependency management. You can install this by running `sudo gem install cocoapods` in your terminal. (Dependency management may change in the future)
 
@@ -61,6 +61,7 @@ What Won't Work During Development
 ---
 - Crashlytics won't load in under the "WhatsOpen" Scheme. Use Xcode's debugger.
 - Alternate app icons won't work (and will probably crash if you try to use them) due to the build method of adding them to the info.plist file. If you're an artist and have some cool alternate app icons to add, you can still do so in the `AlternateAppIcons.xcassets` file in the main project folder, and adding a cell for them in the SetIconTableViewController.
+- Any App Extensions will likely be unable to connect to your database, as App Groups used for this require a special entitlement.
 
 Troubleshooting
 ---

WhatsOpen/WhatsOpen.xcodeproj/project.pbxproj

@@ -374,6 +374,7 @@
 					};
 					9203CB822023D51A006ACC3B = {
 						DevelopmentTeam = K5MMVK2UFR;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Manual;
 						SystemCapabilities = {
 							com.apple.SafariKeychain = {
@@ -804,8 +805,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "b7d91eb0-1140-4c4c-8a3e-a4b698a70a43";
 				PROVISIONING_PROFILE_SPECIFIER = "What's Open Development";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -835,8 +835,7 @@
 				PROVISIONING_PROFILE = "b7d91eb0-1140-4c4c-8a3e-a4b698a70a43";
 				PROVISIONING_PROFILE_SPECIFIER = "What's Open Development";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -868,8 +867,7 @@
 				PROVISIONING_PROFILE = "b7d91eb0-1140-4c4c-8a3e-a4b698a70a43";
 				PROVISIONING_PROFILE_SPECIFIER = "What's Open Development";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};

WhatsOpen/WhatsOpen/AppDelegate.swift

@@ -18,7 +18,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
 		
 		#if APPSTORE
@@ -35,7 +35,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         return true
     }
 
-	func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([Any]?) -> Void) -> Bool {
+	func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
 		dump(userActivity.userInfo)
 		if userActivity.activityType == NSUserActivityTypeBrowsingWeb {
 			let _ = userActivity.webpageURL

WhatsOpen/WhatsOpen/PaddedUILabel.swift

@@ -19,17 +19,17 @@ class PaddedUILabel: UILabel {
     }
     
     override func textRect(forBounds bounds: CGRect, limitedToNumberOfLines numberOfLines: Int) -> CGRect {
-        let insetRect = UIEdgeInsetsInsetRect(bounds, textInsets)
+        let insetRect = bounds.inset(by: textInsets)
         let textRect = super.textRect(forBounds: insetRect, limitedToNumberOfLines: numberOfLines)
         let invertedInsets = UIEdgeInsets(top: -textInsets.top,
                                           left: -textInsets.left,
                                           bottom: -textInsets.bottom,
                                           right: -textInsets.right)
-        return UIEdgeInsetsInsetRect(textRect, invertedInsets)
+        return textRect.inset(by: invertedInsets)
     }
     
     override func drawText(in rect: CGRect) {
-        super.drawText(in: UIEdgeInsetsInsetRect(rect, textInsets))
+        super.drawText(in: rect.inset(by: textInsets))
     }
     
 }

WhatsOpen/WhatsOpen/Views/AboutScreenViewController.swift

@@ -87,8 +87,8 @@ class AboutScreenViewController: UIViewController, UITableViewDelegate, UITableV
 		switch indexPath.section {
 		case 0:
 			cell.textLabel!.text = "Check out our code on Gitlab"
-			cell.selectionStyle = UITableViewCellSelectionStyle.blue
-			cell.accessoryType = UITableViewCellAccessoryType.disclosureIndicator
+			cell.selectionStyle = UITableViewCell.SelectionStyle.blue
+			cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
 		case 1:
 			cell.textLabel!.text = contributors[indexPath.row]
 		default:

WhatsOpen/WhatsOpen/Views/DetailViewButtonsViewController.swift

@@ -40,19 +40,19 @@ class DetailViewButtonsViewController: UIViewController {
 		
 		if appToUse == "Google Maps" && UIApplication.shared.canOpenURL(URL(string:"comgooglemaps://")!) {
 			if let url = URL(string: "comgooglemaps://?q=\((facility.facilityLocation?.coordinates?.coords?.last)!)),\((facility.facilityLocation?.coordinates?.coords?.first)!)") {
-				UIApplication.shared.open(url, options: [:], completionHandler: nil)
+				UIApplication.shared.open(url, options: convertToUIApplicationOpenExternalURLOptionsKeyDictionary([:]), completionHandler: nil)
 			}
 		}
 		else if appToUse == "Waze" && UIApplication.shared.canOpenURL(URL(string:"comgooglemaps://")!) {
 			if let url = URL(string: "https://waze.com/ul?ll=\((facility.facilityLocation?.coordinates?.coords?.last)!)),\((facility.facilityLocation?.coordinates?.coords?.first)!))") {
-				UIApplication.shared.open(url, options: [:], completionHandler: nil)
+				UIApplication.shared.open(url, options: convertToUIApplicationOpenExternalURLOptionsKeyDictionary([:]), completionHandler: nil)
 			}
 		}
 		else {
 			let regionDistance:CLLocationDistance = 100
 			let coordinates = CLLocationCoordinate2DMake((facility.facilityLocation?.coordinates?.coords?.last)!, (facility.facilityLocation?.coordinates?.coords?.first)!)
 			dump(coordinates)
-			let regionSpan = MKCoordinateRegionMakeWithDistance(coordinates, regionDistance, regionDistance)
+			let regionSpan = MKCoordinateRegion.init(center: coordinates, latitudinalMeters: regionDistance, longitudinalMeters: regionDistance)
 			let options = [
 				MKLaunchOptionsMapCenterKey: NSValue(mkCoordinate: regionSpan.center),
 				MKLaunchOptionsMapSpanKey: NSValue(mkCoordinateSpan: regionSpan.span)
@@ -90,7 +90,7 @@ class DetailViewButtonsViewController: UIViewController {
 		// Dealing with container views and subviews
 		// https://spin.atomicobject.com/2015/10/13/switching-child-view-controllers-ios-auto-layout/
 		self.detailViewController!.view.translatesAutoresizingMaskIntoConstraints = false
-		self.addChildViewController(self.detailViewController!)
+		self.addChild(self.detailViewController!)
 		self.addSubview(self.detailViewController!.view, toView: self.facilityDetailView)
         super.viewDidLoad()
 
@@ -150,3 +150,8 @@ class DetailViewButtonsViewController: UIViewController {
     */
 
 }
+
+// Helper function inserted by Swift 4.2 migrator.
+fileprivate func convertToUIApplicationOpenExternalURLOptionsKeyDictionary(_ input: [String: Any]) -> [UIApplication.OpenExternalURLOptionsKey: Any] {
+	return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIApplication.OpenExternalURLOptionsKey(rawValue: key), value)})
+}

WhatsOpen/WhatsOpen/Views/Filters Views/FilterSelectionTableViewController.swift

@@ -100,7 +100,7 @@ class FilterSelectionTableViewController: UITableViewController {
 		else {
 			let tableCell = tableView.cellForRow(at: indexPath)
 			var res: Bool
-			if(tableCell?.accessoryType == UITableViewCellAccessoryType.none) {
+			if(tableCell?.accessoryType == UITableViewCell.AccessoryType.none) {
 				res = true
 			}
 			else {

WhatsOpen/WhatsOpen/Views/Filters Views/FiltersTableViewController.swift

@@ -57,7 +57,7 @@ class FiltersTableViewController: UITableViewController {
         super.viewDidLoad()
         
 		tableView.estimatedRowHeight = 50
-        tableView.rowHeight = UITableViewAutomaticDimension
+        tableView.rowHeight = UITableView.automaticDimension
 		/*
 		for f in facilities {
 			if(!allLocations.contains(f.facilityLocation!)) {

WhatsOpen/WhatsOpen/Views/Primary Views/FacilitiesListViewController.swift

@@ -294,7 +294,7 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
 		
         super.viewDidLoad()
 		let nc = NotificationCenter.default
-		nc.addObserver(self, selector: #selector(anyRefresh(_:)), name: .UIApplicationWillEnterForeground, object: nil)
+		nc.addObserver(self, selector: #selector(anyRefresh(_:)), name: UIApplication.willEnterForegroundNotification, object: nil)
 		
 		self.definesPresentationContext = true
         
@@ -308,7 +308,7 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
 		
 		settingsButton.accessibilityLabel = "Settings"
 		
-		LocationsListLayout.sectionInset = UIEdgeInsetsMake(10, 10, 10, 10)
+		LocationsListLayout.sectionInset = UIEdgeInsets.init(top: 10, left: 10, bottom: 10, right: 10)
 
 		refreshControl.addTarget(self, action: #selector(forceRefresh(_:)), for: .valueChanged)
 		LocationsList.refreshControl = refreshControl
@@ -904,7 +904,7 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
         // Get the new view controller using segue.destinationViewController.
         if(segue.identifier == "toDetailView") {
             let destination = segue.destination as! PullingViewController
-			var destChild = destination.childViewControllers[0] as! FacilityDetailViewController
+			var destChild = destination.children[0] as! FacilityDetailViewController
 			destChild = self.storyboard?.instantiateViewController(withIdentifier: "detailView") as! FacilityDetailViewController
             let destDelegate = DeckTransitioningDelegate()
             destination.transitioningDelegate = destDelegate

WhatsOpen/WhatsOpen/Views/Primary Views/FacilityDetailViewController.swift

@@ -30,7 +30,7 @@ class FacilityDetailViewController: UIViewController, UITableViewDelegate, UITab
 		else {
 			title = "Add to Favorites"
 		}
-		let favoritePreviewItem = UIPreviewAction(title: title, style: UIPreviewActionStyle.default, handler: markAsFavoritePreviewAction)
+		let favoritePreviewItem = UIPreviewAction(title: title, style: UIPreviewAction.Style.default, handler: markAsFavoritePreviewAction)
 	    return [favoritePreviewItem]
 	}
 	

WhatsOpen/WhatsOpen/Views/PullingViewController.swift

@@ -26,7 +26,7 @@ class PullingViewController: UIViewController {
 		// Dealing with container views and subviews
 		// https://spin.atomicobject.com/2015/10/13/switching-child-view-controllers-ios-auto-layout/
 		self.currentViewController!.view.translatesAutoresizingMaskIntoConstraints = false
-		self.addChildViewController(self.currentViewController!)
+		self.addChild(self.currentViewController!)
 		self.addSubview(self.currentViewController!.view, toView: self.containerView)
 		self.accessibilityCustomActions = [
 			UIAccessibilityCustomAction(name: "Dismiss Detail View", target: self, selector: #selector(PullingViewController.willDismiss))

WhatsOpen/WhatsOpen/Views/SettingsTableViewController.swift

@@ -29,7 +29,7 @@ class SettingsTableViewController: UITableViewController, MFMailComposeViewContr
         super.viewDidLoad()
 		
 		tableView.estimatedRowHeight = 44.0
-		tableView.rowHeight = UITableViewAutomaticDimension
+		tableView.rowHeight = UITableView.automaticDimension
 
         // Uncomment the following line to preserve selection between presentations
         // self.clearsSelectionOnViewWillAppear = false
@@ -196,7 +196,7 @@ class SettingsTableViewController: UITableViewController, MFMailComposeViewContr
 				let urlString = "itms-apps://itunes.apple.com/us/app/whats-open-at-mason/id\(appId)?action=write-review"
 				
 				if let url = URL(string: urlString) {
-					UIApplication.shared.open((url), options: [:], completionHandler: nil)
+					UIApplication.shared.open((url), options: convertToUIApplicationOpenExternalURLOptionsKeyDictionary([:]), completionHandler: nil)
 				}
 			}
 			else if settingcell.textLabel!.text == "About What's Open" {
@@ -312,3 +312,8 @@ class SettingsTableViewController: UITableViewController, MFMailComposeViewContr
 	
 
 }
+
+// Helper function inserted by Swift 4.2 migrator.
+fileprivate func convertToUIApplicationOpenExternalURLOptionsKeyDictionary(_ input: [String: Any]) -> [UIApplication.OpenExternalURLOptionsKey: Any] {
+	return Dictionary(uniqueKeysWithValues: input.map { key, value in (UIApplication.OpenExternalURLOptionsKey(rawValue: key), value)})
+}

WhatsOpen/WhatsOpen/Views/TableViewCells/CheckingTableViewCell.swift

@@ -46,10 +46,10 @@ class OnlyOneChecked {
 	func setCheckToCellWithID(_ id: Int) {
 		for cell in view.sortOptions {
 			if(id == cell.cellIndex) {
-				cell.accessoryType = UITableViewCellAccessoryType.checkmark
+				cell.accessoryType = UITableViewCell.AccessoryType.checkmark
 			}
 			else {
-				cell.accessoryType = UITableViewCellAccessoryType.none
+				cell.accessoryType = UITableViewCell.AccessoryType.none
 			}
 		}