From 1b71213912045df44ef8e59ab919752bf89e8c49 Mon Sep 17 00:00:00 2001 From: Vinicius Fortuna Date: Thu, 6 Jul 2023 23:41:45 -0400 Subject: [PATCH] Fix dependencies --- .../OutlineTunnelSources/OutlineVpn.swift | 4 +- .../macos/Outline.xcodeproj/project.pbxproj | 45 ++++++------------- .../xcode/macos/Outline/Classes/AppDelegate.m | 1 + 3 files changed, 16 insertions(+), 34 deletions(-) diff --git a/src/cordova/apple/OutlineAppleLib/Sources/OutlineTunnelSources/OutlineVpn.swift b/src/cordova/apple/OutlineAppleLib/Sources/OutlineTunnelSources/OutlineVpn.swift index 31bf3ae6be..45f191a979 100644 --- a/src/cordova/apple/OutlineAppleLib/Sources/OutlineTunnelSources/OutlineVpn.swift +++ b/src/cordova/apple/OutlineAppleLib/Sources/OutlineTunnelSources/OutlineVpn.swift @@ -99,7 +99,7 @@ public class OutlineVpn: NSObject { } // Starts the last successful VPN tunnel. - func startLastSuccessfulTunnel(_ completion: @escaping (Callback)) { + @objc public func startLastSuccessfulTunnel(_ completion: @escaping (Callback)) { // Explicitly pass an empty tunnel's configuration, so the VpnExtension process retrieves // the last configuration from disk. self.startVpn(OutlineTunnel(), isAutoConnect: true, completion) @@ -308,7 +308,7 @@ public class OutlineVpn: NSObject { // Receives NEVPNStatusDidChange notifications. Calls onTunnelStatusChange for the active // tunnel. - @objc func vpnStatusChanged() { + func vpnStatusChanged() { if let vpnStatus = tunnelManager?.connection.status { if let tunnelId = activeTunnelId { if (vpnStatus == .disconnected) { diff --git a/src/cordova/apple/xcode/macos/Outline.xcodeproj/project.pbxproj b/src/cordova/apple/xcode/macos/Outline.xcodeproj/project.pbxproj index 9eb8c717f1..3c90e0c6e9 100644 --- a/src/cordova/apple/xcode/macos/Outline.xcodeproj/project.pbxproj +++ b/src/cordova/apple/xcode/macos/Outline.xcodeproj/project.pbxproj @@ -10,10 +10,6 @@ 52355CFB295B70030057557B /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 52355CFA295B70030057557B /* Sentry */; }; 52CBB849295BC79300D0073F /* CocoaLumberjack in Frameworks */ = {isa = PBXBuildFile; productRef = 52CBB848295BC79300D0073F /* CocoaLumberjack */; }; 52CBB84B295BC79300D0073F /* CocoaLumberjackSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 52CBB84A295BC79300D0073F /* CocoaLumberjackSwift */; }; - 52CBB84D295BC7F700D0073F /* CocoaLumberjack in Frameworks */ = {isa = PBXBuildFile; productRef = 52CBB84C295BC7F700D0073F /* CocoaLumberjack */; }; - 52CBB84F295BC7F700D0073F /* CocoaLumberjackSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 52CBB84E295BC7F700D0073F /* CocoaLumberjackSwift */; }; - 52CBB851295BC81900D0073F /* CocoaLumberjack in Frameworks */ = {isa = PBXBuildFile; productRef = 52CBB850295BC81900D0073F /* CocoaLumberjack */; }; - 52CBB853295BC81900D0073F /* CocoaLumberjackSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 52CBB852295BC81900D0073F /* CocoaLumberjackSwift */; }; 707060AF18FFC05700755D46 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 707060AE18FFC05700755D46 /* MainViewController.xib */; }; 70BD682718FFB02D00A1EFCF /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70BD682618FFB02D00A1EFCF /* Cocoa.framework */; }; 70BD683118FFB02D00A1EFCF /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 70BD682F18FFB02D00A1EFCF /* InfoPlist.strings */; }; @@ -43,6 +39,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 5296DB072A57BBAF0009C9BB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 70BD681B18FFB02D00A1EFCF /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC0799E52037532900A1C822; + remoteInfo = OutlineLauncher; + }; 70BD685F18FFB04300A1EFCF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 70BD685A18FFB04300A1EFCF /* CordovaLib.xcodeproj */; @@ -155,8 +158,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 52CBB851295BC81900D0073F /* CocoaLumberjack in Frameworks */, - 52CBB853295BC81900D0073F /* CocoaLumberjackSwift in Frameworks */, F63DC2242970B27A00D92E0A /* OutlineAppleLib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -167,8 +168,6 @@ files = ( F63DC2222970B27300D92E0A /* OutlineAppleLib in Frameworks */, FC5FF9471F3E1E8B0032A745 /* NetworkExtension.framework in Frameworks */, - 52CBB84D295BC7F700D0073F /* CocoaLumberjack in Frameworks */, - 52CBB84F295BC7F700D0073F /* CocoaLumberjackSwift in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -329,6 +328,7 @@ ); dependencies = ( 70BD687118FFB19500A1EFCF /* PBXTargetDependency */, + 5296DB082A57BBAF0009C9BB /* PBXTargetDependency */, FC5FF9391F3E1E5F0032A745 /* PBXTargetDependency */, ); name = Outline; @@ -356,8 +356,6 @@ ); name = OutlineLauncher; packageProductDependencies = ( - 52CBB850295BC81900D0073F /* CocoaLumberjack */, - 52CBB852295BC81900D0073F /* CocoaLumberjackSwift */, F63DC2232970B27A00D92E0A /* OutlineAppleLib */, ); productName = OutlineLauncher; @@ -378,8 +376,6 @@ ); name = VpnExtension; packageProductDependencies = ( - 52CBB84C295BC7F700D0073F /* CocoaLumberjack */, - 52CBB84E295BC7F700D0073F /* CocoaLumberjackSwift */, F63DC2212970B27300D92E0A /* OutlineAppleLib */, ); productName = VpnExtension; @@ -563,6 +559,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 5296DB082A57BBAF0009C9BB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC0799E52037532900A1C822 /* OutlineLauncher */; + targetProxy = 5296DB072A57BBAF0009C9BB /* PBXContainerItemProxy */; + }; 70BD687118FFB19500A1EFCF /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = CordovaLib; @@ -1020,26 +1021,6 @@ package = 52CBB847295BC79300D0073F /* XCRemoteSwiftPackageReference "CocoaLumberjack" */; productName = CocoaLumberjackSwift; }; - 52CBB84C295BC7F700D0073F /* CocoaLumberjack */ = { - isa = XCSwiftPackageProductDependency; - package = 52CBB847295BC79300D0073F /* XCRemoteSwiftPackageReference "CocoaLumberjack" */; - productName = CocoaLumberjack; - }; - 52CBB84E295BC7F700D0073F /* CocoaLumberjackSwift */ = { - isa = XCSwiftPackageProductDependency; - package = 52CBB847295BC79300D0073F /* XCRemoteSwiftPackageReference "CocoaLumberjack" */; - productName = CocoaLumberjackSwift; - }; - 52CBB850295BC81900D0073F /* CocoaLumberjack */ = { - isa = XCSwiftPackageProductDependency; - package = 52CBB847295BC79300D0073F /* XCRemoteSwiftPackageReference "CocoaLumberjack" */; - productName = CocoaLumberjack; - }; - 52CBB852295BC81900D0073F /* CocoaLumberjackSwift */ = { - isa = XCSwiftPackageProductDependency; - package = 52CBB847295BC79300D0073F /* XCRemoteSwiftPackageReference "CocoaLumberjack" */; - productName = CocoaLumberjackSwift; - }; F63DC21F2970B26500D92E0A /* OutlineAppleLib */ = { isa = XCSwiftPackageProductDependency; productName = OutlineAppleLib; diff --git a/src/cordova/apple/xcode/macos/Outline/Classes/AppDelegate.m b/src/cordova/apple/xcode/macos/Outline/Classes/AppDelegate.m index fea3f075cc..6c681b5f9d 100644 --- a/src/cordova/apple/xcode/macos/Outline/Classes/AppDelegate.m +++ b/src/cordova/apple/xcode/macos/Outline/Classes/AppDelegate.m @@ -16,6 +16,7 @@ #import "Outline-Swift.h" @import ServiceManagement; +@import OutlineTunnel; @interface AppDelegate() @property (strong, nonatomic) NSStatusItem *statusItem;