Merge branch 'main' into brindy/pull-to-refresh

duckduckgo · Jan 16, 2024 · c3112f7 · c3112f7
2 parents 6805839 + 92078b0
commit c3112f7
Show file tree

Hide file tree

Showing 11 changed files with 1,690 additions and 1,436 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/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/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