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 to the latest BSK branch #414

Merged
merged 1 commit into from
Feb 3, 2022
Merged

Update to the latest BSK branch #414

merged 1 commit into from
Feb 3, 2022

Conversation

samsymons
Copy link
Collaborator

Task/Issue URL: https://app.asana.com/0/1199230911884351/1201761380785255/f
Tech Design URL:
CC: @bwaresiak

Description:

This PR updates the app to point to the latest BSK branch.

This was changed earlier today to point to duckduckgo/BrowserServicesKit#58 for testing purposes, but the change had been merged before the custom branch had been swapped back to friends-and-family. This PR fixes that 🙂

Steps to test this PR:

  1. Be sure the app fetches dependencies and builds/runs

Testing checklist:

  • Test with Release configuration

Internal references:

Software Engineering Expectations
Technical Design Template
When ready for review, remember to post the PR in MM

Comment on lines -66 to -74
},
{
"package": "TrackerRadarKit",
"repositoryURL": "https://github.com/duckduckgo/TrackerRadarKit.git",
"state": {
"branch": null,
"revision": "5f4caf35b8418700a48c64c7c61eb43308c8dacc",
"version": "1.0.3"
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I don't entirely follow why this was removed by Xcode - the app still builds and runs fine, and running Resolve Package Versions doesn't bring it back. 🤷

Copy link
Collaborator

@mallexxx mallexxx left a comment

Choose a reason for hiding this comment

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

LGTM, I'll proceed merging this to fix build

@mallexxx mallexxx merged commit f124f1a into develop Feb 3, 2022
@mallexxx mallexxx deleted the sam/update-bsk-branch branch February 3, 2022 07:06
samsymons added a commit that referenced this pull request Feb 9, 2022
# By Alexey Martemyanov (2) and others
# Via GitHub
* develop:
  Replace Burn and Fireproof icons (#416)
  don't disable the UI unless onboarding has been marked as finished (#420)
  fix nested RunLoop waiting (#422)
  Version 0.18.6
  Tweaks of suggestions and autocomplete (#403)
  Bump privacy dashboard to latest version (#409)
  Point to the latest BrowserServicesKit branch. (#414)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons added a commit that referenced this pull request Feb 18, 2022
# By Alexey Martemyanov (20) and others
# Via Tomas Strba (2) and others
* develop: (63 commits)
  Tweaks of suggestions and autocomplete (#403)
  Bump privacy dashboard to latest version (#409)
  Point to the latest BrowserServicesKit branch. (#414)
  Move embedded TDS from BSK to platform repo (#412)
  Image of shield with dot replaced (#410)
  Expand Fireproofing to include Local Storage and IndexedDB (#408)
  Version 0.18.5
  support privacy config for clickToLoad (#407)
  Automatically select available login (#405)
  initial FB Click to Load (WIP) (#329)
  onboarding updates (#398)
  Version 0.18.4
  Configuration of Sparkle - Setting SUAllowsAutomaticUpdates to NO (#404)
  Hide downloads button if the popover is opened/closed manually (#397)
  Textfield of the homepage is empty and unfocused right after switching to the homepage (#400)
  Remove navigatorCredentials (#392)
  Remove GPC header if it exists when not needed (#366)
  Version 0.18.3
  Fireproofing encrypted storage (#332)
  Fix Lock Screen UI issues (#399)
  ...

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo/Crash Reports/Model/CrashReportSender.swift
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