feat(cordova/apple/ios): add mac catalyst support #1630
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportPatch coverage has no change and project coverage change:
Additional details and impacted files@@ Coverage Diff @@
## master #1630 +/- ##
========================================
+ Coverage 15% 36% +21%
========================================
Files 6 45 +39
Lines 806 2749 +1943
Branches 0 312 +312
========================================
+ Hits 121 1006 +885
- Misses 685 1743 +1058
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
… of `./platforms/ios/`.
…ion for catalyst.
…appear in the Dock.
…ease. Previously set it on the `Debug` build, but need to also set it on `Release` build.
…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.
We set the launcher as a login item in Catalyst, and open the app if there Outline was connected at shutdown.
fortuna
reviewed
Aug 9, 2023
…dd "compile sources" buildphase back in.
fortuna
reviewed
Aug 9, 2023
src/cordova/apple/OutlineAppleLib/Sources/OutlineAppKitBridge/StatusItemController.swift
Outdated
Show resolved
Hide resolved
…dova-specific code in the plugin, renamed as `CDVOutline`.
… treats these as resources automatically.
fortuna
requested changes
Aug 15, 2023
src/cordova/apple/ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
Outdated
Show resolved
Hide resolved
src/cordova/apple/OutlineAppleLib/Sources/OutlinePlugin/OutlinePlugin.swift
Outdated
Show resolved
Hide resolved
src/cordova/apple/OutlineAppleLib/Sources/OutlinePlugin/NSNotification+OutlinePlugin.swift
Outdated
Show resolved
Hide resolved
fortuna
reviewed
Aug 15, 2023
src/cordova/apple/OutlineAppleLib/Sources/OutlineAppKitBridge/AppKitBridgeProtocol.swift
Outdated
Show resolved
Hide resolved
src/cordova/apple/xcode/macos/Outline.xcodeproj/project.pbxproj
Outdated
Show resolved
Hide resolved
fortuna
approved these changes
Aug 16, 2023
sbruens
added a commit
that referenced
this pull request
Aug 17, 2023
* Replace the `copy-www-build-step` script with build phases. * Add Mac Catalyst as a destination. * Update README to load xcworkspace from `./src/cordova/apple/` instead of `./platforms/ios/`. * Set separate bundle identifier for the Mac app built with Mac Catalyst. * Add `Package.resolved` back. It was likely accidentally removed in #1536. * Update local storage source directory for UIWebView->WKWebView migration for catalyst. * Pin `cordova-ios` dep to fix for splashscreen aspect ratio. * Rename `Images.xcassets` to `Assets.xcassets`. * Add the status bar button images. * Use `LSUIElement` to indicate this is a background app and shouldn't appear in the Dock. * Add an AppKit bridge and use it to create a status bar menu in catalyst. * Re-open the application window when use selects "Open" command from the status menu. * Stop any VPN connections on app termination. * Use `clang-format` to format Objective-C files. * Use `SwiftFormat` to format Swift files. * Set separate bundle identifier for the Mac Catalyst app built for release. Previously set it on the `Debug` build, but need to also set it on `Release` build. * Configure the app window to be a specific size. * Enable the embedded app launcher as a login item. * Use the macos app group in `PacketTunnelProvider` when on Catalyst. * Add some logs to the `OutlineStatusItemController` for easier debugging. * Do not try and add a `StatusItemController` automatically on AppKitBridge 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. * Ignore locally loaded XCFramework bundles. * 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. * Run `clang-format` over `.m` files. * Ensure Sentry logs the right app group on Catalyst. * Run macos code on Catalyst in a few more places. * Do not run some code for `macOS` on `Catalyst`. * Add prefix to log message for consistency. * Use the `NETunnelProviderManager` to determine whether Outline was connected and the launcher should launch the application. * Automatic project data changes made by Xcode. * Set miminum macos deployment target to 10.15. * Set bundle ID for launcher to `launcher3`. * Move `AppDelegate` logic to category extension instead of overwriting the `AppDelegate` file auto-generated by Cordova. * Move Catalyst specific `AppDelegate` code to Swift. * Use `SwiftFormat` to format Swift files. * Replace `NSLog` with `DDLog`. * Use `SwiftFormat` to format Swift files. * Fix notifications for macos bundle and undo formatting to make the diff smaller. * Remove local `Tun2socks.xcframework` which got accidentally committed. * Undo README changes as they have already been updated in a previous PR. * Move catalyst code into `OutlineAppleLib`. * Remove reference to `OutlineLauncher`'s plist. * Fix some bad merges. * Remove an unnecessary `#if` guard. * Add a TODO to i18n the menu strings, which will happen in a fast-follow. * Review changes. * More changes for review. * Mark static function as public. * More changes. * Use enum instead of boolean to represent connection status. * Clean up some entitlement changes that aren't actually needed. * Undo some entitlement changes that were needed to create outgoing connections on macos. * Remove a single unneeded entitlement. * Only compile `OutlineCatalystApp` on Catalyst. * Fix ios build. * Add some method docs and change methods to standalone functions where no state is needed. * Remove unneeded `Sources` sections. * Revert "Remove unneeded `Sources` sections." This reverts commit 863ac93. * Remove unneeded build phases. * Remove seemingly unneeded info list items. * Add the "compile sources" build phase back to the `AppKitBridge` bundle. * Fix macos build. * Move `OutlineCatalystApp` target into `OutlineAppleLib` product. * Rely on `NSNotification` extension from `OutlineAppleLib`. * Remove `Tun2socks` and `OutlineTunnel` dependency from launcher and add "compile sources" buildphase back in. * Select "Optimize interface for Mac" at the project level for Mac Catalyst. * Move much of the OutlinePlugin into a Swift package, leaving only Cordova-specific code in the plugin, renamed as `CDVOutline`. * Move status menu assets into Swift package. * No need to explicitly state resources for the Assets catalog as Xcode treats these as resources automatically. * Update the macos client to use the renamed `CDVOutline` plugin. * Revert `OutlinePlugin` changes and instead use a `NSNotification` target. * `OutlineNotifications` to `OutlineNotification`. * Add some TODOs. * Remove unnecessary parameter.
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.