Merge branch 'main' into anh/netp-feedback-form

# Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
duckduckgo · Jan 17, 2024 · 03faeb9 · 03faeb9
2 parents 2752a57 + 0631759
commit 03faeb9
Show file tree

Hide file tree

Showing 58 changed files with 4,561 additions and 1,512 deletions.
diff --git a/.github/workflows/adhoc.yml b/.github/workflows/adhoc.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   make-adhoc:
-    runs-on: macos-13
+    runs-on: macos-13-xlarge
     name: Make ad-hoc build
 
     steps:

diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
@@ -31,7 +31,7 @@ on:
 
 jobs:
   make-alpha:
-    runs-on: macos-13
+    runs-on: macos-13-xlarge
     name: Make TestFlight Alpha Build
     timeout-minutes: 30
 

diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   end-to-end-tests:
     name: End to end Tests
-    runs-on: macos-13
+    runs-on: macos-13-xlarge
 
     steps:
     - name: Check out the code
@@ -40,34 +40,38 @@ jobs:
       run: |
         set -o pipefail && xcodebuild \
           -scheme "DuckDuckGo" \
-          -destination "platform=iOS Simulator,name=iPhone 14,OS=16.4" \
+          -destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
+          ONLY_ACTIVE_ARCH=NO \
         | tee xcodebuild.log
 
     - name: Release tests
-      uses: mobile-dev-inc/action-maestro-cloud@v1.4.1
+      uses: mobile-dev-inc/action-maestro-cloud@v1.8.0
       with:
         api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
         app-file: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app
         workspace: .maestro
         include-tags: release
+        ios-version: 17
 
     - name: Privacy tests
-      uses: mobile-dev-inc/action-maestro-cloud@v1.4.1
+      uses: mobile-dev-inc/action-maestro-cloud@v1.8.0
       with:
         api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
         app-file: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app
         workspace: .maestro
         include-tags: privacy
+        ios-version: 17
 
     - name: Ad Click Detection Flow tests
-      uses: mobile-dev-inc/action-maestro-cloud@v1.4.1
+      uses: mobile-dev-inc/action-maestro-cloud@v1.8.0
       with:
         api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
         app-file: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app
         workspace: .maestro
         include-tags: adClick
+        ios-version: 17
 
     - name: Create Asana task when workflow failed
       if: ${{ failure() }}

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   atb-ui-tests:
     name: ATB UI Tests
-    runs-on: macos-13
+    runs-on: macos-13-xlarge
     timeout-minutes: 30
 
     steps:
@@ -67,7 +67,7 @@ jobs:
 
   fingerprinting-ui-tests:
     name: Fingerprinting UI Tests
-    runs-on: macos-13
+    runs-on: macos-13-xlarge
     timeout-minutes: 30
 
     steps:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ on:
 jobs:
   make-release:
     if: github.event.action == 0 || github.event.pull_request.merged == true # empty string returns 0; for case when workflow is triggered manually
-    runs-on: macos-13
+    runs-on: macos-13-xlarge
     name: Make App Store Connect Release
 
     steps:

diff --git a/.github/workflows/sync-end-to-end.yml b/.github/workflows/sync-end-to-end.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   build-for-sync-end-to-end-tests:
     name: Build for Sync End To End Tests
-    runs-on: macos-13
+    runs-on: macos-13-xlarge
     timeout-minutes: 30
 
     steps:
@@ -41,9 +41,10 @@ jobs:
       run: |
         set -o pipefail && xcodebuild \
           -scheme "DuckDuckGo" \
-          -destination "platform=iOS Simulator,name=iPhone 14" \
+          -destination "platform=iOS Simulator,name=iPhone 15" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
+          ONLY_ACTIVE_ARCH=NO \
         | tee xcodebuild.log
 
     - name: Store Binary
@@ -65,7 +66,7 @@ jobs:
   sync-end-to-end-tests:
     name: Sync End To End Tests
     needs: build-for-sync-end-to-end-tests
-    runs-on: macos-13
+    runs-on: macos-13-xlarge
     timeout-minutes: 60
     strategy:
       matrix:

diff --git a/.maestro/release_tests/bookmarks.yaml b/.maestro/release_tests/bookmarks.yaml
@@ -47,8 +47,8 @@ tags:
 # Delete bookmark
 - assertVisible: "Edit"
 - tapOn: "Edit"
-- assertVisible: "Delete Privacy Test Pages - Home"
-- tapOn: "Delete Privacy Test Pages - Home"
+- assertVisible: "Remove Privacy Test Pages - Home"
+- tapOn: "Remove Privacy Test Pages - Home"
 - assertVisible: 
     text: "Delete"
     index: 0

diff --git a/.maestro/release_tests/favorites.yaml b/.maestro/release_tests/favorites.yaml
@@ -72,8 +72,8 @@ tags:
 - assertVisible: "Bookmarks"
 - tapOn: "Bookmarks"
 - assertVisible: "Privacy Test Pages - Home"
-- assertVisible: "Delete Privacy Test Pages - Home"
-- tapOn: "Delete Privacy Test Pages - Home"
+- assertVisible: "Remove Privacy Test Pages - Home"
+- tapOn: "Remove Privacy Test Pages - Home"
 - assertVisible: 
     text: "Delete"
     index: 0

diff --git a/.maestro/shared/copy_recovery_code_from_settings.yaml b/.maestro/shared/copy_recovery_code_from_settings.yaml
@@ -6,8 +6,8 @@ appId: com.duckduckgo.mobile.ios
 - scroll
 - scroll
 - scroll
-- assertVisible: Debug Menu
-- tapOn: Debug Menu
+- assertVisible: All debug options
+- tapOn: All debug options
 - tapOn: Sync Info
 - tapOn: Paste and Copy Recovery Code
 - inputText: ${CODE}

diff --git a/.maestro/shared/set_internal_user_from_settings.yaml b/.maestro/shared/set_internal_user_from_settings.yaml
@@ -4,7 +4,9 @@ appId: com.duckduckgo.mobile.ios
 - scroll
 - scroll
 - scroll
-- assertVisible: Debug Menu
-- tapOn: Debug Menu
+- assertVisible: All debug options
+- tapOn: All debug options
 - tapOn: Internal User State
+- tapOn: Settings
+- tapOn: Done
 - tapOn: Settings
diff --git a/.maestro/shared/sync_create.yaml b/.maestro/shared/sync_create.yaml
@@ -1,12 +1,11 @@
 appId: com.duckduckgo.mobile.ios
 ---
 
-- assertVisible: Sync & Backup
 - tapOn: Sync & Backup
 - assertVisible: Sync & Backup 
 - tapOn: Sync and Back Up This Device
 - assertVisible: You can sync with your other devices later.
-- tapOn: Turn on Sync & Backup
+- tapOn: Turn On Sync & Back Up
 - assertVisible: Save Recovery Code
 - tapOn: Copy Code
 - tapOn: Next

diff --git a/.maestro/shared/sync_verify_unified_favorites.yaml b/.maestro/shared/sync_verify_unified_favorites.yaml
@@ -3,7 +3,7 @@ appId: com.duckduckgo.mobile.ios
 
 - tapOn: Sync & Backup
 - scroll
-- assertVisible: Unify Favorites
+- assertVisible: Unify Favorites Across Devices
 - tapOn:
      rightOf: 
       id: "UnifiedFavoritesToggle"

diff --git a/.maestro/sync_tests/04_sync_data.yaml b/.maestro/sync_tests/04_sync_data.yaml
@@ -23,6 +23,12 @@ tags:
 - tapOn: Close Tabs and Clear Data
 
 # Add local login
+- runFlow:
+    when:
+      visible:
+        text: "Cancel"
+    commands:
+      - tapOn: Cancel
 - tapOn: Settings
 - runFlow:
     file: ../shared/add_login_from_settings.yaml

diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 7.104.0
+MARKETING_VERSION = 7.105.0
diff --git a/Core/AppPrivacyConfigurationDataProvider.swift b/Core/AppPrivacyConfigurationDataProvider.swift
@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"f9c2a920a691b61bf84c10e9e862b1a2\""
-        public static let embeddedDataSHA = "d66de7239052da676e17c5f61dd90ffea9dd88e942c4156692e1388003b59f8d"
+        public static let embeddedDataETag = "\"489ab3f1fc4e889123d6f51a4c0aefec\""
+        public static let embeddedDataSHA = "41adeed122f363b3ec2cd3ac189468bbe68b85b44e6a6ab342950561163cc263"
     }
 
     public var embeddedDataEtag: String {

diff --git a/Core/AppTrackerDataSetProvider.swift b/Core/AppTrackerDataSetProvider.swift
@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppTrackerDataSetProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"c9e76dac56186b93f609cc9f1e8c2c0a\""
-        public static let embeddedDataSHA = "5735d4459ecdec68b70d75a3effb5c1f8f8bc18af2d05c7fd2ecae4e1d530627"
+        public static let embeddedDataETag = "\"144361b3801e3d4c33c5aff8d8de3c6b\""
+        public static let embeddedDataSHA = "0cf5a43c234d54c3168cc28a65c19b0c5804c15e87aae3e8368d2b2f775a1a8b"
     }
 
     public var embeddedDataEtag: String {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MARKETING_VERSION = 7.104.0
		MARKETING_VERSION = 7.105.0