Skip to content

Commit

Permalink
Merge branch 'main' into bunn/dbp/ui-api-changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bunn
Bunn committed Feb 14, 2024
2 parents 1b13370 + 531c0e5 commit c924c7b
Show file tree
Hide file tree
Showing 38 changed files with 1,822 additions and 1,805 deletions.
25 changes: 16 additions & 9 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@
1E0068AD2B1673BB00BBF43B /* SubscriptionUI in Frameworks */ = {isa = PBXBuildFile; productRef = 1E0068AC2B1673BB00BBF43B /* SubscriptionUI */; };
1E0C72062ABC63BD00802009 /* SubscriptionPagesUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E0C72052ABC63BD00802009 /* SubscriptionPagesUserScript.swift */; };
1E0C72072ABC63BD00802009 /* SubscriptionPagesUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E0C72052ABC63BD00802009 /* SubscriptionPagesUserScript.swift */; };
1E21F8E32B73E48600FB272E /* Subscription in Frameworks */ = {isa = PBXBuildFile; productRef = 1E21F8E22B73E48600FB272E /* Subscription */; };
1E2AE4C72ACB215900684E0A /* NetworkProtectionRemoteMessaging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCF15D62ABB8A110083F6DF /* NetworkProtectionRemoteMessaging.swift */; };
1E2AE4C82ACB216B00684E0A /* HoverTrackingArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B140872ABDBCC1004F8E85 /* HoverTrackingArea.swift */; };
1E2AE4CA2ACB21A000684E0A /* NetworkProtectionRemoteMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCF15D82ABB8A7F0083F6DF /* NetworkProtectionRemoteMessage.swift */; };
1E2AE4CB2ACB21C800684E0A /* HardwareModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9579202AC687170062CA31 /* HardwareModel.swift */; };
1E7E2E9029029A2A00C01B54 /* ContentBlockingRulesUpdateObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E7E2E8F29029A2A00C01B54 /* ContentBlockingRulesUpdateObserver.swift */; };
1E7E2E942902AC0E00C01B54 /* PrivacyDashboardPermissionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E7E2E932902AC0E00C01B54 /* PrivacyDashboardPermissionHandler.swift */; };
1E934E2B2B167CA80084722B /* Subscription in Frameworks */ = {isa = PBXBuildFile; productRef = 1E934E2A2B167CA80084722B /* Subscription */; };
1E950E3F2912A10D0051A99B /* ContentBlocking in Frameworks */ = {isa = PBXBuildFile; productRef = 1E950E3E2912A10D0051A99B /* ContentBlocking */; };
1E950E412912A10D0051A99B /* PrivacyDashboard in Frameworks */ = {isa = PBXBuildFile; productRef = 1E950E402912A10D0051A99B /* PrivacyDashboard */; };
1E950E432912A10D0051A99B /* UserScript in Frameworks */ = {isa = PBXBuildFile; productRef = 1E950E422912A10D0051A99B /* UserScript */; };
Expand Down Expand Up @@ -2165,6 +2165,9 @@
569277C529DEE09D00B633EF /* ContinueSetUpModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 569277C329DEE09D00B633EF /* ContinueSetUpModelTests.swift */; };
56B234BF2A84EFD200F2A1CC /* NavigationBarUrlExtensionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56B234BE2A84EFD200F2A1CC /* NavigationBarUrlExtensionsTests.swift */; };
56B234C02A84EFD800F2A1CC /* NavigationBarUrlExtensionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56B234BE2A84EFD200F2A1CC /* NavigationBarUrlExtensionsTests.swift */; };
56CEE90E2B7A725B00CF10AA /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 56CEE90D2B7A6DE100CF10AA /* InfoPlist.xcstrings */; };
56CEE90F2B7A725C00CF10AA /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 56CEE90D2B7A6DE100CF10AA /* InfoPlist.xcstrings */; };
56CEE9102B7A72FE00CF10AA /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 56CEE90D2B7A6DE100CF10AA /* InfoPlist.xcstrings */; };
56D145E829E6BB6300E3488A /* CapturingDataImportProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56D145E729E6BB6300E3488A /* CapturingDataImportProvider.swift */; };
56D145E929E6BB6300E3488A /* CapturingDataImportProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56D145E729E6BB6300E3488A /* CapturingDataImportProvider.swift */; };
56D145EB29E6C99B00E3488A /* DataImportStatusProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56D145EA29E6C99B00E3488A /* DataImportStatusProviding.swift */; };
Expand Down Expand Up @@ -3319,7 +3322,6 @@
1E7E2E8F29029A2A00C01B54 /* ContentBlockingRulesUpdateObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentBlockingRulesUpdateObserver.swift; sourceTree = "<group>"; };
1E7E2E932902AC0E00C01B54 /* PrivacyDashboardPermissionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyDashboardPermissionHandler.swift; sourceTree = "<group>"; };
1E862A882A9FC01200F84D4B /* SubscriptionUI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = SubscriptionUI; sourceTree = "<group>"; };
1E8F997E2B221B3600AC5D34 /* Subscription */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Subscription; sourceTree = "<group>"; };
1ED910D42B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentityTheftRestorationPagesUserScript.swift; sourceTree = "<group>"; };
310E79BE294A19A8007C49E8 /* FireproofingReferenceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FireproofingReferenceTests.swift; sourceTree = "<group>"; };
311B262628E73E0A00FD181A /* TabShadowConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabShadowConfig.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3750,6 +3752,8 @@
569277C029DDCBB500B633EF /* HomePageContinueSetUpModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageContinueSetUpModel.swift; sourceTree = "<group>"; };
569277C329DEE09D00B633EF /* ContinueSetUpModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContinueSetUpModelTests.swift; sourceTree = "<group>"; };
56B234BE2A84EFD200F2A1CC /* NavigationBarUrlExtensionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationBarUrlExtensionsTests.swift; sourceTree = "<group>"; };
56CEE9092B7A66C500CF10AA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
56CEE90D2B7A6DE100CF10AA /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = "<group>"; };
56D145E729E6BB6300E3488A /* CapturingDataImportProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CapturingDataImportProvider.swift; sourceTree = "<group>"; };
56D145EA29E6C99B00E3488A /* DataImportStatusProviding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataImportStatusProviding.swift; sourceTree = "<group>"; };
56D145ED29E6DAD900E3488A /* DataImportProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataImportProviderTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3954,7 +3958,6 @@
AA585D81248FD31100E9A3E2 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
AA585D83248FD31100E9A3E2 /* BrowserTabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowserTabViewController.swift; sourceTree = "<group>"; };
AA585D85248FD31400E9A3E2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
AA585D8A248FD31400E9A3E2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
AA585D8B248FD31400E9A3E2 /* DuckDuckGo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DuckDuckGo.entitlements; sourceTree = "<group>"; };
AA585D90248FD31400E9A3E2 /* Unit Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Unit Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
AA585D96248FD31400E9A3E2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4552,7 +4555,6 @@
buildActionMask = 2147483647;
files = (
4B957BD52AC7AE700062CA31 /* QuickLookUI.framework in Frameworks */,
1E934E2B2B167CA80084722B /* Subscription in Frameworks */,
3143C8792B0D1F3D00382627 /* DataBrokerProtection in Frameworks */,
372217842B33380E00B8E9C2 /* TestUtils in Frameworks */,
4B957BD62AC7AE700062CA31 /* LoginItems in Frameworks */,
Expand All @@ -4569,6 +4571,7 @@
4B957BE22AC7AE700062CA31 /* Sparkle in Frameworks */,
373FB4B52B4D6C57004C88D6 /* PreferencesViews in Frameworks */,
4B957BE32AC7AE700062CA31 /* Navigation in Frameworks */,
1E21F8E32B73E48600FB272E /* Subscription in Frameworks */,
4B957BE42AC7AE700062CA31 /* DDGSync in Frameworks */,
4B957BE52AC7AE700062CA31 /* OpenSSL in Frameworks */,
4B957BE62AC7AE700062CA31 /* PrivacyDashboard in Frameworks */,
Expand Down Expand Up @@ -5065,7 +5068,6 @@
4BE15DB12A0B0DD500898243 /* PixelKit */,
378F44E229B4B7B600899924 /* SwiftUIExtensions */,
37BA812B29B3CB8A0053F1A3 /* SyncUI */,
1E8F997E2B221B3600AC5D34 /* Subscription */,
1E862A882A9FC01200F84D4B /* SubscriptionUI */,
7BEC182D2AD5D89C00D30536 /* SystemExtensionManager */,
7B76E6852AD5D77600186A84 /* XPCHelper */,
Expand Down Expand Up @@ -6733,7 +6735,8 @@
4B4D609C2A0B2C2300BCD287 /* DuckDuckGo_NetP_Release.entitlements */,
4B2D06642A132F3A00DE1F49 /* NetworkProtectionAppExtension.entitlements */,
4B5F14C42A145D6A0060320F /* NetworkProtectionVPNController.entitlements */,
AA585D8A248FD31400E9A3E2 /* Info.plist */,
56CEE9092B7A66C500CF10AA /* Info.plist */,
56CEE90D2B7A6DE100CF10AA /* InfoPlist.xcstrings */,
);
path = DuckDuckGo;
sourceTree = "<group>";
Expand Down Expand Up @@ -8518,10 +8521,10 @@
7B31FD8F2AD1257B0086AA24 /* NetworkProtectionIPC */,
3143C8782B0D1F3D00382627 /* DataBrokerProtection */,
1E0068AC2B1673BB00BBF43B /* SubscriptionUI */,
1E934E2A2B167CA80084722B /* Subscription */,
37269F022B332FD8005E8E46 /* Common */,
372217832B33380E00B8E9C2 /* TestUtils */,
373FB4B42B4D6C57004C88D6 /* PreferencesViews */,
1E21F8E22B73E48600FB272E /* Subscription */,
);
productName = DuckDuckGo;
productReference = 4B957C412AC7AE700062CA31 /* DuckDuckGo Privacy Pro.app */;
Expand Down Expand Up @@ -8825,6 +8828,7 @@
3706FCB6293F65D500E42796 /* dark-shield-dot-mouse-over.json in Resources */,
3706FCB7293F65D500E42796 /* 01_Fire_really_small.json in Resources */,
3706FCB8293F65D500E42796 /* Onboarding.storyboard in Resources */,
56CEE90F2B7A725C00CF10AA /* InfoPlist.xcstrings in Resources */,
3706FCB9293F65D500E42796 /* FireproofDomains.storyboard in Resources */,
3706FCBA293F65D500E42796 /* clickToLoadConfig.json in Resources */,
3706FCBB293F65D500E42796 /* Downloads.storyboard in Resources */,
Expand Down Expand Up @@ -8952,6 +8956,7 @@
4B957BF12AC7AE700062CA31 /* dark-shield-dot-mouse-over.json in Resources */,
4B957BF22AC7AE700062CA31 /* 01_Fire_really_small.json in Resources */,
4B957BF32AC7AE700062CA31 /* Onboarding.storyboard in Resources */,
56CEE9102B7A72FE00CF10AA /* InfoPlist.xcstrings in Resources */,
4B957BF42AC7AE700062CA31 /* FireproofDomains.storyboard in Resources */,
4B957BF52AC7AE700062CA31 /* clickToLoadConfig.json in Resources */,
4B957BF62AC7AE700062CA31 /* Downloads.storyboard in Resources */,
Expand Down Expand Up @@ -9048,6 +9053,7 @@
AA7EB6ED27E880B600036718 /* dark-shield-dot-mouse-over.json in Resources */,
8511E18425F82B34002F516B /* 01_Fire_really_small.json in Resources */,
85B7184A27677C2D00B4277F /* Onboarding.storyboard in Resources */,
56CEE90E2B7A725B00CF10AA /* InfoPlist.xcstrings in Resources */,
4B0511C3262CAA5A00F6079C /* FireproofDomains.storyboard in Resources */,
EA477680272A21B700419EDA /* clickToLoadConfig.json in Resources */,
B6B1E88226D5DAC30062C350 /* Downloads.storyboard in Resources */,
Expand Down Expand Up @@ -13347,7 +13353,7 @@
repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 106.0.1;
version = 107.0.0;
};
};
AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
Expand Down Expand Up @@ -13389,8 +13395,9 @@
isa = XCSwiftPackageProductDependency;
productName = SubscriptionUI;
};
1E934E2A2B167CA80084722B /* Subscription */ = {
1E21F8E22B73E48600FB272E /* Subscription */ = {
isa = XCSwiftPackageProductDependency;
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = Subscription;
};
1E950E3E2912A10D0051A99B /* ContentBlocking */ = {
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/BrowserServicesKit",
"state" : {
"revision" : "3f5e33ec3d75dd2c130cfc6915c0a6e8efeb96f1",
"version" : "106.0.1"
"revision" : "328ce451fd1593809d1470ab5a0b5242a595f88c",
"version" : "107.0.0"
}
},
{
Expand Down
Loading

0 comments on commit c924c7b

Please sign in to comment.