Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(cordova/apple/ios): add mac catalyst support #1630

Merged
merged 77 commits into from
Aug 17, 2023
Merged

feat(cordova/apple/ios): add mac catalyst support #1630

merged 77 commits into from
Aug 17, 2023

Commits on Jul 21, 2023

  1. Replace the copy-www-build-step script with build phases.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    caab056 View commit details
    Browse the repository at this point in the history

  2. Add Mac Catalyst as a destination.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    cfc0a56 View commit details
    Browse the repository at this point in the history

  3. Update README to load xcworkspace from ./src/cordova/apple/ instead… 

    … of `./platforms/ios/`.
    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    6d5dc15 View commit details
    Browse the repository at this point in the history

  4. Set separate bundle identifier for the Mac app built with Mac Catalyst.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    59e2573 View commit details
    Browse the repository at this point in the history

  5. Add Package.resolved back. It was likely accidentally removed in #1536 

    .
    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    6c17efc View commit details
    Browse the repository at this point in the history

  6. Update local storage source directory for UIWebView->WKWebView migrat… 

    …ion for catalyst.
    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    5d047ba View commit details
    Browse the repository at this point in the history

  7. Pin cordova-ios dep to fix for splashscreen aspect ratio.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    eb34314 View commit details
    Browse the repository at this point in the history

  8. Rename Images.xcassets to Assets.xcassets.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    27c7b16 View commit details
    Browse the repository at this point in the history

  9. Add the status bar button images.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    99f8e11 View commit details
    Browse the repository at this point in the history

  10. Use LSUIElement to indicate this is a background app and shouldn't … 

    …appear in the Dock.
    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    c805cfa View commit details
    Browse the repository at this point in the history

  11. Add an AppKit bridge and use it to create a status bar menu in catalyst.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    c921133 View commit details
    Browse the repository at this point in the history

  12. Re-open the application window when use selects "Open" command from t… 

    …he status menu.
    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    dea0058 View commit details
    Browse the repository at this point in the history

  13. Stop any VPN connections on app termination.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    a3d87a7 View commit details
    Browse the repository at this point in the history

  14. Use clang-format to format Objective-C files.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    0bd0cf3 View commit details
    Browse the repository at this point in the history

  15. Use SwiftFormat to format Swift files.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    1a9ccba View commit details
    Browse the repository at this point in the history

  16. Set separate bundle identifier for the Mac Catalyst app built for rel… 

    …ease.

Previously set it on the `Debug` build, but need to also set it on `Release` build.
    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    b1890cd View commit details
    Browse the repository at this point in the history

  17. Configure the app window to be a specific size.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    8b31acf View commit details
    Browse the repository at this point in the history

  18. Enable the embedded app launcher as a login item.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    604cf08 View commit details
    Browse the repository at this point in the history

  19. Use the macos app group in PacketTunnelProvider when on Catalyst.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    598a463 View commit details
    Browse the repository at this point in the history

  20. Add some logs to the OutlineStatusItemController for easier debugging.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    f00bd3d View commit details
    Browse the repository at this point in the history

  21. Do not try and add a StatusItemController automatically on AppKitBr… 

    …idge loads.

We'll need to re-use this bridge in the upcoming launcher, which should not add its own menu item to the status bar.
    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    7f6a4ea View commit details
    Browse the repository at this point in the history

  22. Ignore locally loaded XCFramework bundles.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    117b0ce View commit details
    Browse the repository at this point in the history

  23. Add launcher to Catalyst. 

    We set the launcher as a login item in Catalyst, and open the app if there Outline was connected at shutdown.
    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    0fe6a43 View commit details
    Browse the repository at this point in the history

  24. Run clang-format over .m files.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    2314814 View commit details
    Browse the repository at this point in the history

  25. Ensure Sentry logs the right app group on Catalyst.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    f9080fe View commit details
    Browse the repository at this point in the history

  26. Run macos code on Catalyst in a few more places.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    9323995 View commit details
    Browse the repository at this point in the history

  27. Do not run some code for macOS on Catalyst.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    b600af9 View commit details
    Browse the repository at this point in the history

  28. Add prefix to log message for consistency.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    a0fcc01 View commit details
    Browse the repository at this point in the history

  29. Use the NETunnelProviderManager to determine whether Outline was co… 

    …nnected and the launcher should launch the application.
    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    9a2552a View commit details
    Browse the repository at this point in the history

  30. Automatic project data changes made by Xcode.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    3221092 View commit details
    Browse the repository at this point in the history

  31. Set miminum macos deployment target to 10.15.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    9215e05 View commit details
    Browse the repository at this point in the history

  32. Set bundle ID for launcher to launcher3.

    @sbruens
    sbruens committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    50706b9 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. Move AppDelegate logic to category extension instead of overwriting… 

    … the `AppDelegate` file auto-generated by Cordova.
    @sbruens
    sbruens committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    47ae814 View commit details
    Browse the repository at this point in the history

  2. Move Catalyst specific AppDelegate code to Swift.

    @sbruens
    sbruens committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    9ff6ecf View commit details
    Browse the repository at this point in the history

  3. Use SwiftFormat to format Swift files.

    @sbruens
    sbruens committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    5b533c6 View commit details
    Browse the repository at this point in the history

  4. Replace NSLog with DDLog.

    @sbruens
    sbruens committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    28314ab View commit details
    Browse the repository at this point in the history

  5. Use SwiftFormat to format Swift files.

    @sbruens
    sbruens committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    1cf4d01 View commit details
    Browse the repository at this point in the history

  6. Fix notifications for macos bundle and undo formatting to make the di… 

    …ff smaller.
    @sbruens
    sbruens committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    7da81f9 View commit details
    Browse the repository at this point in the history

  7. Remove local Tun2socks.xcframework which got accidentally committed.

    @sbruens
    sbruens committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    141262a View commit details
    Browse the repository at this point in the history

  8. Undo README changes as they have already been updated in a previous PR.

    @sbruens
    sbruens committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    cd48188 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Move catalyst code into OutlineAppleLib.

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    a46c9f8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into sbruens/catalyst

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    04c734e View commit details
    Browse the repository at this point in the history

  3. Remove reference to OutlineLauncher's plist.

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    a34a4f8 View commit details
    Browse the repository at this point in the history

  4. Fix some bad merges.

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    68ffbdd View commit details
    Browse the repository at this point in the history

  5. Remove an unnecessary #if guard.

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    cea2ba4 View commit details
    Browse the repository at this point in the history

  6. Add a TODO to i18n the menu strings, which will happen in a fast-follow.

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    4da2bee View commit details
    Browse the repository at this point in the history

  7. Review changes.

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    74a6475 View commit details
    Browse the repository at this point in the history

  8. More changes for review.

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    0c7469a View commit details
    Browse the repository at this point in the history

  9. Mark static function as public.

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    935844d View commit details
    Browse the repository at this point in the history

  10. More changes.

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    eff9b8d View commit details
    Browse the repository at this point in the history

  11. Use enum instead of boolean to represent connection status.

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    c7132ee View commit details
    Browse the repository at this point in the history

  12. Clean up some entitlement changes that aren't actually needed.

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    6273649 View commit details
    Browse the repository at this point in the history

  13. Undo some entitlement changes that were needed to create outgoing con… 

    …nections on macos.
    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    3c24a95 View commit details
    Browse the repository at this point in the history

  14. Remove a single unneeded entitlement.

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    71a751b View commit details
    Browse the repository at this point in the history

  15. Only compile OutlineCatalystApp on Catalyst.

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    9dccb61 View commit details
    Browse the repository at this point in the history

  16. Fix ios build.

    @sbruens
    sbruens committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    ef11009 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. Merge remote-tracking branch 'origin/master' into sbruens/catalyst

    @sbruens
    sbruens committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    868f11e View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Add some method docs and change methods to standalone functions where… 

    … no state is needed.
    @sbruens
    sbruens committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    44123bc View commit details
    Browse the repository at this point in the history

  2. Remove unneeded Sources sections.

    @sbruens
    sbruens committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    863ac93 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Revert "Remove unneeded Sources sections." 

    This reverts commit 863ac93.
    @sbruens
    sbruens committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    53a409e View commit details
    Browse the repository at this point in the history

  2. Remove unneeded build phases.

    @sbruens
    sbruens committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    682bd4b View commit details
    Browse the repository at this point in the history

  3. Remove seemingly unneeded info list items.

    @sbruens
    sbruens committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    767da66 View commit details
    Browse the repository at this point in the history

  4. Add the "compile sources" build phase back to the AppKitBridge bundle.

    @sbruens
    sbruens committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    351a6f9 View commit details
    Browse the repository at this point in the history

  5. Fix macos build.

    @sbruens
    sbruens committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    ce84470 View commit details
    Browse the repository at this point in the history

  6. Move OutlineCatalystApp target into OutlineAppleLib product.

    @sbruens
    sbruens committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    cb46285 View commit details
    Browse the repository at this point in the history

  7. Rely on NSNotification extension from OutlineAppleLib.

    @sbruens
    sbruens committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    fb05e14 View commit details
    Browse the repository at this point in the history

  8. Remove Tun2socks and OutlineTunnel dependency from launcher and a… 

    …dd "compile sources" buildphase back in.
    @sbruens
    sbruens committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    ecdd922 View commit details
    Browse the repository at this point in the history

  9. Select "Optimize interface for Mac" at the project level for Mac Cata… 

    …lyst.
    @sbruens
    sbruens committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    04d5a60 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. Move much of the OutlinePlugin into a Swift package, leaving only Cor… 

    …dova-specific code in the plugin, renamed as `CDVOutline`.
    @sbruens
    sbruens committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    f49f26f View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. Move status menu assets into Swift package.

    @sbruens
    sbruens committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    04370b8 View commit details
    Browse the repository at this point in the history

  2. No need to explicitly state resources for the Assets catalog as Xcode… 

    … treats these as resources automatically.
    @sbruens
    sbruens committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    1b85943 View commit details
    Browse the repository at this point in the history

  3. Update the macos client to use the renamed CDVOutline plugin.

    @sbruens
    sbruens committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    f1b83fc View commit details
    Browse the repository at this point in the history

  4. Revert OutlinePlugin changes and instead use a NSNotification tar… 

    …get.
    @sbruens
    sbruens committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    48148d7 View commit details
    Browse the repository at this point in the history

  5. OutlineNotifications to OutlineNotification.

    @sbruens
    sbruens committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    5615598 View commit details
    Browse the repository at this point in the history

  6. Add some TODOs.

    @sbruens
    sbruens committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    85c5cde View commit details
    Browse the repository at this point in the history

  7. Remove unnecessary parameter.

    @sbruens
    sbruens committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    30d7b37 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. Merge branch 'master' into sbruens/catalyst

    @sbruens
    sbruens authored Aug 17, 2023
    Configuration menu
    Copy the full SHA
    aa5bbcb View commit details
    Browse the repository at this point in the history