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

Update BSK to include latest macOS changes #2588

Merged
merged 3 commits into from
Mar 14, 2024
Merged

Conversation

diegoreymendez
Copy link
Contributor

@diegoreymendez diegoreymendez commented Mar 13, 2024

Task/Issue URL: https://app.asana.com/0/414235014887631/1206800069675133/f

macOS: duckduckgo/macos-browser#2392
BSK: duckduckgo/BrowserServicesKit#721

Description

Updates BSK, but the changes are for macOS only.

Testing

Make sure CI is green.


Internal references:

Software Engineering Expectations
Technical Design Template

@diegoreymendez diegoreymendez marked this pull request as ready for review March 14, 2024 08:51
@diegoreymendez diegoreymendez requested a review from ayoy March 14, 2024 08:51
Copy link
Contributor

@ayoy ayoy left a comment

Choose a reason for hiding this comment

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

LGTM 👍

diegoreymendez added a commit to duckduckgo/BrowserServicesKit that referenced this pull request Mar 14, 2024
Task/Issue URL: https://app.asana.com/0/0/1206800069675133/f

iOS PR: duckduckgo/iOS#2588
macOS PR: duckduckgo/macos-browser#2392
What kind of version bump will this require?: Major/Minor/Patch

## Description

Moves `AppLaunching` out of BSK as it's macOS only.

This BSK update is only needed to move `AppLaunching` out of here since it's really annoying to have to do BSK updates for it.  It's not used in iOS at all.

This BSK update is only needed to move AppLaunching out of here since it's really annoying to have to do BSK updates for it. It's not used in iOS at all.
@diegoreymendez
Copy link
Contributor Author

Thanks!

diegoreymendez added a commit to duckduckgo/macos-browser that referenced this pull request Mar 14, 2024
Task/Issue URL: https://app.asana.com/0/0/1206800069675133/f

iOS: duckduckgo/iOS#2588
BSK: duckduckgo/BrowserServicesKit#721

## Description

Updates the copy from "Network Protection" to "VPN" or "DuckDuckGo VPN"
@diegoreymendez diegoreymendez merged commit 1b95f60 into main Mar 14, 2024
13 checks passed
@diegoreymendez diegoreymendez deleted the diego/update-bsk branch March 14, 2024 09:42
samsymons added a commit that referenced this pull request Mar 18, 2024
* main:
  Update wireguard-apple to 1.1.3 (#2598)
  Updates BSK to include latest changes (#2604)
  Fix VPN feedback form description (#2606)
  Fixes the name of a pixel (#2575)
  22. Subscription- Cleanup and minor updates (#2596)
  Release 7.112.0-3 (#2602)
  update embedded file
  Bump autoconsent to 10.3.0 (#2601)
  Roll back CPM post-rollout cleanup (#2599)
  Stub objects for Bookmarks DB (#2593)
  Subscriptions - 21. Manage Billing options to third parties (#2574)
  17. Subscription Review Fixes (#2547)
  bump bsk to fix retain cycle (#2595)
  New log for SKAd 4 integration (#2594)
  NetP x Subscription Clean-up (#2565)
  Update BSK to include latest macOS changes (#2588)
samsymons added a commit that referenced this pull request Mar 18, 2024
…-lottie-animation

* sam/vpn-ui-improvements:
  Update wireguard-apple to 1.1.3 (#2598)
  Updates BSK to include latest changes (#2604)
  Fix VPN feedback form description (#2606)
  Fixes the name of a pixel (#2575)
  22. Subscription- Cleanup and minor updates (#2596)
  Release 7.112.0-3 (#2602)
  update embedded file
  Bump autoconsent to 10.3.0 (#2601)
  Roll back CPM post-rollout cleanup (#2599)
  Stub objects for Bookmarks DB (#2593)
  Subscriptions - 21. Manage Billing options to third parties (#2574)
  17. Subscription Review Fixes (#2547)
  bump bsk to fix retain cycle (#2595)
  New log for SKAd 4 integration (#2594)
  NetP x Subscription Clean-up (#2565)
  Update BSK to include latest macOS changes (#2588)
samsymons added a commit that referenced this pull request Mar 18, 2024
…n-ui-improvements-3-combine-notification-settings

* sam/vpn-ui-improvements-2-lottie-animation:
  Update wireguard-apple to 1.1.3 (#2598)
  Updates BSK to include latest changes (#2604)
  Fix VPN feedback form description (#2606)
  Fixes the name of a pixel (#2575)
  22. Subscription- Cleanup and minor updates (#2596)
  Release 7.112.0-3 (#2602)
  update embedded file
  Bump autoconsent to 10.3.0 (#2601)
  Roll back CPM post-rollout cleanup (#2599)
  Stub objects for Bookmarks DB (#2593)
  Subscriptions - 21. Manage Billing options to third parties (#2574)
  17. Subscription Review Fixes (#2547)
  bump bsk to fix retain cycle (#2595)
  New log for SKAd 4 integration (#2594)
  NetP x Subscription Clean-up (#2565)
  Update BSK to include latest macOS changes (#2588)
samsymons added a commit that referenced this pull request Mar 18, 2024
…' into sam/vpn-ui-improvements-4-location-setting-change

# By Daniel Bernal (3) and others
# Via Sam Symons (3) and GitHub (1)
* sam/vpn-ui-improvements-3-combine-notification-settings:
  Update wireguard-apple to 1.1.3 (#2598)
  Updates BSK to include latest changes (#2604)
  Fix VPN feedback form description (#2606)
  Fixes the name of a pixel (#2575)
  22. Subscription- Cleanup and minor updates (#2596)
  Release 7.112.0-3 (#2602)
  update embedded file
  Bump autoconsent to 10.3.0 (#2601)
  Roll back CPM post-rollout cleanup (#2599)
  Stub objects for Bookmarks DB (#2593)
  Subscriptions - 21. Manage Billing options to third parties (#2574)
  17. Subscription Review Fixes (#2547)
  bump bsk to fix retain cycle (#2595)
  New log for SKAd 4 integration (#2594)
  NetP x Subscription Clean-up (#2565)
  Update BSK to include latest macOS changes (#2588)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons added a commit that referenced this pull request Mar 18, 2024
* main: (31 commits)
  Use History in Suggestions on iOS (#2552)
  Update wireguard-apple to 1.1.3 (#2598)
  Updates BSK to include latest changes (#2604)
  Fix VPN feedback form description (#2606)
  Fixes the name of a pixel (#2575)
  22. Subscription- Cleanup and minor updates (#2596)
  Release 7.112.0-3 (#2602)
  update embedded file
  Bump autoconsent to 10.3.0 (#2601)
  Roll back CPM post-rollout cleanup (#2599)
  Stub objects for Bookmarks DB (#2593)
  Subscriptions - 21. Manage Billing options to third parties (#2574)
  17. Subscription Review Fixes (#2547)
  bump bsk to fix retain cycle (#2595)
  New log for SKAd 4 integration (#2594)
  NetP x Subscription Clean-up (#2565)
  Update BSK to include latest macOS changes (#2588)
  rollback #URL macro (#2585)
  Release 7.112.0-2 (#2579)
  Updates BSK (#2577)
  ...
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