Extract PacketTunnelProvider

Jigsaw-Code · Jul 7, 2023 · 94bddfb · 94bddfb
1 parent 1e71e03
commit 94bddfb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/src/cordova/apple/OutlineAppleLib/Package.swift b/src/cordova/apple/OutlineAppleLib/Package.swift
@@ -8,7 +8,10 @@ let package = Package(
     products: [
         .library(
             name: "OutlineAppleLib",
-            targets: ["Tun2socks", "OutlineTunnel", "PacketTunnelProvider"]),
+            targets: ["Tun2socks", "OutlineTunnel"]),
+        .library(
+            name: "PacketTunnelProvider",
+            targets: ["PacketTunnelProvider"]),
     ],
     dependencies: [
         .package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", from: "3.7.4"),

diff --git a/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj b/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj
@@ -22,10 +22,10 @@
 		52CBB894295BD8F200D0073F /* CocoaLumberjackSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 52CBB893295BD8F200D0073F /* CocoaLumberjackSwift */; };
 		52CBB896295BD93600D0073F /* CocoaLumberjack in Frameworks */ = {isa = PBXBuildFile; productRef = 52CBB895295BD93600D0073F /* CocoaLumberjack */; };
 		52CE53E7295B6A310064D03D /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 52CE53E6295B6A310064D03D /* Sentry */; };
+		52E783062A5880CF00355E64 /* PacketTunnelProvider in Frameworks */ = {isa = PBXBuildFile; productRef = 52E783052A5880CF00355E64 /* PacketTunnelProvider */; };
 		5F7F90AE0E924FD7B065C415 /* CDVStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 0394302BA6114B2AB648D4FF /* CDVStatusBar.m */; };
 		6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */; };
 		F63DC2182970AFFA00D92E0A /* OutlineAppleLib in Frameworks */ = {isa = PBXBuildFile; productRef = F63DC2172970AFFA00D92E0A /* OutlineAppleLib */; };
-		F63DC21A2970B00100D92E0A /* OutlineAppleLib in Frameworks */ = {isa = PBXBuildFile; productRef = F63DC2192970B00100D92E0A /* OutlineAppleLib */; };
 		FC8C31091FAA8032004262BE /* OutlineSentryLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC8C31081FAA8032004262BE /* OutlineSentryLogger.swift */; };
 		FC8C310B1FAA814A004262BE /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC8C310A1FAA814A004262BE /* NetworkExtension.framework */; };
 		FC8C310C1FAA88FB004262BE /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC8C310A1FAA814A004262BE /* NetworkExtension.framework */; };
@@ -148,8 +148,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F63DC21A2970B00100D92E0A /* OutlineAppleLib in Frameworks */,
 				FC8C310B1FAA814A004262BE /* NetworkExtension.framework in Frameworks */,
+				52E783062A5880CF00355E64 /* PacketTunnelProvider in Frameworks */,
 				3B0347611F212F6900C8EF1F /* libz.tbd in Frameworks */,
 				52CBB896295BD93600D0073F /* CocoaLumberjack in Frameworks */,
 			);
@@ -340,7 +340,7 @@
 			name = VpnExtension;
 			packageProductDependencies = (
 				52CBB895295BD93600D0073F /* CocoaLumberjack */,
-				F63DC2192970B00100D92E0A /* OutlineAppleLib */,
+				52E783052A5880CF00355E64 /* PacketTunnelProvider */,
 			);
 			productName = VpnExtension;
 			productReference = 3B0347481F212F0100C8EF1F /* VpnExtension.appex */;
@@ -862,11 +862,11 @@
 			package = 52CE53E5295B6A310064D03D /* XCRemoteSwiftPackageReference "sentry-cocoa" */;
 			productName = Sentry;
 		};
-		F63DC2172970AFFA00D92E0A /* OutlineAppleLib */ = {
+		52E783052A5880CF00355E64 /* PacketTunnelProvider */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = OutlineAppleLib;
+			productName = PacketTunnelProvider;
 		};
-		F63DC2192970B00100D92E0A /* OutlineAppleLib */ = {
+		F63DC2172970AFFA00D92E0A /* OutlineAppleLib */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = OutlineAppleLib;
 		};

diff --git a/src/cordova/apple/xcode/macos/Outline.xcodeproj/project.pbxproj b/src/cordova/apple/xcode/macos/Outline.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		52355CFB295B70030057557B /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 52355CFA295B70030057557B /* Sentry */; };
+		52C198972A587525006E0ACE /* PacketTunnelProvider in Frameworks */ = {isa = PBXBuildFile; productRef = 52C198962A587525006E0ACE /* PacketTunnelProvider */; };
 		52CBB849295BC79300D0073F /* CocoaLumberjack in Frameworks */ = {isa = PBXBuildFile; productRef = 52CBB848295BC79300D0073F /* CocoaLumberjack */; };
 		52CBB84B295BC79300D0073F /* CocoaLumberjackSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 52CBB84A295BC79300D0073F /* CocoaLumberjackSwift */; };
 		707060AF18FFC05700755D46 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 707060AE18FFC05700755D46 /* MainViewController.xib */; };
@@ -24,7 +25,6 @@
 		DBBA975361C94599B9DD3891 /* CDVClipboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 469466FF1BDB44C081741BF5 /* CDVClipboard.m */; };
 		EAD11960A27C45AFA5E46584 /* Outline-Bridging-Header.h in Resources */ = {isa = PBXBuildFile; fileRef = A508014170A1492DB0D800B3 /* Outline-Bridging-Header.h */; };
 		F63DC2202970B26500D92E0A /* OutlineAppleLib in Frameworks */ = {isa = PBXBuildFile; productRef = F63DC21F2970B26500D92E0A /* OutlineAppleLib */; };
-		F63DC2222970B27300D92E0A /* OutlineAppleLib in Frameworks */ = {isa = PBXBuildFile; productRef = F63DC2212970B27300D92E0A /* OutlineAppleLib */; };
 		F63DC2242970B27A00D92E0A /* OutlineAppleLib in Frameworks */ = {isa = PBXBuildFile; productRef = F63DC2232970B27A00D92E0A /* OutlineAppleLib */; };
 		FC0799E92037532A00A1C822 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC0799E82037532A00A1C822 /* AppDelegate.swift */; };
 		FC0799F02037532A00A1C822 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FC0799EE2037532A00A1C822 /* Main.storyboard */; };
@@ -166,8 +166,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F63DC2222970B27300D92E0A /* OutlineAppleLib in Frameworks */,
 				FC5FF9471F3E1E8B0032A745 /* NetworkExtension.framework in Frameworks */,
+				52C198972A587525006E0ACE /* PacketTunnelProvider in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -376,7 +376,7 @@
 			);
 			name = VpnExtension;
 			packageProductDependencies = (
-				F63DC2212970B27300D92E0A /* OutlineAppleLib */,
+				52C198962A587525006E0ACE /* PacketTunnelProvider */,
 			);
 			productName = VpnExtension;
 			productReference = FC5FF92B1F3E1E5F0032A745 /* VpnExtension.appex */;
@@ -1011,6 +1011,10 @@
 			package = 52355CF9295B70020057557B /* XCRemoteSwiftPackageReference "sentry-cocoa" */;
 			productName = Sentry;
 		};
+		52C198962A587525006E0ACE /* PacketTunnelProvider */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = PacketTunnelProvider;
+		};
 		52CBB848295BC79300D0073F /* CocoaLumberjack */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 52CBB847295BC79300D0073F /* XCRemoteSwiftPackageReference "CocoaLumberjack" */;
@@ -1025,10 +1029,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = OutlineAppleLib;
 		};
-		F63DC2212970B27300D92E0A /* OutlineAppleLib */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = OutlineAppleLib;
-		};
 		F63DC2232970B27A00D92E0A /* OutlineAppleLib */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = OutlineAppleLib;