Update to Swift 5

Pine.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		008CD6E8A653CDDA656D692B /* Pods_Pine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B66B7DAE689A6827E658233B /* Pods_Pine.framework */; };
 		8F34580B873BD2CCD033F53B /* Pods_Pine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 300B3A71DC5543C53B684729 /* Pods_Pine.framework */; };
 		A104782520E7338800E0930A /* FileSystemItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A104782420E7338800E0930A /* FileSystemItem.swift */; };
 		A10B86DD2227BB3E000656DD /* PreferencesSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A10B86DC2227BB3E000656DD /* PreferencesSplitViewController.swift */; };
@@ -203,6 +204,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				8F34580B873BD2CCD033F53B /* Pods_Pine.framework in Frameworks */,
+				008CD6E8A653CDDA656D692B /* Pods_Pine.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -568,12 +570,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0930;
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Luka Kerr";
 				TargetAttributes = {
 					A156AF7C2090606C0098BBDD = {
 						CreatedOnToolsVersion = 9.3;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						SystemCapabilities = {
 							com.apple.ApplicationGroups.Mac = {
 								enabled = 0;
@@ -585,12 +587,12 @@
 					};
 					A156AF902090606D0098BBDD = {
 						CreatedOnToolsVersion = 9.3;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						TestTargetID = A156AF7C2090606C0098BBDD;
 					};
 					A156AF9B2090606D0098BBDD = {
 						CreatedOnToolsVersion = 9.3;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						TestTargetID = A156AF7C2090606C0098BBDD;
 					};
 				};
@@ -944,7 +946,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_INCLUDE_PATHS = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -971,7 +973,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_INCLUDE_PATHS = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -992,7 +994,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.PineTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_INCLUDE_PATHS = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Pine.app/Contents/MacOS/Pine";
 			};
 			name = Debug;
@@ -1014,7 +1016,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.PineTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_INCLUDE_PATHS = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Pine.app/Contents/MacOS/Pine";
 			};
 			name = Release;
@@ -1035,7 +1037,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.PineUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_INCLUDE_PATHS = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = Pine;
 			};
 			name = Debug;
@@ -1056,7 +1058,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.lukakerr.PineUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_INCLUDE_PATHS = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = Pine;
 			};
 			name = Release;

Pine.xcodeproj/xcshareddata/xcschemes/Pine.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Pine/Base.lproj/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
-        <plugIn identifier="com.apple.WebKit2IBPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <plugIn identifier="com.apple.WebKit2IBPlugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -1126,10 +1126,10 @@
         </scene>
     </scenes>
     <resources>
-        <image name="Folder" width="75" height="75"/>
+        <image name="Folder" width="50" height="50"/>
         <image name="NSFolder" width="32" height="32"/>
         <image name="NSLinenBackgroundPattern" width="256" height="256"/>
-        <image name="Plus" width="75" height="75"/>
-        <image name="Sidebar" width="75" height="75"/>
+        <image name="Plus" width="50" height="50"/>
+        <image name="Sidebar" width="50" height="50"/>
     </resources>
 </document>

Pine/Models/OpenDocuments.swift

@@ -27,14 +27,14 @@ final class OpenDocuments {
 
   /// Remove an item from the open documents given a URL
   public func remove(itemWithUrl url: URL) {
-    if let index = documents.index(where: { $0.fullPath == url.relativePath }) {
+    if let index = documents.firstIndex(where: { $0.fullPath == url.relativePath }) {
       documents.remove(at: index)
     }
   }
 
   /// Remove an item from the open documents given the item
   public func remove(item doc: FileSystemItem) {
-    if let index = documents.index(where: { $0 == doc }) {
+    if let index = documents.firstIndex(where: { $0 == doc }) {
       documents.remove(at: index)
     }
   }

Podfile.lock

@@ -14,10 +14,10 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   cmark-gfm-swift:
-    :commit: 958fa1050ea2561659f9e4d9bc4ac2266896eef4
+    :commit: 4102c78d08ea44036dab3a623389827f3532e9ea
     :git: https://github.com/lukakerr/cmark-gfm-swift.git
   Highlightr:
-    :commit: b32a617fef4822ab7ae6818a7d3e47765feecdf0
+    :commit: 31e3d89c9635ec2967ec7bf7f3d14a4a85041bbf
     :git: https://github.com/lukakerr/Highlightr.git
 
 SPEC CHECKSUMS: