Remove option conflicts

fastlane · Oct 1, 2020 · e67ab0e · e67ab0e
1 parent d108865
commit e67ab0e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/cert/lib/cert/options.rb b/cert/lib/cert/options.rb
@@ -41,7 +41,7 @@ def self.available_options
                                      env_name: "DELIVER_API_KEY_PATH",
                                      description: "Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)",
                                      optional: true,
-                                     conflicting_options: [:username],
+                                     conflicting_options: [:api_key],
                                      verify_block: proc do |value|
                                        UI.user_error!("Couldn't find API key JSON file at path '#{value}'") unless File.exist?(value)
                                      end),
@@ -51,7 +51,7 @@ def self.available_options
                                      type: Hash,
                                      optional: true,
                                      sensitive: true,
-                                     conflicting_options: [:api_key_path, :username]),
+                                     conflicting_options: [:api_key_path]),
 
         # Apple ID
         FastlaneCore::ConfigItem.new(key: :username,

diff --git a/deliver/lib/deliver/options.rb b/deliver/lib/deliver/options.rb
@@ -16,7 +16,7 @@ def self.available_options
                                      env_name: "DELIVER_API_KEY_PATH",
                                      description: "Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)",
                                      optional: true,
-                                     conflicting_options: [:username],
+                                     conflicting_options: [:api_key],
                                      verify_block: proc do |value|
                                        UI.user_error!("Couldn't find API key JSON file at path '#{value}'") unless File.exist?(value)
                                      end),
@@ -26,7 +26,7 @@ def self.available_options
                                      type: Hash,
                                      optional: true,
                                      sensitive: true,
-                                     conflicting_options: [:api_key_path, :username]),
+                                     conflicting_options: [:api_key_path]),
 
         FastlaneCore::ConfigItem.new(key: :username,
                                      short_option: "-u",

diff --git a/match/lib/match/options.rb b/match/lib/match/options.rb
@@ -77,7 +77,7 @@ def self.available_options
                                      env_name: "SIGH_API_KEY_PATH",
                                      description: "Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)",
                                      optional: true,
-                                     conflicting_options: [:api_key, :username],
+                                     conflicting_options: [:api_key],
                                      verify_block: proc do |value|
                                        UI.user_error!("Couldn't find API key JSON file at path '#{value}'") unless File.exist?(value)
                                      end),
@@ -87,7 +87,7 @@ def self.available_options
                                      type: Hash,
                                      optional: true,
                                      sensitive: true,
-                                     conflicting_options: [:api_key_path, :username]),
+                                     conflicting_options: [:api_key_path]),
 
         # Apple ID
         FastlaneCore::ConfigItem.new(key: :username,

diff --git a/sigh/lib/sigh/options.rb b/sigh/lib/sigh/options.rb
@@ -60,7 +60,7 @@ def self.available_options
                                      env_name: "SIGH_API_KEY_PATH",
                                      description: "Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)",
                                      optional: true,
-                                     conflicting_options: [:username],
+                                     conflicting_options: [:api_key],
                                      verify_block: proc do |value|
                                        UI.user_error!("Couldn't find API key JSON file at path '#{value}'") unless File.exist?(value)
                                      end),
@@ -70,7 +70,7 @@ def self.available_options
                                      type: Hash,
                                      optional: true,
                                      sensitive: true,
-                                     conflicting_options: [:api_key_path, :username]),
+                                     conflicting_options: [:api_key_path]),
 
         # Apple ID
         FastlaneCore::ConfigItem.new(key: :username,