Revert OutlinePlugin changes and instead use a NSNotification tar…

…get.
Jigsaw-Code · Aug 15, 2023 · 48148d7 · 48148d7
1 parent f1b83fc
commit 48148d7
Show file tree

Hide file tree

Showing 13 changed files with 411 additions and 563 deletions.
diff --git a/src/cordova/apple/OutlineAppleLib/Package.swift b/src/cordova/apple/OutlineAppleLib/Package.swift
@@ -8,7 +8,7 @@ let package = Package(
     products: [
         .library(
             name: "OutlineAppleLib",
-            targets: ["Tun2socks", "OutlineSentryLogger", "OutlineTunnel", "OutlineCatalystApp", "OutlinePlugin"]
+            targets: ["Tun2socks", "OutlineSentryLogger", "OutlineTunnel", "OutlineCatalystApp", "OutlineNotifications"]
         ),
         .library(
             name: "OutlineLauncher",
@@ -46,7 +46,7 @@ let package = Package(
             name: "OutlineAppKitBridge",
             dependencies: [
                 .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
-                "OutlinePlugin",
+                "OutlineNotifications",
             ]
         ),
         .target(
@@ -60,15 +60,7 @@ let package = Package(
                 .headerSearchPath("Internal"),
             ]
         ),
-        .target(
-            name: "OutlinePlugin",
-            dependencies: [
-                .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
-                .product(name: "Sentry", package: "sentry-cocoa"),
-                "OutlineSentryLogger",
-                "OutlineTunnel",
-            ]
-        ),
+        .target(name: "OutlineNotifications"),
         .target(
             name: "OutlineSentryLogger",
             dependencies: [

diff --git a/src/cordova/apple/OutlineAppleLib/Sources/OutlineAppKitBridge/StatusItemController.swift b/src/cordova/apple/OutlineAppleLib/Sources/OutlineAppKitBridge/StatusItemController.swift
@@ -15,7 +15,7 @@
 #if os(macOS)
     import AppKit
     import CocoaLumberjackSwift
-    import OutlinePlugin
+    import OutlineNotifications
 
     var StatusItem = NSStatusItem()
 

diff --git a/src/cordova/apple/OutlineAppleLib/Sources/OutlineCatalystApp/OutlineCatalystApp.swift b/src/cordova/apple/OutlineAppleLib/Sources/OutlineCatalystApp/OutlineCatalystApp.swift
@@ -17,7 +17,7 @@
     import CocoaLumberjackSwift
     import Foundation
     import OutlineAppKitBridge
-    import OutlinePlugin
+    import OutlineNotifications
     import ServiceManagement
 
     @objcMembers

diff --git a/...Plugin/NSNotification+OutlinePlugin.swift → ...otifications/NSNotification+Outline.swift b/...Plugin/NSNotification+OutlinePlugin.swift → ...otifications/NSNotification+Outline.swift
diff --git a/src/cordova/apple/OutlineAppleLib/Sources/OutlinePlugin/OutlinePlugin.swift b/src/cordova/apple/OutlineAppleLib/Sources/OutlinePlugin/OutlinePlugin.swift