fastlane 2.165.0 → 2.170.0

data/deliver/lib/deliver/upload_metadata.rb

@@ -375,9 +375,7 @@ module Deliver
       # Check folder list (an empty folder signifies a language is required)
       ignore_validation = options[:ignore_language_directory_validation]
       Loader.language_folders(options[:metadata_path], ignore_validation).each do |lang_folder|
-        next unless File.directory?(lang_folder) # We don't want to read txt as they are non localised
-        language = File.basename(lang_folder)
-        enabled_languages << language unless enabled_languages.include?(language)
+        enabled_languages << lang_folder.basename unless enabled_languages.include?(lang_folder.basename)
       end
 
       return unless enabled_languages.include?("default")
@@ -416,10 +414,7 @@ module Deliver
       # Check folder list (an empty folder signifies a language is required)
       ignore_validation = options[:ignore_language_directory_validation]
       Loader.language_folders(options[:metadata_path], ignore_validation).each do |lang_folder|
-        next unless File.directory?(lang_folder) # We don't want to read txt as they are non localised
-
-        language = File.basename(lang_folder)
-        enabled_languages << language unless enabled_languages.include?(language)
+        enabled_languages << lang_folder.basename unless enabled_languages.include?(lang_folder.basename)
       end
 
       # Mapping to strings because :default symbol can be passed in
@@ -530,14 +525,13 @@ module Deliver
       # Load localised data
       ignore_validation = options[:ignore_language_directory_validation]
       Loader.language_folders(options[:metadata_path], ignore_validation).each do |lang_folder|
-        language = File.basename(lang_folder)
         (LOCALISED_VERSION_VALUES.keys + LOCALISED_APP_VALUES.keys).each do |key|
-          path = File.join(lang_folder, "#{key}.txt")
+          path = File.join(lang_folder.path, "#{key}.txt")
           next unless File.exist?(path)
 
           UI.message("Loading '#{path}'...")
           options[key] ||= {}
-          options[key][language] ||= File.read(path)
+          options[key][lang_folder.basename] ||= File.read(path)
         end
       end
 

data/deliver/lib/deliver/upload_screenshots.rb

@@ -251,70 +251,7 @@ module Deliver
 
     def collect_screenshots(options)
       return [] if options[:skip_screenshots]
-      return collect_screenshots_for_languages(options[:screenshots_path], options[:ignore_language_directory_validation])
-    end
-
-    def collect_screenshots_for_languages(path, ignore_validation)
-      screenshots = []
-      extensions = '{png,jpg,jpeg}'
-
-      available_languages = UploadScreenshots.available_languages.each_with_object({}) do |lang, lang_hash|
-        lang_hash[lang.downcase] = lang
-      end
-
-      Loader.language_folders(path, ignore_validation).each do |lng_folder|
-        language = File.basename(lng_folder)
-
-        # Check to see if we need to traverse multiple platforms or just a single platform
-        if language == Loader::APPLE_TV_DIR_NAME || language == Loader::IMESSAGE_DIR_NAME
-          screenshots.concat(collect_screenshots_for_languages(File.join(path, language), ignore_validation))
-          next
-        end
-
-        files = Dir.glob(File.join(lng_folder, "*.#{extensions}"), File::FNM_CASEFOLD).sort
-        next if files.count == 0
-
-        framed_screenshots_found = Dir.glob(File.join(lng_folder, "*_framed.#{extensions}"), File::FNM_CASEFOLD).count > 0
-
-        UI.important("Framed screenshots are detected! 🖼 Non-framed screenshot files may be skipped. 🏃") if framed_screenshots_found
-
-        language_dir_name = File.basename(lng_folder)
-
-        if available_languages[language_dir_name.downcase].nil?
-          UI.user_error!("#{language_dir_name} is not an available language. Please verify that your language codes are available in iTunesConnect. See https://developer.apple.com/library/content/documentation/LanguagesUtilities/Conceptual/iTunesConnect_Guide/Chapters/AppStoreTerritories.html for more information.")
-        end
-
-        language = available_languages[language_dir_name.downcase]
-
-        files.each do |file_path|
-          is_framed = file_path.downcase.include?("_framed.")
-          is_watch = file_path.downcase.include?("watch")
-
-          if framed_screenshots_found && !is_framed && !is_watch
-            UI.important("🏃 Skipping screenshot file: #{file_path}")
-            next
-          end
-
-          screenshots << AppScreenshot.new(file_path, language)
-        end
-      end
-
-      # Checking if the device type exists in spaceship
-      # Ex: iPhone 6.1 inch isn't supported in App Store Connect but need
-      # to have it in there for frameit support
-      unaccepted_device_shown = false
-      screenshots.select! do |screenshot|
-        exists = !screenshot.device_type.nil?
-        unless exists
-          UI.important("Unaccepted device screenshots are detected! 🚫 Screenshot file will be skipped. 🏃") unless unaccepted_device_shown
-          unaccepted_device_shown = true
-
-          UI.important("🏃 Skipping screenshot file: #{screenshot.path} - Not an accepted App Store Connect device...")
-        end
-        exists
-      end
-
-      return screenshots
+      return Loader.load_app_screenshots(options[:screenshots_path], options[:ignore_language_directory_validation])
     end
 
     # helper method so Spaceship::Tunes.client.available_languages is easier to test

data/fastlane/lib/fastlane/actions/actions_helper.rb

@@ -5,7 +5,7 @@ module Fastlane
       PLATFORM_NAME = :PLATFORM_NAME
       ENVIRONMENT = :ENVIRONMENT
 
-      # A slighly decorated hash that will store and fetch sensitive data
+      # A slightly decorated hash that will store and fetch sensitive data
       # but not display it while iterating keys and values
       class LaneContextValues < Hash
         def initialize

data/fastlane/lib/fastlane/actions/add_git_tag.rb

@@ -6,7 +6,13 @@ module Fastlane
         # lane name in lane_context could be nil because you can just call $fastlane add_git_tag which has no context
         lane_name = Actions.lane_context[Actions::SharedValues::LANE_NAME].to_s.delete(' ') # no spaces allowed
 
-        tag = options[:tag] || "#{options[:grouping]}/#{lane_name}/#{options[:prefix]}#{options[:build_number]}#{options[:postfix]}"
+        if options[:tag]
+          tag = options[:tag]
+        elsif options[:build_number]
+          tag = "#{options[:grouping]}/#{lane_name}/#{options[:prefix]}#{options[:build_number]}#{options[:postfix]}"
+        else
+          UI.user_error!("No value found for 'tag' or 'build_number'. At least one of them must be provided. Note that if you do specify a tag, all other arguments are ignored.")
+        end
         message = options[:message] || "#{tag} (fastlane)"
 
         cmd = ['git tag']
@@ -64,7 +70,8 @@ module Fastlane
                                        description: "The build number. Defaults to the result of increment_build_number if you\'re using it",
                                        default_value: Actions.lane_context[Actions::SharedValues::BUILD_NUMBER],
                                        default_value_dynamic: true,
-                                       is_string: false),
+                                       is_string: false,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :message,
                                        env_name: "FL_GIT_TAG_MESSAGE",
                                        description: "The tag message. Defaults to the tag's name",

data/fastlane/lib/fastlane/actions/appledoc.rb

@@ -55,7 +55,7 @@ module Fastlane
 
       def self.run(params)
         unless Helper.test?
-          UI.message("Install using `brew install homebrew/boneyard/appledoc`")
+          UI.message("Install using `brew install appledoc`")
           UI.user_error!("appledoc not installed") if `which appledoc`.length == 0
         end
 

data/fastlane/lib/fastlane/actions/docs/capture_ios_screenshots.md

@@ -282,6 +282,10 @@ launch_arguments([
 ])
 ```
 
+## Xcode Environment Variables
+
+_snapshot_ includes `FASTLANE_SNAPSHOT=YES` and `FASTLANE_LANGUAGE=<language>` as arguments when executing `xcodebuild`. This means you may use these environment variables in a custom build phase run script to do any additional configuration.
+
 # How does it work?
 
 The easiest solution would be to just render the UIWindow into a file. That's not possible because UI Tests don't run on a main thread. So _snapshot_ uses a different approach:

data/fastlane/lib/fastlane/actions/docs/frame_screenshots.md

@@ -237,7 +237,7 @@ The `keyword.strings` and `title.strings` are standard `.strings` file you alrea
 **Notes**
 
 - These `.strings` files **MUST** be utf-8 (UTF-8) or utf-16 encoded (UTF-16 BE with BOM). They also must begin with an empty line. If you are having trouble see [issue #1740](https://github.com/fastlane/fastlane/issues/1740)
-- You **MUST** provide a background if you want titles. _frameit_ will not add the tiles if a background is not specified.
+- You **MUST** provide a background if you want titles. _frameit_ will not add the titles if a background is not specified.
 
 ### Screenshot orientation
 

data/fastlane/lib/fastlane/actions/docs/sync_code_signing.md

@@ -390,7 +390,7 @@ lane :beta do
 end
 ```
 
-By using the `force_for_new_devices` parameter, _match_ will check if the device count has changed since the last time you ran _match_, and automatically re-generate the provisioning profile if necessary. You can also use `force: true` to re-generate the provisioning profile on each run.
+By using the `force_for_new_devices` parameter, _match_ will check if the (enabled) device count has changed since the last time you ran _match_, and automatically re-generate the provisioning profile if necessary. You can also use `force: true` to re-generate the provisioning profile on each run.
 
 _**Important:** The `force_for_new_devices` parameter is ignored for App Store provisioning profiles since they don't contain any device information._
 

data/fastlane/lib/fastlane/actions/docs/upload_to_app_store.md.erb

@@ -439,6 +439,10 @@ Use the `submission_information` parameter for additional submission specifiers,
 fastlane deliver submit_build --build_number 830 --submission_information "{\"export_compliance_uses_encryption\": false, \"add_id_info_uses_idfa\": false }"
 ```
 
+### App Privacy Details
+
+Starting on December 8, 2020, Apple announced that developers are required to provide app privacy details that will help users understand an app's privacy practies. _deliver_ does not allow for updating of this information but this can be done with the _upload_app_privacy_details_to_app_store_ action. More information on [Uploading App Privacy Details](https://docs.fastlane.tools/uploading-app-privacy-details)
+
 # Credentials
 
 A detailed description about how your credentials are handled is available in a [credentials_manager](https://github.com/fastlane/fastlane/tree/master/credentials_manager).

data/fastlane/lib/fastlane/actions/onesignal.rb

@@ -17,6 +17,7 @@ module Fastlane
         apns_p12_password = params[:apns_p12_password]
         android_token = params[:android_token]
         android_gcm_sender_id = params[:android_gcm_sender_id]
+        organization_id = params[:organization_id]
 
         has_app_id = !app_id.empty?
         has_app_name = !app_name.empty?
@@ -43,6 +44,7 @@ module Fastlane
 
         payload["gcm_key"] = android_token unless android_token.nil?
         payload["android_gcm_sender_id"] = android_gcm_sender_id unless android_gcm_sender_id.nil?
+        payload["organization_id"] = organization_id unless organization_id.nil?
 
         # here's the actual lifting - POST or PUT to OneSignal
 
@@ -135,7 +137,13 @@ module Fastlane
                                        env_name: "APNS_ENV",
                                        description: "APNS environment",
                                        optional: true,
-                                       default_value: 'production')
+                                       default_value: 'production'),
+
+          FastlaneCore::ConfigItem.new(key: :organization_id,
+                                       env_name: "ONE_SIGNAL_ORGANIZATION_ID",
+                                       sensitive: true,
+                                       description: "OneSignal Organization ID",
+                                       optional: true)
         ]
       end
 
@@ -163,7 +171,8 @@ module Fastlane
             android_gcm_sender_id: "Your Android GCM Sender ID (optional)",
             apns_p12: "Path to Apple .p12 file (optional)",
             apns_p12_password: "Password for .p12 file (optional)",
-            apns_env: "production/sandbox (defaults to production)"
+            apns_env: "production/sandbox (defaults to production)",
+            organization_id: "Onesignal organization id (optional)"
           )',
           'onesignal(
             app_id: "Your OneSignal App ID",
@@ -173,7 +182,8 @@ module Fastlane
             android_gcm_sender_id: "Your Android GCM Sender ID (optional)",
             apns_p12: "Path to Apple .p12 file (optional)",
             apns_p12_password: "Password for .p12 file (optional)",
-            apns_env: "production/sandbox (defaults to production)"
+            apns_env: "production/sandbox (defaults to production)",
+            organization_id: "Onesignal organization id (optional)"
           )'
         ]
       end

data/fastlane/lib/fastlane/actions/slather.rb

@@ -272,8 +272,8 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :binary_basename,
                                        env_name: "FL_SLATHER_BINARY_BASENAME",
                                        description: "Basename of the binary file, this should match the name of your bundle excluding its extension (i.e. YourApp [for YourApp.app bundle])",
-                                       is_string: false,
-                                       default_value: false),
+                                       type: Array,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :binary_file,
                                        env_name: "FL_SLATHER_BINARY_FILE",
                                        description: "Binary file name to be used for code coverage",

data/fastlane/lib/fastlane/actions/spm.rb

@@ -11,6 +11,7 @@ module Fastlane
         cmd << "--disable-sandbox" if params[:disable_sandbox]
         cmd << "--verbose" if params[:verbose]
         cmd << params[:command] if package_commands.include?(params[:command])
+        cmd << "--enable-code-coverage" if params[:enable_code_coverage] && params[:command] == 'generate-xcodeproj'
         if params[:xcconfig]
           cmd << "--xcconfig-overrides #{params[:xcconfig]}"
         end
@@ -44,6 +45,11 @@ module Fastlane
                                        verify_block: proc do |value|
                                          UI.user_error!("Please pass a valid command. Use one of the following: #{available_commands.join(', ')}") unless available_commands.include?(value)
                                        end),
+          FastlaneCore::ConfigItem.new(key: :enable_code_coverage,
+                                       env_name: "FL_SPM_ENABLE_CODE_COVERAGE",
+                                       description: "Enables code coverage for the generated Xcode project when using the generate-xcodeproj command",
+                                       is_string: false,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :build_path,
                                        env_name: "FL_SPM_BUILD_PATH",
                                        description: "Specify build/cache directory [default: ./.build]",

data/fastlane/lib/fastlane/actions/update_fastlane.rb

@@ -45,25 +45,36 @@ module Fastlane
         end
 
         # suppress updater output - very noisy
-        Gem::DefaultUserInteraction.ui = Gem::SilentUI.new
+        Gem::DefaultUserInteraction.ui = Gem::SilentUI.new unless FastlaneCore::Globals.verbose?
 
         update_needed.each do |tool_info|
-          tool = tool_info[0]
+          tool = self.get_gem_name(tool_info)
           local_version = Gem::Version.new(highest_versions[tool].version)
           latest_official_version = FastlaneCore::UpdateChecker.fetch_latest(tool)
 
           UI.message("Updating #{tool} from #{local_version.to_s.yellow} to #{latest_official_version.to_s.yellow}... 🚀")
 
-          # Approximate_recommendation will create a string like "~> 0.10" from a version 0.10.0, e.g. one that is valid for versions >= 0.10 and <1.0
-          requirement_version = local_version.approximate_recommendation
-          updater.update_gem(tool, Gem::Requirement.new(requirement_version))
+          if Helper.homebrew?
+            Helper.backticks('brew upgrade fastlane')
+          else
+            # Approximate_recommendation will create a string like "~> 0.10" from a version 0.10.0, e.g. one that is valid for versions >= 0.10 and <1.0
+            requirement_version = local_version.approximate_recommendation
+            updater.update_gem(tool, Gem::Requirement.new(requirement_version))
+          end
 
           UI.success("Finished updating #{tool}")
         end
 
-        UI.message("Cleaning up old versions...")
-        cleaner.options[:args] = tools_to_update
-        cleaner.execute
+        unless Helper.homebrew?
+          UI.message("Cleaning up old versions...")
+          cleaner.options[:args] = tools_to_update
+          cleaner.execute
+        end
+
+        if FastlaneCore::FastlaneFolder.swift?
+          upgrader = SwiftRunnerUpgrader.new
+          upgrader.upgrade_if_needed!
+        end
 
         UI.message("fastlane.tools successfully updated! I will now restart myself... 😴")
 
@@ -71,6 +82,16 @@ module Fastlane
         exec("FL_NO_UPDATE=true #{$PROGRAM_NAME} #{ARGV.join(' ')}")
       end
 
+      def self.get_gem_name(tool_info)
+        if tool_info.kind_of?(Array)
+          return tool_info[0]
+        elsif tool_info.respond_to?(:name) # Gem::NameTuple in RubyGems >= 3.1.0
+          return tool_info.name
+        else
+          UI.crash!("Unknown gem update information returned from RubyGems. Please file a new issue for this... 🤷")
+        end
+      end
+
       def self.description
         "Makes sure fastlane-tools are up-to-date when running fastlane"
       end

data/fastlane/lib/fastlane/actions/upload_app_privacy_details_to_app_store.rb

@@ -0,0 +1,289 @@
+module Fastlane
+  module Actions
+    class UploadAppPrivacyDetailsToAppStoreAction < Action
+      DEFAULT_PATH = Fastlane::Helper.fastlane_enabled_folder_path
+      DEFAULT_FILE_NAME = "app_privacy_details.json"
+
+      def self.run(params)
+        require 'spaceship'
+
+        # Prompts select team if multiple teams and none specified
+        UI.message("Login to App Store Connect (#{params[:username]})")
+        Spaceship::ConnectAPI.login(params[:username], use_portal: false, use_tunes: true, tunes_team_id: params[:team_id], team_name: params[:team_name])
+        UI.message("Login successful")
+
+        # Get App
+        app = Spaceship::ConnectAPI::App.find(params[:app_identifier])
+        unless app
+          UI.user_error!("Could not find app with bundle identifier '#{params[:app_identifier]}' on account #{params[:username]}")
+        end
+
+        # Attempt to load JSON file
+        usages_config = load_json_file(params)
+
+        # Start interactive questions to generate and save JSON file
+        unless usages_config
+          usages_config = ask_interactive_questions_for_json
+
+          if params[:skip_json_file_saving]
+            UI.message("Skipping JSON file saving...")
+          else
+            json = JSON.pretty_generate(usages_config)
+            path = output_path(params)
+
+            UI.message("Writing file to #{path}")
+            File.write(path, json)
+          end
+        end
+
+        # Process JSON file to save app data usages to API
+        if params[:skip_upload]
+          UI.message("Skipping uploading of data... (so you can verify your JSON file)")
+        else
+          upload_app_data_usages(params, app, usages_config)
+        end
+      end
+
+      def self.load_json_file(params)
+        path = params[:json_path]
+        return nil if path.nil?
+        return JSON.parse(File.read(path))
+      end
+
+      def self.output_path(params)
+        path = params[:output_json_path]
+        return File.absolute_path(path)
+      end
+
+      def self.ask_interactive_questions_for_json(show_intro = true)
+        if show_intro
+          UI.important("You did not provide a JSON file for updating the app data usages")
+          UI.important("fastlane will now run you through interactive question to generate the JSON file")
+          UI.important("")
+          UI.important("This JSON file can be saved in source control and used in this action with the :json_file option")
+
+          unless UI.confirm("Ready to start?")
+            UI.user_error!("Cancelled")
+          end
+        end
+
+        # Fetch categories and purposes used for generating interactive questions
+        categories = Spaceship::ConnectAPI::AppDataUsageCategory.all(includes: "grouping")
+        purposes = Spaceship::ConnectAPI::AppDataUsagePurpose.all
+
+        json = []
+
+        unless UI.confirm("Are you collecting data?")
+          json << {
+            "data_protections" => [Spaceship::ConnectAPI::AppDataUsageDataProtection::ID::DATA_NOT_COLLECTED]
+          }
+
+          return json
+        end
+
+        categories.each do |category|
+          # Ask if using category
+          next unless UI.confirm("Collect data for #{category.id}?")
+
+          purpose_names = purposes.map(&:id).join(', ')
+          UI.message("How will this data be used? You'll be offered with #{purpose_names}")
+
+          # Ask purposes
+          selected_purposes = []
+          loop do
+            purposes.each do |purpose|
+              selected_purposes << purpose if UI.confirm("Used for #{purpose.id}?")
+            end
+
+            break unless selected_purposes.empty?
+            break unless UI.confirm("No purposes selected. Do you want to try again?")
+          end
+
+          # Skip asking protections if purposes were skipped
+          next if selected_purposes.empty?
+
+          # Ask protections
+          is_linked_to_user = UI.confirm("Is #{category.id} linked to the user?")
+          is_used_for_tracking = UI.confirm("Is #{category.id} used for tracking purposes?")
+
+          # Map answers to values for API requests
+          protection_id = is_linked_to_user ? Spaceship::ConnectAPI::AppDataUsageDataProtection::ID::DATA_LINKED_TO_YOU : Spaceship::ConnectAPI::AppDataUsageDataProtection::ID::DATA_NOT_LINKED_TO_YOU
+          tracking_id = is_used_for_tracking ? Spaceship::ConnectAPI::AppDataUsageDataProtection::ID::DATA_USED_TO_TRACK_YOU : nil
+
+          json << {
+            "category" => category.id,
+            "purposes" => selected_purposes.map(&:id),
+            "data_protections" => [
+              protection_id, tracking_id
+            ].compact
+          }
+        end
+
+        # Recursively call this method if no categories were selected for data collection
+        if json.empty?
+          UI.error("No categories were selected for data collection.")
+          json = ask_interactive_questions_for_json(false)
+        end
+
+        return json
+      end
+
+      def self.upload_app_data_usages(params, app, usages_config)
+        UI.message("Preparing to upload App Data Usage")
+
+        # Delete all existing usages for new ones
+        all_usages = Spaceship::ConnectAPI::AppDataUsage.all(app_id: app.id, includes: "category,grouping,purpose,dataProtection", limit: 500)
+        all_usages.each(&:delete!)
+
+        usages_config.each do |usage_config|
+          category = usage_config["category"]
+          purposes = usage_config["purposes"] || []
+          data_protections = usage_config["data_protections"] || []
+
+          # There will not be any purposes if "not collecting data"
+          # However, an AppDataUsage still needs to be created for not collecting data
+          # Creating an array with nil so that purposes can be iterated over and
+          # that AppDataUsage can be created
+          purposes = [nil] if purposes.empty?
+
+          purposes.each do |purpose|
+            data_protections.each do |data_protection|
+              if data_protection == Spaceship::ConnectAPI::AppDataUsageDataProtection::ID::DATA_NOT_COLLECTED
+                UI.message("Setting #{data_protection}")
+              else
+                UI.message("Setting #{category} and #{purpose} to #{data_protection}")
+              end
+
+              Spaceship::ConnectAPI::AppDataUsage.create(
+                app_id: app.id,
+                app_data_usage_category_id: category,
+                app_data_usage_protection_id: data_protection,
+                app_data_usage_purpose_id: purpose
+              )
+            end
+          end
+        end
+
+        # Publish
+        if params[:skip_publish]
+          UI.message("Skipping app data usage publishing... (so you can verify on App Store Connect)")
+        else
+          publish_state = Spaceship::ConnectAPI::AppDataUsagesPublishState.get(app_id: app.id)
+          if publish_state.published
+            UI.important("App data usage is already published")
+          else
+            UI.important("App data usage not published! Going to publish...")
+            publish_state.publish!
+            UI.important("App data usage is now published")
+          end
+        end
+      end
+
+      def self.description
+        "Upload App Privacy Details for an app in App Store Connect"
+      end
+
+      def self.available_options
+        user = CredentialsManager::AppfileConfig.try_fetch_value(:itunes_connect_id)
+        user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
+
+        [
+          FastlaneCore::ConfigItem.new(key: :username,
+                                       env_name: "FASTLANE_USER",
+                                       description: "Your Apple ID Username for App Store Connect",
+                                       default_value: user,
+                                       default_value_dynamic: true),
+          FastlaneCore::ConfigItem.new(key: :app_identifier,
+                                       env_name: "UPLOAD_APP_PRIVACY_DETAILS_TO_APP_STORE_APP_IDENTIFIER",
+                                       description: "The bundle identifier of your app",
+                                       code_gen_sensitive: true,
+                                       default_value: CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier),
+                                       default_value_dynamic: true),
+          FastlaneCore::ConfigItem.new(key: :team_id,
+                                       env_name: "FASTLANE_ITC_TEAM_ID",
+                                       description: "The ID of your App Store Connect team if you're in multiple teams",
+                                       optional: true,
+                                       is_string: false, # as we also allow integers, which we convert to strings anyway
+                                       code_gen_sensitive: true,
+                                       default_value: CredentialsManager::AppfileConfig.try_fetch_value(:itc_team_id),
+                                       default_value_dynamic: true),
+          FastlaneCore::ConfigItem.new(key: :team_name,
+                                       env_name: "FASTLANE_ITC_TEAM_NAME",
+                                       description: "The name of your App Store Connect team if you're in multiple teams",
+                                       optional: true,
+                                       code_gen_sensitive: true,
+                                       default_value: CredentialsManager::AppfileConfig.try_fetch_value(:itc_team_name),
+                                       default_value_dynamic: true),
+
+          # JSON paths
+          FastlaneCore::ConfigItem.new(key: :json_path,
+                                       env_name: "UPLOAD_APP_PRIVACY_DETAILS_TO_APP_STORE_JSON_PATH",
+                                       description: "Path to the app usage data JSON",
+                                       is_string: true,
+                                       optional: true,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Could not find JSON file at path '#{File.expand_path(value)}'") unless File.exist?(value)
+                                         UI.user_error!("'#{value}' doesn't seem to be a JSON file") unless FastlaneCore::Helper.json_file?(File.expand_path(value))
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :output_json_path,
+                                       env_name: "UPLOAD_APP_PRIVACY_DETAILS_TO_APP_STORE_OUTPUT_JSON_PATH",
+                                       description: "Path to the app usage data JSON file generated by interactive questions",
+                                       conflicting_options: [:skip_json_file_saving],
+                                       default_value: File.join(DEFAULT_PATH, DEFAULT_FILE_NAME)),
+
+          # Skipping options
+          FastlaneCore::ConfigItem.new(key: :skip_json_file_saving,
+                                       env_name: "UPLOAD_APP_PRIVACY_DETAILS_TO_APP_STORE_OUTPUT_SKIP_JSON_FILE_SAVING",
+                                       description: "Whether to skip the saving of the JSON file",
+                                       conflicting_options: [:skip_output_json_path],
+                                       type: Boolean,
+                                       default_value: false),
+          FastlaneCore::ConfigItem.new(key: :skip_upload,
+                                       env_name: "UPLOAD_APP_PRIVACY_DETAILS_TO_APP_STORE_OUTPUT_SKIP_UPLOAD",
+                                       description: "Whether to skip the upload and only create the JSON file with interactive questions",
+                                       conflicting_options: [:skip_publish],
+                                       type: Boolean,
+                                       default_value: false),
+          FastlaneCore::ConfigItem.new(key: :skip_publish,
+                                       env_name: "UPLOAD_APP_PRIVACY_DETAILS_TO_APP_STORE_OUTPUT_SKIP_PUBLISH",
+                                       description: "Whether to skip the publishing",
+                                       conflicting_options: [:skip_upload],
+                                       type: Boolean,
+                                       default_value: false)
+        ]
+      end
+
+      def self.author
+        "joshdholtz"
+      end
+
+      def self.is_supported?(platform)
+        [:ios, :mac, :tvos].include?(platform)
+      end
+
+      def self.details
+        "Upload App Privacy Details for an app in App Store Connect. For more detail information, view https://docs.fastlane.tools/uploading-app-privacy-details"
+      end
+
+      def self.example_code
+        [
+          'upload_app_privacy_details_to_app_store(
+            username: "your@email.com",
+            team_name: "Your Team",
+            app_identifier: "com.your.bundle"
+          )',
+          'upload_app_privacy_details_to_app_store(
+            username: "your@email.com",
+            team_name: "Your Team",
+            app_identifier: "com.your.bundle",
+            json_path: "fastlane/app_data_usages.json"
+          )'
+        ]
+      end
+
+      def self.category
+        :production
+      end
+    end
+  end
+end