Merge pull request #43 from ProxymanApp/improve/support-catalyst

Support Catalyst

Author: NghiaTranUIT

Sources/NetworkInjector.swift

@@ -94,16 +94,20 @@ extension NetworkInjector {
         if !ProcessInfo.processInfo.responds(to: #selector(getter: ProcessInfo.operatingSystemVersion)) {
             baseResumeClass = NSClassFromString("__NSCFLocalSessionTask")
         } else {
+            #if targetEnvironment(macCatalyst)
+            baseResumeClass = URLSessionTask.self
+            #else
             let majorVersion = ProcessInfo.processInfo.operatingSystemVersion.majorVersion
             if majorVersion < 9 || majorVersion >= 14 {
                 baseResumeClass = URLSessionTask.self
             } else {
                 baseResumeClass = NSClassFromString("__NSCFURLSessionTask")
             }
+            #endif
         }
 
         guard let resumeClass = baseResumeClass else {
-            assertionFailure()
+            assertionFailure("Could not find URLSessionTask. Please open support ticket at https://github.com/ProxymanApp/atlantis")
             return
         }
 

Sources/Packages.swift

@@ -11,7 +11,7 @@ import Foundation
 #if os(OSX)
 import AppKit
 typealias Image = NSImage
-#elseif os(iOS)
+#elseif os(iOS) || targetEnvironment(macCatalyst)
 import UIKit
 typealias Image = UIImage
 #endif
@@ -131,7 +131,7 @@ struct Device: Codable {
         let macName = Host.current().name ?? "Unknown Mac Devices"
         name = macName
         model = "\(macName) \(ProcessInfo.processInfo.operatingSystemVersionString)"
-        #elseif os(iOS)
+        #elseif os(iOS) || targetEnvironment(macCatalyst)
         let device = UIDevice.current
         name = device.name
         model = "\(device.name) (\(device.systemName) \(device.systemVersion))"
@@ -236,9 +236,14 @@ extension Image {
     static var appIcon: Image? {
         #if os(OSX)
         return NSApplication.shared.applicationIconImage
+        #elseif targetEnvironment(macCatalyst)
+        guard let iconName = Bundle.main.infoDictionary?["CFBundleIconFile"] as? String else {
+            return nil
+        }
+        return Image(named: iconName)
         #elseif os(iOS)
-        guard let iconsDictionary = Bundle.main.infoDictionary?["CFBundleIcons"] as? [String:Any],
-              let primaryIconsDictionary = iconsDictionary["CFBundlePrimaryIcon"] as? [String:Any],
+        guard let iconsDictionary = Bundle.main.infoDictionary?["CFBundleIcons"] as? [String: Any],
+              let primaryIconsDictionary = iconsDictionary["CFBundlePrimaryIcon"] as? [String: Any],
               let iconFiles = primaryIconsDictionary["CFBundleIconFiles"] as? [String],
               let lastIcon = iconFiles.last else { return nil }
         return Image(named: lastIcon)
@@ -252,7 +257,7 @@ extension Image {
         // Resize, we don't need 1024px size
         newRep.size = CGSize(width: 64, height: 64)
         return newRep.representation(using: .png, properties: [:])
-        #elseif os(iOS)
+        #elseif os(iOS) || targetEnvironment(macCatalyst)
         // It's already by 64px
         return self.pngData()
         #endif