From f5425e59f486adb80f0a91e9d98ccf13ea38cec0 Mon Sep 17 00:00:00 2001
From: m-wayne <mwayne@scribd.com>
Date: Tue, 15 Nov 2022 12:26:28 -0800
Subject: [PATCH 1/2] add force_nuke_dist_certs param to allow nuking of
 distribution and in-house enterprise certs in non-interactive mode

---
 match/lib/match/nuke.rb    | 2 +-
 match/lib/match/options.rb | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/match/lib/match/nuke.rb b/match/lib/match/nuke.rb
index 96547492a3e..757f7a3fbd9 100644
--- a/match/lib/match/nuke.rb
+++ b/match/lib/match/nuke.rb
@@ -104,7 +104,7 @@ def spaceship_login
         Spaceship::ConnectAPI.login(params[:username], use_portal: true, use_tunes: false, portal_team_id: params[:team_id], team_name: params[:team_name])
       end
 
-      if Spaceship::ConnectAPI.client.in_house? && (type == "distribution" || type == "enterprise")
+      if Spaceship::ConnectAPI.client.in_house? && (type == "distribution" || type == "enterprise") && !params[:force_nuke_dist_certs]
         UI.error("---")
         UI.error("⚠️ Warning: This seems to be an Enterprise account!")
         unless self.safe_remove_certs
diff --git a/match/lib/match/options.rb b/match/lib/match/options.rb
index bb538eba388..f8aec13dcdc 100644
--- a/match/lib/match/options.rb
+++ b/match/lib/match/options.rb
@@ -297,6 +297,11 @@ def self.available_options
                                      description: "Disables confirmation prompts during nuke, answering them with yes",
                                      type: Boolean,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :force_nuke_dist_certs,
+                                     env_name: "MATCH_FORCE_NUKE_DIST_CERTS",
+                                     description: "Force nuke distribution and enterprise in-house certs. This will cause apps built with these certs to stop working",
+                                     type: Boolean,
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :safe_remove_certs,
                                      env_name: "MATCH_SAFE_REMOVE_CERTS",
                                      description: "Remove certs from repository during nuke without revoking them on the developer portal",

From aa3b3369bd22a4e16d44f078fb8c1f0509a50e5c Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Sun, 11 Aug 2024 01:47:04 +0000
Subject: [PATCH 2/2] fix: Gemfile to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-REXML-7577227
- https://snyk.io/vuln/SNYK-RUBY-REXML-7577228
- https://snyk.io/vuln/SNYK-RUBY-REXML-7462086
---
 Gemfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9fabd103045..433b5a64d13 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,9 +48,9 @@ gem "sinatra", [">= 2.2.3", "< 3.0"]
 # A library for stubbing and setting expectations on HTTP requests.
 gem "webmock", "~> 3.18"
 # Needed for running xcode-install related tests.
-gem "xcode-install", ">= 2.6.7"
+gem "xcode-install", ">= 2.7.0"
 # Used for xcov's parameters generation: https://github.com/fastlane/fastlane/pull/12416
-gem "xcov", "~> 1.4.1"
+gem "xcov", "~> 1.5.0"
 # A documentation generation tool for Ruby.
 gem "yard", "~> 0.9.11"