Fix deprecation warning — use modern NSWorkspace.shared.urlForApplication instead of NSWorkspace.shared.absolutePathForApplication

brentsimmons · brentsimmons · commit bc4e574ae846 · 2024-02-20T22:31:29.000-08:00
diff --git a/Sources/RSCore/AppKit/UserApp.swift b/Sources/RSCore/AppKit/UserApp.swift
@@ -63,15 +63,15 @@ public final class UserApp {
 				path = bundleURL.path
 			}
 			else {
-				path = NSWorkspace.shared.absolutePathForApplication(withBundleIdentifier: bundleID)
+				path = pathForApplication(bundleIdentifier: bundleID)
 			}
 			if icon == nil, let path = path {
 				icon = NSWorkspace.shared.icon(forFile: path)
 			}
 			return
 		}
 
-		path = NSWorkspace.shared.absolutePathForApplication(withBundleIdentifier: bundleID)
+		path = pathForApplication(bundleIdentifier: bundleID)
 		if let path = path {
 			if icon == nil {
 				icon = NSWorkspace.shared.icon(forFile: path)
@@ -136,5 +136,14 @@ public final class UserApp {
 		return NSAppleEventDescriptor(runningApplication: runningApplication)
 	}
 }
-#endif
 
+private extension UserApp {
+
+	func pathForApplication(bundleIdentifier: String) -> String? {
+
+		let url = NSWorkspace.shared.urlForApplication(withBundleIdentifier: bundleID)
+		return url?.path
+	}
+}
+
+#endif

Original file line number	Diff line number	Diff line change
`@@ -63,15 +63,15 @@ public final class UserApp {`
`63`	`63`	`path = bundleURL.path`
`64`	`64`	`}`
`65`	`65`	`else {`
`66`		`- path = NSWorkspace.shared.absolutePathForApplication(withBundleIdentifier: bundleID)`
	`66`	`+ path = pathForApplication(bundleIdentifier: bundleID)`
`67`	`67`	`}`
`68`	`68`	`if icon == nil, let path = path {`
`69`	`69`	`icon = NSWorkspace.shared.icon(forFile: path)`
`70`	`70`	`}`
`71`	`71`	`return`
`72`	`72`	`}`
`73`	`73`
`74`		`- path = NSWorkspace.shared.absolutePathForApplication(withBundleIdentifier: bundleID)`
	`74`	`+ path = pathForApplication(bundleIdentifier: bundleID)`
`75`	`75`	`if let path = path {`
`76`	`76`	`if icon == nil {`
`77`	`77`	`icon = NSWorkspace.shared.icon(forFile: path)`
`@@ -136,5 +136,14 @@ public final class UserApp {`
`136`	`136`	`return NSAppleEventDescriptor(runningApplication: runningApplication)`
`137`	`137`	`}`
`138`	`138`	`}`
`139`		`-#endif`
`140`	`139`
	`140`	`+private extension UserApp {`
	`141`	`+`
	`142`	`+ func pathForApplication(bundleIdentifier: String) -> String? {`
	`143`	`+`
	`144`	`+ let url = NSWorkspace.shared.urlForApplication(withBundleIdentifier: bundleID)`
	`145`	`+ return url?.path`
	`146`	`+ }`
	`147`	`+}`
	`148`	`+`
	`149`	`+#endif`