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.

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

Fix NetP iOS incompatibility #418

Merged
merged 1 commit into from
Jul 17, 2023
Merged

Conversation

graeme
Copy link
Contributor

@graeme graeme commented Jul 14, 2023

Please review the release process for BrowserServicesKit here.

Required:

Task/Issue URL: https://app.asana.com/0/0/1205043071738197/f
iOS PR: duckduckgo/iOS#1835
macOS PR: duckduckgo/macos-browser#1356
What kind of version bump will this require?: Minor

Optional:

Tech Design URL:
CC:

Description:

Sadly, on trying to open the linked iOS PR (which wasn’t supposed to need BSK changes), I hit a snag as some iOS incompatible changes made there way into BSK and didn’t get caught by CI (it wasn’t actually being used yet on iOS for the sake of keeping PRs manageable, so it didn’t get caught in the app either). So when I went to create my final PR, it wasn't compiling.

Steps to test this PR:

  1. Just build the related iOS PR

OS Testing:

  • iOS 14
  • iOS 15
  • iOS 16
  • macOS 10.15
  • macOS 11
  • macOS 12

Internal references:

Software Engineering Expectations
Technical Design Template

@graeme graeme self-assigned this Jul 14, 2023
@graeme graeme marked this pull request as ready for review July 14, 2023 18:10
@@ -21,18 +21,6 @@ import Common

#if os(macOS)

fileprivate extension Bundle {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is called from iOS so, for now, needs to be outside of the macOS compiler-flagged code

Copy link
Contributor

@diegoreymendez diegoreymendez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Builds fine and changes look fine.

@graeme graeme merged commit 84cf076 into main Jul 17, 2023
@graeme graeme deleted the graeme/fix-ios-netp-incompatibility branch July 17, 2023 11:28
graeme added a commit to duckduckgo/iOS that referenced this pull request Jul 17, 2023
Task/Issue URL: https://app.asana.com/0/0/1205043071738197/f
BSK PR: duckduckgo/BrowserServicesKit#418

Description:

Adds the initial classes needed for the PacketTunnelProvider extension and for controlling it from the iOS app along with some configuration. This PR also brings in the NetP iOS compatibility changes needed after some incompatibility was merged.

Note that until we’re ready to release, the extension will remain not embedded in the app and any Network Extension code will be compiler flagged
samsymons added a commit that referenced this pull request Jul 20, 2023
* main:
  Fix publisher, add option to override internal user state in debug  (#422)
  Removes unused code and makes some other code platform specific (#419)
  Optimize first load of Content Rule Lists (#406)
  Automatically add the PR link to the Asana task (#311)
  NetP: Move bundle prefix to x-platform code (#418)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants