Merge branch 'main' into loremattei/test-sync-e2e-on-robin

duckduckgo · Nov 20, 2024 · a7cbe8b · a7cbe8b
2 parents d081082 + 6642b4b
commit a7cbe8b
Show file tree

Hide file tree

Showing 172 changed files with 5,078 additions and 2,534 deletions.
diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
@@ -40,13 +40,6 @@ jobs:
 
     steps:
 
-    - name: Assert main branch
-      run: |
-        case "${{ github.ref }}" in
-          *main) ;;
-          *) echo "👎 Not main branch"; exit 1 ;;
-        esac
-
     - name: Register SSH keys for access to certificates
       uses: webfactory/[email protected]
       with:

diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml
@@ -42,7 +42,7 @@ jobs:
       run: |
         set -o pipefail && xcodebuild \
           -scheme "DuckDuckGo" \
-          -destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
+          -destination "platform=iOS Simulator,name=iPhone 16,OS=18.1" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
           -skipMacroValidation \
@@ -68,7 +68,7 @@ jobs:
   end-to-end-tests:
     name: End to end Tests
     needs: build-end-to-end-tests
-    runs-on: macos-14-xlarge
+    runs-on: macos-14
     timeout-minutes: 90
     strategy:
       matrix:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -44,7 +44,7 @@ jobs:
       run: |
         set -o pipefail && xcodebuild test \
           -scheme "AtbUITests" \
-          -destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
+          -destination "platform=iOS Simulator,name=iPhone 16,OS=18.1" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
           -skipMacroValidation \
@@ -87,7 +87,7 @@ jobs:
       run: |
         set -o pipefail && xcodebuild test \
           -scheme "FingerprintingUITests" \
-          -destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
+          -destination "platform=iOS Simulator,name=iPhone 16,OS=18.1" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
           -skipMacroValidation \

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -39,8 +39,8 @@ jobs:
 
     name: Unit Tests
 
-    runs-on: macos-14-xlarge
-    timeout-minutes: 15
+    runs-on: macos-15
+    timeout-minutes: 20
 
     outputs:
       commit_author: ${{ steps.fetch_commit_author.outputs.commit_author }}
@@ -79,7 +79,7 @@ jobs:
       run: |
         set -o pipefail && xcodebuild test \
           -scheme "DuckDuckGo" \
-          -destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
+          -destination "platform=iOS Simulator,name=iPhone 16,OS=18.1" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
           -skipMacroValidation \
@@ -132,7 +132,7 @@ jobs:
     # Dependabot doesn't have access to all secrets, so we skip this job
     if: github.actor != 'dependabot[bot]'
 
-    runs-on: macos-14-xlarge
+    runs-on: macos-15
     timeout-minutes: 30
 
     steps:
@@ -185,7 +185,7 @@ jobs:
 
         set -o pipefail && xcodebuild \
         -scheme "DuckDuckGo" \
-        -destination "platform=iOS Simulator,name=iPhone 15" \
+        -destination "platform=iOS Simulator,name=iPhone 16" \
         -derivedDataPath "DerivedData" \
         -configuration "Release" \
         -skipPackagePluginValidation \

diff --git a/.github/workflows/sync-end-to-end.yml b/.github/workflows/sync-end-to-end.yml
@@ -42,7 +42,7 @@ jobs:
       run: |
         set -o pipefail && xcodebuild \
           -scheme "DuckDuckGo" \
-          -destination "platform=iOS Simulator,name=iPhone 15" \
+          -destination "platform=iOS Simulator,name=iPhone 16" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
           -skipMacroValidation \
@@ -68,7 +68,7 @@ jobs:
   sync-end-to-end-tests:
     name: Sync End To End Tests
     needs: build-for-sync-end-to-end-tests
-    runs-on: macos-14-xlarge
+    runs-on: macos-14
     timeout-minutes: 90
     strategy:
       matrix:

diff --git a/.../data_clearing_tests/01_fire_proofing.yml → ...data_clearing_tests/01_fire_proofing.yaml b/.../data_clearing_tests/01_fire_proofing.yml → ...data_clearing_tests/01_fire_proofing.yaml
diff --git a/...clearing_tests/02_duckduckgo_settings.yml → ...learing_tests/02_duckduckgo_settings.yaml b/...clearing_tests/02_duckduckgo_settings.yml → ...learing_tests/02_duckduckgo_settings.yaml
diff --git a/.maestro/release_tests/emailprotection.yaml b/.maestro/release_tests/emailprotection.yaml
@@ -27,7 +27,7 @@ tags:
       - scroll
       - assertVisible: Email Protection
       - tapOn: Email Protection
-- assertVisible: Email privacy, simplified.
+- assertVisible: Email privacy, protected.
 - assertVisible:
     id: searchEntry
 - tapOn: 

diff --git a/.maestro/setup_ui_tests.sh b/.maestro/setup_ui_tests.sh
@@ -7,8 +7,8 @@ source $(dirname $0)/common.sh
 ## Constants
 
 # The simulator command requires the hyphens
-target_device="iPhone-15"
-target_os="iOS-17-0"
+target_device="iPhone-16"
+target_os="iOS-18-1"
 
 ## Functions
 
@@ -50,7 +50,7 @@ build_app() {
     echo "⏲️ Building the app"
     set -o pipefail && xcodebuild -project "$project_root"/DuckDuckGo.xcodeproj \
                                   -scheme "DuckDuckGo" \
-                                  -destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
+                                  -destination "platform=iOS Simulator,name=iPhone 16,OS=18.1" \
                                   -derivedDataPath "$derived_data_path" \
                                   -skipPackagePluginValidation \
                                   -skipMacroValidation \

diff --git a/.maestro/shared/remove_local_logins.yaml b/.maestro/shared/remove_local_logins.yaml
@@ -2,6 +2,8 @@ appId: com.duckduckgo.mobile.ios
 ---
 
 - tapOn: Settings
+- scrollUntilVisible:
+    element: Passwords
 - tapOn: Passwords
 - tapOn: Passcode field
 - inputText: "0000"
@@ -10,4 +12,4 @@ appId: com.duckduckgo.mobile.ios
 - tapOn: Delete Password
 - tapOn: Delete Password
 - tapOn: Settings
-- tapOn: Done
+- tapOn: Done
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.0.4
+3.3.4
diff --git a/.xcode-version b/.xcode-version
@@ -1 +1 @@
-15.4
+16.1
diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 7.144.0
+MARKETING_VERSION = 7.146.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 = "\"516f95a16f7a556c58e14ee6f193cc30\""
-        public static let embeddedDataSHA = "87314e1ac02784472a722844a27b443b0387a164ac72afaac00d9a70731fc572"
+        public static let embeddedDataETag = "\"d4536be677d4324aa872d0e59d6fd4fa\""
+        public static let embeddedDataSHA = "a9cce4d5c3430bc3bbca33ad26aa980dcc1c0e792b71ce2696f4483401efbf72"
     }
 
     public var embeddedDataEtag: String {

diff --git a/Core/FeatureFlag.swift b/Core/FeatureFlag.swift
@@ -45,13 +45,21 @@ public enum FeatureFlag: String {
     case onboardingAddToDock
     case autofillSurveys
     case autcompleteTabs
+    case textZoom
     case adAttributionReporting
 
     /// https://app.asana.com/0/72649045549333/1208231259093710/f
     case networkProtectionUserTips
+
+    /// https://app.asana.com/0/72649045549333/1208617860225199/f
+    case networkProtectionEnforceRoutes
 }
 
-extension FeatureFlag: FeatureFlagSourceProviding {
+extension FeatureFlag: FeatureFlagDescribing {
+    public var supportsLocalOverriding: Bool {
+        false
+    }
+
     public var source: FeatureFlagSource {
         switch self {
         case .debugMenu:
@@ -104,6 +112,10 @@ extension FeatureFlag: FeatureFlagSourceProviding {
             return .remoteReleasable(.feature(.autocompleteTabs))
         case .networkProtectionUserTips:
             return .remoteReleasable(.subfeature(NetworkProtectionSubfeature.userTips))
+        case .textZoom:
+            return .remoteReleasable(.feature(.textZoom))
+        case .networkProtectionEnforceRoutes:
+            return .remoteDevelopment(.subfeature(NetworkProtectionSubfeature.enforceRoutes))
         case .adAttributionReporting:
             return .remoteReleasable(.feature(.adAttributionReporting))
         }
@@ -112,6 +124,6 @@ extension FeatureFlag: FeatureFlagSourceProviding {
 
 extension FeatureFlagger {
     public func isFeatureOn(_ featureFlag: FeatureFlag) -> Bool {
-        return isFeatureOn(forProvider: featureFlag)
+        return isFeatureOn(for: featureFlag)
     }
 }
diff --git a/Core/Pixel.swift b/Core/Pixel.swift
@@ -86,8 +86,9 @@ public struct PixelParameters {
     public static let count = "count"
     public static let source = "source"
 
-    public static let textSizeInitial = "text_size_initial"
-    public static let textSizeUpdated = "text_size_updated"
+    // Text size is the legacy name
+    public static let textZoomInitial = "text_size_initial"
+    public static let textZoomUpdated = "text_size_updated"
 
     public static let canAutoPreviewMIMEType = "can_auto_preview_mime_type"
     public static let mimeType = "mime_type"
@@ -142,6 +143,7 @@ public struct PixelParameters {
     public static let adAttributionKeywordID = "keyword_id"
     public static let adAttributionAdID = "ad_id"
     public static let adAttributionToken = "attribution_token"
+    public static let adAttributionIsReinstall = "is_reinstall"
 
     // Autofill
     public static let countBucket = "count_bucket"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MARKETING_VERSION = 7.144.0
		MARKETING_VERSION = 7.146.0