Merge branch 'main' into brindy/use-history-in-suggestions

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

.github/actions/asana-create-action-item/action.yml

@@ -44,6 +44,7 @@ runs:
         task-url: ${{ inputs.release-task-url }}
 
     - id: get-asana-user-id
+      if: github.event_name != "schedule"
       uses: duckduckgo/apple-infra/actions/asana-get-user-id-for-github-handle@main
       with:
         access-token: ${{ inputs.access-token }}

.github/actions/asana-log-message/action.yml

@@ -30,6 +30,7 @@ runs:
         task-url: ${{ inputs.task-url }}
 
     - id: get-asana-user-id
+      if: github.event_name != "schedule"
       uses: duckduckgo/apple-infra/actions/asana-get-user-id-for-github-handle@main
       with:
         access-token: ${{ inputs.access-token }}

.github/workflows/bump_internal_release.yml

@@ -2,7 +2,7 @@ name: Bump Internal Release
 
 on:
   schedule:
-    - cron: '0 7 * * 2-5' # Run at 07:00 UTC, Tuesday through Friday
+    - cron: '0 5 * * 2-5' # Run at 05:00 UTC, Tuesday through Friday
   workflow_dispatch:
     inputs:
       asana-task-url:
@@ -63,13 +63,13 @@ jobs:
             echo "skip-release=false" >> $GITHUB_OUTPUT
           else
             latest_tag="$(git describe --tags --abbrev=0)"
-            changed_files="$(git diff --name-only "$latest_tag".."origin/${release_branch}" | grep -v -E '.github|scripts')"
+            changed_files="$(git diff --name-only "$latest_tag".."origin/${release_branch}")"
 
-            if [[ ${#changed_files} == 0 ]]; then
-              echo "::warning::No changes to the release branch (or only scripts and workflows). Skipping automatic release."
-              echo "skip-release=true" >> $GITHUB_OUTPUT
-            else
+            if grep -q -v -e '.github' -e 'scripts' <<< "$changed_files"; then
               echo "skip-release=false" >> $GITHUB_OUTPUT
+            else
+              echo "::warning::No changes to the release branch (or only changes to scripts and workflows). Skipping automatic release."
+              echo "skip-release=true" >> $GITHUB_OUTPUT
             fi
           fi
 

Configuration/BuildNumber.xcconfig

@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 141
+CURRENT_PROJECT_VERSION = 143

Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig

@@ -29,7 +29,7 @@ CODE_SIGN_IDENTITY[config=Debug][sdk=macosx*] = Apple Development
 GENERATE_INFOPLIST_FILE = YES
 INFOPLIST_FILE = NetworkProtectionSystemExtension/Info.plist
 INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © 2023 DuckDuckGo. All rights reserved.
-INFOPLIST_KEY_NSSystemExtensionUsageDescription = Network Protection
+INFOPLIST_KEY_NSSystemExtensionUsageDescription = DuckDuckGo VPN
 
 FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
 FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION

Configuration/Global.xcconfig

@@ -91,7 +91,7 @@ SWIFT_COMPILATION_MODE = wholemodule
 SWIFT_COMPILATION_MODE[config=CI][arch=*][sdk=*] =
 SWIFT_COMPILATION_MODE[config=Debug][arch=*][sdk=*] =
 
-// This is temporarily set back to its default value, as a part of merging Network Protection. There are a small number of warnings introduced in
+// This is temporarily set back to its default value, as a part of merging the VPN. There are a small number of warnings introduced in
 // that feature, and more time is needed to address them. To avoid bothering other developers, this is being disabled and a task to fix it will be
 // prioritized.
 SWIFT_STRICT_CONCURRENCY = minimal;

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -32,7 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "2570250a6c9d6b0818872be3e8df0b6ee8f3a45c"
+        "revision" : "838cb53a8f7050d87ae6931b45ce126ece994359",
+        "version" : "123.0.1"
       }
     },
     {

DuckDuckGo/Application/URLEventHandler.swift

@@ -21,7 +21,7 @@ import Foundation
 import AppKit
 
 #if NETWORK_PROTECTION
-import NetworkProtection
+import NetworkProtectionUI
 #endif
 
 #if DBP

DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "QandA-128.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Common/Extensions/NSAlertExtension.swift

@@ -88,11 +88,11 @@ extension NSAlert {
 
     static func resetNetworkProtectionAlert() -> NSAlert {
         let alert = NSAlert()
-        alert.messageText = "Reset Network Protection?"
+        alert.messageText = "Reset VPN?"
         alert.informativeText = """
         This will remove your stored network configuration (including private key) and disable the VPN.
 
-        You can re-enable the VPN from the Network Protection view.
+        You can re-enable the VPN from the status view.
         """
         alert.alertStyle = .warning
         alert.addButton(withTitle: "Reset")
@@ -108,7 +108,7 @@ extension NSAlert {
         let sysExText = ""
 #endif
         alert.messageText = "Uninstall \(sysExText)Login Items?"
-        alert.informativeText = "This will remove the Network Protection \(sysExText)Status Menu icon and disable the VPN."
+        alert.informativeText = "This will remove the VPN \(sysExText)Status Menu icon and disable the VPN."
         alert.alertStyle = .warning
         alert.addButton(withTitle: "Uninstall")
         alert.addButton(withTitle: UserText.cancel)