Merge branch 'dominik/bump-internal-ng' into dominik/test-base-branch

duckduckgo · Mar 4, 2024 · 25743e9 · 25743e9
2 parents efe2f47 + 145613d
commit 25743e9
Show file tree

Hide file tree

Showing 227 changed files with 4,680 additions and 2,581 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,6 +41,7 @@ playground.xcworkspace
 # Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
 # hence it is not needed unless you have added a package configuration file to your project
 # .swiftpm
+LocalPackages/*/Package.resolved
 
 .build/
 

diff --git a/.xcode-version b/.xcode-version
@@ -1 +1 @@
-15.1
+15.2
diff --git a/Configuration/UITests/UITests.xcconfig b/Configuration/UITests/UITests.xcconfig
@@ -15,17 +15,22 @@
 
 #include "../Common.xcconfig"
 
-CODE_SIGN_STYLE = Automatic
 CODE_SIGN_IDENTITY[config=CI][sdk=macosx*] =
-
+CODE_SIGN_STYLE[config=CI][sdk=macosx*] = Manual
+CODE_SIGNING_ALLOWED[config=CI][sdk=macosx*] = NO
+COPY_PHASE_STRIP = NO
 DEAD_CODE_STRIPPING = YES
+DEVELOPMENT_TEAM[config=CI][sdk=macosx*] =
+ENABLE_USER_SCRIPT_SANDBOXING = YES
+GCC_NO_COMMON_BLOCKS = YES
+GENERATE_INFOPLIST_FILE = YES
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks
+LOCALIZATION_PREFERS_STRING_CATALOGS = YES
 
 MACOSX_DEPLOYMENT_TARGET = 11.4
 
-INFOPLIST_FILE = UI Tests/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.UI-Tests
 PRODUCT_NAME = $(TARGET_NAME)
-
-TEST_TARGET_NAME = DuckDuckGo
-
-LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] =
+SWIFT_EMIT_LOC_STRINGS = NO
+TEST_TARGET_NAME = DuckDuckGo Privacy Browser
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,14 @@
 {
   "pins" : [
+    {
+      "identity" : "apple-toolbox",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/duckduckgo/apple-toolbox.git",
+      "state" : {
+        "revision" : "e3dc4faf70ca09718a2d20d5c47b449389e8c153",
+        "version" : "1.0.0"
+      }
+    },
     {
       "identity" : "bloom_cpp",
       "kind" : "remoteSourceControl",
@@ -14,17 +23,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "68b7b5ae15073b16092f0fb3db218a4d11e80a06",
-        "version" : "111.1.1-1"
+        "revision" : "045a8782c3dbbf79fc088b38120dea1efadc13e1",
+        "version" : "114.1.0"
       }
     },
     {
       "identity" : "content-scope-scripts",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "36ddba2cbac52a41b9a9275af06d32fa8a56d2d7",
-        "version" : "4.64.0"
+        "revision" : "a3690b7666a3617693383d948cb492513f6aa569",
+        "version" : "5.0.0"
       }
     },
     {

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser App Store.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser App Store.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1410"
+   LastUpgradeVersion = "1520"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -133,12 +133,6 @@
                <Test
                   Identifier = "EncryptionKeyStoreTests">
                </Test>
-               <Test
-                  Identifier = "ErrorPageTests/testWhenLoadingFailsAfterSessionRestoration_navigationHistoryIsPreserved()">
-               </Test>
-               <Test
-                  Identifier = "ErrorPageTests/testWhenPageLoadedAndFailsOnRefreshAndOnConsequentRefresh_errorPageIsUpdatedKeepingForwardHistory()">
-               </Test>
                <Test
                   Identifier = "HTTPSUpgradeIntegrationTests">
                </Test>

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1520"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -144,18 +144,9 @@
                <Test
                   Identifier = "CoreDataEncryptionTests/testSavingIncorrectValueTypes()">
                </Test>
-               <Test
-                  Identifier = "DownloadsIntegrationTests/testWhenNavigationActionIsData_downloadStarts()">
-               </Test>
                <Test
                   Identifier = "EncryptionKeyStoreTests">
                </Test>
-               <Test
-                  Identifier = "ErrorPageTests/testWhenGoingBackToFailingPage_reloadIsTriggered()">
-               </Test>
-               <Test
-                  Identifier = "ErrorPageTests/testWhenTabWithNoConnectionErrorActivated_reloadTriggered()">
-               </Test>
                <Test
                   Identifier = "HTTPSUpgradeIntegrationTests">
                </Test>
@@ -165,9 +156,6 @@
                <Test
                   Identifier = "NavigationProtectionIntegrationTests/testReferrerTrimming()">
                </Test>
-               <Test
-                  Identifier = "SearchNonexistentDomainTests/testWhenNonexistentDomainSuggestionChosen_redirectedToSERP()">
-               </Test>
             </SkippedTests>
          </TestableReference>
          <TestableReference

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Pro.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Pro.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGoDBPTests.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGoDBPTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGoNotifications.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGoNotifications.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGoVPN.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGoVPN.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1520"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGoVPNAppStore.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGoVPNAppStore.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1520"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Integration Tests.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Integration Tests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/NetworkProtectionExtension.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/NetworkProtectionExtension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1410"
+   LastUpgradeVersion = "1520"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Product Review Release App Store.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Product Review Release App Store.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Product Review Release.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Product Review Release.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Pull Request Testing with TSan.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Pull Request Testing with TSan.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1520"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Sync End-to-End UI Tests App Store.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Sync End-to-End UI Tests App Store.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1520"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Sync End-to-End UI Tests.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Sync End-to-End UI Tests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1520"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/tests-server.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/tests-server.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo/Application/AppDelegate.swift b/DuckDuckGo/Application/AppDelegate.swift
@@ -30,6 +30,7 @@ import ServiceManagement
 import SyncDataProviders
 import UserNotifications
 import PixelKit
+import History
 
 #if NETWORK_PROTECTION
 import NetworkProtection
@@ -204,7 +205,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
             didFinishLaunching = true
         }
 
-        HistoryCoordinator.shared.loadHistory()
+        HistoryCoordinator.shared.loadHistory {
+            HistoryCoordinator.shared.migrateModelV5toV6IfNeeded()
+        }
+
         PrivacyFeatures.httpsUpgrade.loadDataAsync()
         bookmarksManager.loadBookmarks()
         if case .normal = NSApp.runType {
@@ -233,7 +237,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
 
         startupSync()
 
-        stateRestorationManager.applicationDidFinishLaunching()
+        if [.normal, .uiTests].contains(NSApp.runType) {
+            stateRestorationManager.applicationDidFinishLaunching()
+        }
 
         BWManager.shared.initCommunication()
 
@@ -274,7 +280,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
 
 #if SUBSCRIPTION
         Task {
-            var defaultEnvironment = SubscriptionPurchaseEnvironment.ServiceEnvironment.default
+            let defaultEnvironment = SubscriptionPurchaseEnvironment.ServiceEnvironment.default
 
             let currentEnvironment = UserDefaultsWrapper(key: .subscriptionEnvironment,
                                                          defaultValue: defaultEnvironment).wrappedValue

diff --git a/DuckDuckGo/Bookmarks/Legacy/Bookmark.xcdatamodeld/Bookmark 3.xcdatamodel/contents b/DuckDuckGo/Bookmarks/Legacy/Bookmark.xcdatamodeld/Bookmark 3.xcdatamodel/contents
@@ -1,13 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21512" systemVersion="22A380" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22522" systemVersion="23C71" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="BookmarkManagedObject" representedClassName="BookmarkManagedObject" syncable="YES" codeGenerationType="class">
         <attribute name="dateAdded" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="faviconEncrypted" optional="YES" attributeType="Transformable" valueTransformerName="NSImageTransformer"/>
+        <attribute name="faviconEncrypted" optional="YES" attributeType="Transformable" valueTransformerName="">
+            <userInfo>
+                <entry key="transformer" value="NSImageTransformer"/>
+            </userInfo>
+        </attribute>
         <attribute name="id" attributeType="UUID" usesScalarValueType="NO"/>
         <attribute name="isFavorite" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
         <attribute name="isFolder" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
-        <attribute name="titleEncrypted" attributeType="Transformable" valueTransformerName="NSStringTransformer"/>
-        <attribute name="urlEncrypted" optional="YES" attributeType="Transformable" valueTransformerName="NSURLTransformer"/>
+        <attribute name="titleEncrypted" attributeType="Transformable" valueTransformerName="">
+            <userInfo>
+                <entry key="transformer" value="NSStringTransformer"/>
+            </userInfo>
+        </attribute>
+        <attribute name="urlEncrypted" optional="YES" attributeType="Transformable" valueTransformerName="">
+            <userInfo>
+                <entry key="transformer" value="NSURLTransformer"/>
+            </userInfo>
+        </attribute>
         <relationship name="children" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="BookmarkManagedObject" inverseName="parentFolder" inverseEntity="BookmarkManagedObject"/>
         <relationship name="favorites" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="BookmarkManagedObject" inverseName="favoritesFolder" inverseEntity="BookmarkManagedObject"/>
         <relationship name="favoritesFolder" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="BookmarkManagedObject" inverseName="favorites" inverseEntity="BookmarkManagedObject"/>

diff --git a/DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift
@@ -228,9 +228,7 @@ final class BookmarkManagementDetailViewController: NSViewController, NSMenuItem
         emptyState.centerXAnchor.constraint(equalTo: separator.centerXAnchor).isActive = true
 
         newBookmarkButton.heightAnchor.constraint(equalToConstant: 24).isActive = true
-        newBookmarkButton.widthAnchor.constraint(equalToConstant: 130).isActive = true
 
-        newFolderButton.widthAnchor.constraint(equalToConstant: 110).isActive = true
         newFolderButton.heightAnchor.constraint(equalToConstant: 24).isActive = true
 
         emptyStateMessage.centerXAnchor.constraint(equalTo: emptyState.centerXAnchor).isActive = true