chore(client/cordova/apple): introduce XCode subproject #1787
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1787 +/- ##
======================================
Coverage 32% 32%
======================================
Files 45 45
Lines 2609 2609
Branches 337 337
======================================
Hits 859 859
Misses 1750 1750
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
fortuna
changed the title
| @@ -0,0 +1,29 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
There was a problem hiding this comment.
This shouldn't need version information injected on bulid, right?
fortuna
changed the title
|
@sbruens this is ready for review. It was a pain to get it working again, but it will allow us to move quicker, because with the side project we don't need to deal with the copy into the iOS and macOS projects that get rsynced. Next step would be to start moving code out of the Swift Package into the Project directly, and eventually drop the Swift package. There's a circular dependency with the PacketTunnelProvider and OutlineTunnel that needs to be addressed though. The OutlineLauncher should also move into the new project, since we can define bundles easily now. |
| @@ -47,18 +48,6 @@ let package = Package( | |||
| "OutlineNotification", | |||
| ] | |||
| ), | |||
| .target( | |||
There was a problem hiding this comment.
It turns out no other target depends on Tun2socks, so after removing the unused references, I was able to move PacketTunnelProvider into the side project and out of the Swift Package!
| /* Begin PBXFileReference section */ | ||
| 522987032C4F273E009EE577 /* PacketTunnelProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PacketTunnelProvider.h; sourceTree = "<group>"; }; | ||
| 522987042C4F273E009EE577 /* PacketTunnelProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PacketTunnelProvider.m; sourceTree = "<group>"; }; | ||
| 5229870D2C4F2873009EE577 /* Tun2socks.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Tun2socks.xcframework; path = ../../../../output/build/apple/Tun2socks.xcframework; sourceTree = "<group>"; }; |
There was a problem hiding this comment.
This is currently a reference to the pre-built binary, but I think we can potentially build this on demand by messing with the project build.
| @@ -167,6 +167,8 @@ It's safe to unregister all the Outline VPN Extensions, since the system will lo | |||
| pluginkit -r $APP_EXTENSION_PATH | |||
| ``` | |||
|
|
|||
| Make sure that you list the registered plugins again after unregistering them, since they may fallback to other versions of it, which you may also need to unregister. | |||
There was a problem hiding this comment.
New finding on debugging. We need to keep unregistering and checking until they are all gone.
| @@ -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), | |||
There was a problem hiding this comment.
Is this a cleanup from #2057?
There was a problem hiding this comment.
The code from the previous PR is not broken, but we will need to update this anyway before we start using new code in the swift package.
This PR introduces a subproject (OutlineLib) to the main Cordova project, and moves the VPN Extension to it.
This has some advantages:
Notice that the new project still depends on the Swift Package. The goal is to eventually move all the code to the OutlineLib subproject, so we can get rid of the Swift package.
I'm hoping that after we finish this, the Cordova project generated by iOS can be minimally edited to just add the subproject dependency and set the dependencies of the main app target, which could perhaps be done automatically.