Merge pull request #1 from keith/ks/update-to-swift-5

Update to Swift 5
keith · Nov 21, 2020 · fc1a01c · fc1a01c
2 parents c5d7bf3 + f13b9f1
commit fc1a01c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/ModMove.xcodeproj/project.pbxproj b/ModMove.xcodeproj/project.pbxproj
@@ -126,7 +126,7 @@
 				TargetAttributes = {
 					C27E73161BD9FFB00058FDD0 = {
 						CreatedOnToolsVersion = 7.1;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1220;
 					};
 				};
 			};
@@ -135,6 +135,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -275,7 +276,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "ModMove/Resources/ModMove-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -290,7 +291,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "ModMove/Resources/ModMove-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/ModMove.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ModMove.xcodeproj/project.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/ModMove/AccessibilityElement.swift b/ModMove/AccessibilityElement.swift
@@ -68,7 +68,7 @@ final class AccessibilityElement {
         }
 
         AXUIElementSetAttributeValue(self.elementRef,
-                                     NSAccessibilityAttributeName.main.rawValue as CFString,
+                                     NSAccessibility.Attribute.main.rawValue as CFString,
                                      true as CFTypeRef)
     }
 
@@ -98,25 +98,25 @@ final class AccessibilityElement {
         }
     }
 
-    private func rawValue(for attribute: NSAccessibilityAttributeName) -> AnyObject? {
+    private func rawValue(for attribute: NSAccessibility.Attribute) -> AnyObject? {
         var rawValue: AnyObject?
         let error = AXUIElementCopyAttributeValue(self.elementRef, attribute.rawValue as CFString, &rawValue)
         return error == .success ? rawValue : nil
     }
 
-    private func value(for attribute: NSAccessibilityAttributeName) -> Self? {
+    private func value(for attribute: NSAccessibility.Attribute) -> Self? {
         if let rawValue = self.rawValue(for: attribute), CFGetTypeID(rawValue) == AXUIElementGetTypeID() {
             return type(of: self).init(elementRef: rawValue as! AXUIElement)
         }
 
         return nil
     }
 
-    private func value(for attribute: NSAccessibilityAttributeName) -> String? {
+    private func value(for attribute: NSAccessibility.Attribute) -> String? {
         return self.rawValue(for: attribute) as? String
     }
 
-    private func value<T>(for attribute: NSAccessibilityAttributeName) -> T? {
+    private func value<T>(for attribute: NSAccessibility.Attribute) -> T? {
         if let rawValue = self.rawValue(for: attribute), CFGetTypeID(rawValue) == AXValueGetTypeID() {
             return (rawValue as! AXValue).toValue()
         }