chore(client/cordova/apple): introduce XCode subproject (#1787)

Jigsaw-Code · Jul 23, 2024 · dff8f19 · dff8f19
1 parent 90b5a3c
commit dff8f19
Show file tree

Hide file tree

Showing 15 changed files with 664 additions and 500 deletions.
diff --git a/client/src/cordova/apple/OutlineAppleLib/Package.swift b/client/src/cordova/apple/OutlineAppleLib/Package.swift
@@ -10,21 +10,22 @@ let package = Package(
         // CocoaLumberjack 3.8.0 dropped support for iOS < 11 and macOS < 10.13.
         // See https://github.com/CocoaLumberjack/CocoaLumberjack/releases/tag/3.8.0.
         // These cannot be upgraded without also upgrading the entire project.
-       .iOS(.v11),
+       .iOS(.v13),
        .macOS(.v10_14),
     ],
     products: [
         .library(
             name: "OutlineAppleLib",
-            targets: ["Tun2socks", "OutlineSentryLogger", "OutlineTunnel", "OutlineCatalystApp", "OutlineNotification"]
+            targets: ["OutlineSentryLogger", "OutlineTunnel", "OutlineCatalystApp", "OutlineNotification"]
         ),
+        // Expose OutlineTunnel so the VpnExtension can use it.
         .library(
-            name: "OutlineLauncher",
-            targets: ["OutlineLauncher"]
+            name: "OutlineTunnel",
+            targets: ["OutlineTunnel"]
         ),
         .library(
-            name: "PacketTunnelProvider",
-            targets: ["PacketTunnelProvider"]
+            name: "OutlineLauncher",
+            targets: ["OutlineLauncher"]
         ),
     ],
     dependencies: [
@@ -47,18 +48,6 @@ let package = Package(
                 "OutlineNotification",
             ]
         ),
-        .target(
-            name: "PacketTunnelProvider",
-            dependencies: [
-                "CocoaLumberjack",
-                .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
-                "Tun2socks",
-                "OutlineTunnel",
-            ],
-            cSettings: [
-                .headerSearchPath("Internal"),
-            ]
-        ),
         .target(name: "OutlineNotification"),
         .target(
             name: "OutlineSentryLogger",
@@ -71,16 +60,11 @@ let package = Package(
             name: "OutlineTunnel",
             dependencies: [
                 .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
-                "Tun2socks",
             ]
         ),
-        .binaryTarget(
-            name: "Tun2socks",
-            path: "../../../../output/build/apple/Tun2socks.xcframework"
-        ),
         .testTarget(
             name: "OutlineTunnelTest",
-            dependencies: ["OutlineTunnel", "PacketTunnelProvider"]
+            dependencies: ["OutlineTunnel"]
         ),
     ]
 )
diff --git a/client/src/cordova/apple/OutlineAppleLib/Sources/OutlineTunnel/OutlineVpn.swift b/client/src/cordova/apple/OutlineAppleLib/Sources/OutlineTunnel/OutlineVpn.swift
@@ -14,7 +14,6 @@
 
 import CocoaLumberjackSwift
 import NetworkExtension
-import Tun2socks
 
 // Manages the system's VPN tunnel through the VpnExtension process.
 @objcMembers

diff --git a/client/src/cordova/apple/OutlineAppleLib/Tests/OutlineTunnelTest/OutlineTunnelTest.swift b/client/src/cordova/apple/OutlineAppleLib/Tests/OutlineTunnelTest/OutlineTunnelTest.swift
@@ -1,10 +1,8 @@
 import XCTest
 
 import NetworkExtension
-import Tun2socks
 
 @testable import OutlineTunnel
-@testable import PacketTunnelProvider
 
 final class OutlineTunnelTest: XCTestCase {