Merge pull request #4 from naveen-c/Swift5

Migration to Swift5
naveen-c · Sep 18, 2019 · 05af797 · 05af797
2 parents 85f59c9 + 2b66340
commit 05af797
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/Example/Nifty.xcodeproj/project.pbxproj b/Example/Nifty.xcodeproj/project.pbxproj
@@ -186,7 +186,7 @@
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
 						DevelopmentTeam = 25JQ655X97;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -196,6 +196,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -422,8 +423,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.appflipkart.flipkart;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -441,8 +441,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.appflipkart.flipkart;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Example/Nifty.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/Nifty.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>
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Nifty/Classes/NTDisplay/Nodes/NTNode.swift b/Nifty/Classes/NTDisplay/Nodes/NTNode.swift
@@ -399,7 +399,7 @@ extension NTNode {
     /** @name Managing the nodes hierarchy */
 
     private func _removeSubnode(subnode: NTNode) {
-        if let index = self._subNodes.index(of: subnode) {
+        if let index = self._subNodes.firstIndex(of: subnode) {
             self._subNodes.remove(at: index)
             subnode._supernode = nil
         }
@@ -465,7 +465,7 @@ extension NTNode {
         var index: Int?
 
         _mutex.fastSync { () -> Void in
-            index = self._subNodes.index(of: below)
+            index = self._subNodes.firstIndex(of: below)
         }
 
         if let index = index {
@@ -491,7 +491,7 @@ extension NTNode {
         var index: Int?
 
         _mutex.fastSync { () -> Void in
-            index = self._subNodes.index(of: above)
+            index = self._subNodes.firstIndex(of: above)
         }
 
         if let index = index {
@@ -538,7 +538,7 @@ extension NTNode {
         var index: Int?
 
         _mutex.fastSync { () -> Void in
-            index = self._subNodes.index(of: subnode)
+            index = self._subNodes.firstIndex(of: subnode)
         }
 
         if let index = index {