Local PixelKit package replaced with BSK's PixelKit #2656
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
federicocappelli
changed the title
This was referenced Apr 18, 2024
federicocappelli
changed the title
# Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved # LocalPackages/DataBrokerProtection/Package.swift # LocalPackages/NetworkProtectionMac/Package.swift # LocalPackages/PixelKit/Package.swift # LocalPackages/PixelKit/Sources/PixelKit/PixelKit.swift # LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift
# Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved # DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift # LocalPackages/DataBrokerProtection/Package.swift # LocalPackages/NetworkProtectionMac/Package.swift # LocalPackages/PixelKit/Package.swift # LocalPackages/PixelKit/Sources/PixelKit/PixelKit.swift # LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift
federicocappelli
added a commit
to duckduckgo/BrowserServicesKit
that referenced
this pull request
Apr 22, 2024
Task/Issue URL: https://app.asana.com/0/1205842942115003/1206999268603553/f macOS PR: duckduckgo/macos-browser#2656 What kind of version bump will this require?: Minor (new feature) **Description**: Migration of PixelKit to BSK and adoption in macOS ONLY
aataraxiaa
approved these changes
Apr 22, 2024
| @@ -120,7 +120,7 @@ | |||
| { | |||
| "identity" : "swift-argument-parser", | |||
| "kind" : "remoteSourceControl", | |||
| "location" : "https://github.com/apple/swift-argument-parser", | |||
| "location" : "https://github.com/apple/swift-argument-parser.git", | |||
There was a problem hiding this comment.
Unrelated change, and could be removed?
There was a problem hiding this comment.
I aligned all imports on purpose, I'm getting intermittent issues in xcode 15.3 when xcode is fetching the packages, this shouldn't be a problem.
DuckDuckGo.xcodeproj/xcshareddata/xcschemes/sandbox-test-tool.xcscheme
Outdated
Show resolved
Hide resolved
# Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved # LocalPackages/DataBrokerProtection/Package.swift # LocalPackages/NetworkProtectionMac/Package.swift # LocalPackages/SubscriptionUI/Package.swift
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.
Task/Issue URL: https://app.asana.com/0/1205842942115003/1206999268603553/f
Description:
Replaced local PixelKit with BSK's PixelKit
Internal references:
Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation