From 7047b3aebab67361147365257a37d9c56f03eb8a Mon Sep 17 00:00:00 2001
From: Anka <runner@Mac-1733243531133.local>
Date: Tue, 3 Dec 2024 17:51:06 +0000
Subject: [PATCH 1/4] Bump version to 1.116.0 (322)

---
 Configuration/BuildNumber.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
index 94e0f85601..5cd7b2a815 100644
--- a/Configuration/BuildNumber.xcconfig
+++ b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 319
+CURRENT_PROJECT_VERSION = 322

From 81ba2ef6a13322ec2f19efd128055c8e660d3e07 Mon Sep 17 00:00:00 2001
From: Anh Do <18567+quanganhdo@users.noreply.github.com>
Date: Tue, 3 Dec 2024 13:08:19 -0500
Subject: [PATCH 2/4] Hotfix for schedulingConfig decoding issue (#3624)

Task/Issue URL: https://app.asana.com/0/0/1208895860990675/f
Tech Design URL:
CC:

**Description**:

This fixes an error with JSON decoding preventing PIR to save profile.

**Optional E2E tests**:
- [x] Run PIR E2E tests
Check this to run the Personal Information Removal end to end tests. If
updating CCF, or any PIR related code, tick this.

**Steps to test this PR**:
1. Test PIR on a fresh install
2. Test PIR on macOS 1.115.0 upgrading to this version

<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

**Definition of Done**:

* [ ] Does this PR satisfy our [Definition of
Done](https://app.asana.com/0/1202500774821704/1207634633537039/f)?

---
###### Internal references:
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
---
 .../Sources/DataBrokerProtection/Model/DataBroker.swift    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift
index 269eea17d8..4d87ae1416 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift
@@ -174,7 +174,12 @@ public struct DataBroker: Codable, Sendable {
 
         version = try container.decode(String.self, forKey: .version)
         steps = try container.decode([Step].self, forKey: .steps)
-        schedulingConfig = try container.decode(DataBrokerScheduleConfig.self, forKey: .schedulingConfig)
+        // Hotfix for https://app.asana.com/0/1203581873609357/1208895331283089/f
+        do {
+            schedulingConfig = try container.decode(DataBrokerScheduleConfig.self, forKey: .schedulingConfig)
+        } catch {
+            schedulingConfig = .init(retryError: 48, confirmOptOutScan: 72, maintenanceScan: 120, maxAttempts: -1)
+        }
         parent = try? container.decode(String.self, forKey: .parent)
 
         do {

From c7897fdbbff4d4d60763570acf922fd2f49553c4 Mon Sep 17 00:00:00 2001
From: Dominik Kapusta <dkapusta@duckduckgo.com>
Date: Tue, 3 Dec 2024 20:15:56 +0100
Subject: [PATCH 3/4] Bump version to 1.116.1

---
 Configuration/Version.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
index 479264e8ce..243b724e80 100644
--- a/Configuration/Version.xcconfig
+++ b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 1.116.0
+MARKETING_VERSION = 1.116.1

From ab743e6609d3f4c37e404fc26d451465b7ba0d70 Mon Sep 17 00:00:00 2001
From: Anka <runner@Mac-1733247145481.local>
Date: Tue, 3 Dec 2024 20:00:08 +0000
Subject: [PATCH 4/4] Bump version to 1.117.0 (323)

---
 Configuration/BuildNumber.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
index 5cd7b2a815..713e7c5da5 100644
--- a/Configuration/BuildNumber.xcconfig
+++ b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 322
+CURRENT_PROJECT_VERSION = 323