fastlane-plugin-wpmreleasetoolkit 8.1.0 → 9.0.1

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/upload_to_s3.rb

@@ -22,18 +22,25 @@ module Fastlane
 
         if file_is_already_uploaded?(bucket, key)
           message = "File already exists in S3 bucket #{bucket} at #{key}"
-          if params[:skip_if_exists]
+
+          # skip_if_exists is deprecated but we want to keep backward compatibility.
+          params[:if_exists] ||= params[:skip_if_exists] ? :skip : :fail
+
+          case params[:if_exists]
+          when :fail
+            UI.user_error!(message)
+          when :replace
+            UI.important("#{message}. Will replace with the given one.")
+          when :skip
             UI.important("#{message}. Skipping upload.")
             return key
-          else
-            UI.user_error!(message)
           end
         end
 
         UI.message("Uploading #{file_path} to: #{key}")
 
         File.open(file_path, 'rb') do |file|
-          Aws::S3::Client.new().put_object(
+          Aws::S3::Client.new.put_object(
             body: file,
             bucket: bucket,
             key: key
@@ -50,7 +57,7 @@ module Fastlane
       end
 
       def self.file_is_already_uploaded?(bucket, key)
-        response = Aws::S3::Client.new().head_object(
+        response = Aws::S3::Client.new.head_object(
           bucket: bucket,
           key: key
         )
@@ -112,10 +119,35 @@ module Fastlane
           FastlaneCore::ConfigItem.new(
             key: :skip_if_exists,
             description: 'If the file already exists in the S3 bucket, skip the upload (and report it in the logs), instead of failing with `user_error!`',
+            deprecated: 'Use if_exists instead',
+            conflicting_options: [:if_exists],
+            conflict_block: proc do |option|
+              UI.user_error!("You cannot set both :#{option.key} and :skip_if_exists. Please only use :if_exists.")
+            end,
             optional: true,
+            # This option is deprecated but we stil set a default value to inform that the default behavior is for the action to fail when printing the action docs.
+            # See also https://github.com/wordpress-mobile/release-toolkit/pull/500#discussion_r1239642179
             default_value: false,
             type: Boolean
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :if_exists,
+            description: 'What do to if the file file already exists in the S3 bucket. Possible values :skip, :replace, :fail. When set, overrides the deprecated skip_if_exists option',
+            conflicting_options: [:skip_if_exists],
+            conflict_block: proc do |option|
+              UI.user_error!("You cannot set both :#{option.key} and :if_exists. Please only use :if_exists.")
+            end,
+            optional: true,
+            type: Symbol,
+            # We cannot set a default value and have backward compatibility with skip_if_exists at the same time.
+            # (Short of duplicating the default value knowledge in the action implementation)
+            #
+            # We have a test for the default behavior which should hopefully remind us to uncomment this line once well remove skip_if_exists.
+            # default_value: :fail,
+            verify_block: proc do |value|
+              UI.user_error!('`if_exist` must be one of :skip, :replace, :fail') unless %i[skip replace fail].include?(value)
+            end
+          ),
         ]
       end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/configure/configure_add_files_to_copy_action.rb

@@ -40,13 +40,13 @@ module Fastlane
           UI.message 'Example: google-services.json'
 
           source = UI.input('Source File Path:')
-          sourcePath = absolute_secret_store_path(source) # Transform the relative path into an absolute path.
+          source_path = absolute_secret_store_path(source) # Transform the relative path into an absolute path.
 
           # Don't allow the developer to accidentally specify an invalid file, otherwise validation will never succeed.
-          if File.file?(sourcePath)
+          if File.file?(source_path)
             invalid_file = false
           else
-            UI.error "There is no file at #{sourcePath}."
+            UI.error "There is no file at #{source_path}."
           end
         end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/configure/configure_download_action.rb

@@ -9,10 +9,10 @@ module Fastlane
         UI.message 'Running Configure Download'
 
         # If the `~/.mobile-secrets` repository doesn't exist
-        unless File.directory?(secrets_dir)
-          UI.user_error!("The local secrets store does not exist. Please clone it to #{secrets_dir} before continuing.")
-        else
+        if File.directory?(secrets_dir)
           update_repository # If the repo already exists, just update it
+        else
+          UI.user_error!("The local secrets store does not exist. Please clone it to #{secrets_dir} before continuing.")
         end
       end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/configure/configure_update_action.rb

@@ -50,8 +50,8 @@ module Fastlane
           new_branch = UI.select("Select the branch you'd like to switch to: ", get_branches)
           checkout_branch(new_branch)
           update_configure_file
-        else
-          UI.user_error!('The local secrets store is in a deatched HEAD state.  Please check out a branch and try again.') if current_branch.nil?
+        elsif current_branch.nil?
+          UI.user_error!('The local secrets store is in a deatched HEAD state.  Please check out a branch and try again.')
         end
       end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/configure/configure_validate_action.rb

@@ -91,10 +91,10 @@ module Fastlane
           source = absolute_secret_store_path(x.file)
           destination = absolute_project_path(x.destination)
 
-          sourceHash = file_hash(source)
-          destinationHash = file_hash(destination)
+          source_hash = file_hash(source)
+          destination_hash = file_hash(destination)
 
-          UI.user_error!("`#{x.destination} doesn't match the file in the secrets repository (#{x.file}) – unable to continue") unless sourceHash == destinationHash
+          UI.user_error!("`#{x.destination} doesn't match the file in the secrets repository (#{x.file}) – unable to continue") unless source_hash == destination_hash
         end
       end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/add_development_certificates_to_provisioning_profiles.rb

@@ -17,7 +17,7 @@ module Fastlane
             profile.is_a? Spaceship::Portal::ProvisioningProfile::Development
           end
                    .tap do |profiles|
-            UI.important "Warning: Unable to find any profiles associated with #{identifier}" unless profiles.length > 0
+            UI.important "Warning: Unable to find any profiles associated with #{identifier}" if profiles.empty?
           end
                    .each do |profile|
             profile.certificates = all_certificates
@@ -51,7 +51,7 @@ module Fastlane
                                        description: 'The team_id for the provisioning profiles',
                                        type: String,
                                        verify_block: proc do |value|
-                                                       UI.user_error!('You must provide a team ID in `team_id`') unless value && (!value.empty?)
+                                                       UI.user_error!('You must provide a team ID in `team_id`') unless value && !value.empty?
                                                      end),
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/add_devices_to_provisioning_profiles.rb

@@ -15,7 +15,7 @@ module Fastlane
             profile.is_a? Spaceship::Portal::ProvisioningProfile::Development
           end
                    .tap do |profiles|
-            UI.important "Warning: Unable to find any profiles associated with #{identifier}" unless profiles.length > 0
+            UI.important "Warning: Unable to find any profiles associated with #{identifier}" if profiles.empty?
           end
                    .each do |profile|
             profile.devices = devices
@@ -52,7 +52,7 @@ module Fastlane
             description: 'The team_id for the provisioning profiles',
             type: String,
             verify_block: proc do |value|
-              UI.user_error!('You must provide a team ID in `team_id`') unless value && (!value.empty?)
+              UI.user_error!('You must provide a team ID in `team_id`') unless value && !value.empty?
             end
           ),
         ]

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_betabuild_prechecks.rb

@@ -33,7 +33,7 @@ module Fastlane
         end
 
         # Check local repo status
-        other_action.ensure_git_status_clean()
+        other_action.ensure_git_status_clean
 
         # Return the current version
         build_version

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_build_prechecks.rb

@@ -5,9 +5,9 @@ module Fastlane
         require_relative '../../helper/ios/ios_version_helper'
 
         message = ''
-        message << "Building version #{Fastlane::Helper::Ios::VersionHelper.get_internal_version()} and uploading to App Center\n" if params[:internal]
-        message << "Building version #{Fastlane::Helper::Ios::VersionHelper.get_build_version()} and uploading to App Center\n" if params[:internal_on_single_version]
-        message << "Building version #{Fastlane::Helper::Ios::VersionHelper.get_build_version()} and uploading to TestFlight\n" if params[:external]
+        message << "Building version #{Fastlane::Helper::Ios::VersionHelper.get_internal_version} and uploading to App Center\n" if params[:internal]
+        message << "Building version #{Fastlane::Helper::Ios::VersionHelper.get_build_version} and uploading to App Center\n" if params[:internal_on_single_version]
+        message << "Building version #{Fastlane::Helper::Ios::VersionHelper.get_build_version} and uploading to TestFlight\n" if params[:external]
 
         if params[:skip_confirm]
           UI.message(message)
@@ -16,7 +16,7 @@ module Fastlane
         end
 
         # Check local repo status
-        other_action.ensure_git_status_clean() unless other_action.is_ci()
+        other_action.ensure_git_status_clean unless other_action.is_ci
       end
 
       #####################################################

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_build_preflight.rb

@@ -33,7 +33,7 @@ module Fastlane
           raise
         end
 
-        other_action.cocoapods()
+        other_action.cocoapods
       end
 
       #####################################################

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_bump_version_beta.rb

@@ -8,14 +8,14 @@ module Fastlane
         require_relative '../../helper/ios/ios_version_helper'
 
         Fastlane::Helper::GitHelper.ensure_on_branch!('release')
-        create_config()
-        show_config()
+        create_config
+        show_config
 
         UI.message 'Updating XcConfig...'
         Fastlane::Helper::Ios::VersionHelper.update_xc_configs(@new_beta_version, @short_version, @new_internal_version)
         UI.message 'Done!'
 
-        Fastlane::Helper::Ios::GitHelper.commit_version_bump(include_deliverfile: false, include_metadata: false)
+        Fastlane::Helper::Ios::GitHelper.commit_version_bump
       end
 
       #####################################################
@@ -47,11 +47,9 @@ module Fastlane
         [:ios, :mac].include?(platform)
       end
 
-      private
-
       def self.create_config
-        @current_version = Fastlane::Helper::Ios::VersionHelper.get_build_version()
-        @current_version_internal = Fastlane::Helper::Ios::VersionHelper.get_internal_version() unless ENV['INTERNAL_CONFIG_FILE'].nil?
+        @current_version = Fastlane::Helper::Ios::VersionHelper.get_build_version
+        @current_version_internal = Fastlane::Helper::Ios::VersionHelper.get_internal_version unless ENV['INTERNAL_CONFIG_FILE'].nil?
         @new_internal_version = Fastlane::Helper::Ios::VersionHelper.create_internal_version(@current_version) unless ENV['INTERNAL_CONFIG_FILE'].nil?
         @new_beta_version = Fastlane::Helper::Ios::VersionHelper.calc_next_build_version(@current_version)
         @short_version = Fastlane::Helper::Ios::VersionHelper.get_short_version_string(@new_beta_version)

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_bump_version_hotfix.rb

@@ -7,20 +7,13 @@ module Fastlane
         require_relative '../../helper/ios/ios_git_helper'
         Fastlane::Helper::GitHelper.create_branch("release/#{params[:version]}", from: params[:previous_version])
         create_config(params[:previous_version], params[:version])
-        show_config()
-
-        update_deliverfile = params[:skip_deliver] == false
-        if update_deliverfile
-          UI.message 'Updating Fastlane deliver file...'
-          Fastlane::Helper::Ios::VersionHelper.update_fastlane_deliver(@new_short_version)
-          UI.message 'Done!'
-        end
+        show_config
 
         UI.message 'Updating XcConfig...'
         Fastlane::Helper::Ios::VersionHelper.update_xc_configs(@new_version, @new_short_version, @new_version_internal)
         UI.message 'Done!'
 
-        Fastlane::Helper::Ios::GitHelper.commit_version_bump(include_deliverfile: update_deliverfile, include_metadata: false)
+        Fastlane::Helper::Ios::GitHelper.commit_version_bump
 
         UI.message 'Done.'
       end
@@ -51,16 +44,6 @@ module Fastlane
             description: 'The version to branch from',
             type: String
           ),
-          FastlaneCore::ConfigItem.new(
-            key: :skip_deliver,
-            env_name: 'FL_IOS_BUMP_VERSION_HOTFIX_SKIP_DELIVER',
-            description: 'Skips Deliverfile key update',
-            type: Boolean,
-            optional: true,
-            # Don't skip the Deliverfile by default. At the time of writing, 2 out of 3 consumers
-            # still have a Deliverfile.
-            default_value: false
-          ),
         ]
       end
 
@@ -78,11 +61,9 @@ module Fastlane
         [:ios, :mac].include?(platform)
       end
 
-      private
-
       def self.create_config(previous_version, new_short_version)
         @current_version = previous_version
-        @current_version_internal = Fastlane::Helper::Ios::VersionHelper.get_internal_version() unless ENV['INTERNAL_CONFIG_FILE'].nil?
+        @current_version_internal = Fastlane::Helper::Ios::VersionHelper.get_internal_version unless ENV['INTERNAL_CONFIG_FILE'].nil?
         @new_version = "#{new_short_version}.0"
         @new_version_internal = Fastlane::Helper::Ios::VersionHelper.create_internal_version(@new_version) unless ENV['INTERNAL_CONFIG_FILE'].nil?
         @new_short_version = new_short_version

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_bump_version_release.rb

@@ -12,27 +12,20 @@ module Fastlane
         other_action.ensure_git_branch(branch: default_branch)
 
         # Create new configuration
-        @new_version = Fastlane::Helper::Ios::VersionHelper.bump_version_release()
-        create_config()
-        show_config()
+        @new_version = Fastlane::Helper::Ios::VersionHelper.bump_version_release
+        create_config
+        show_config
 
         # Update local default branch and create branch from it
         Fastlane::Helper::GitHelper.checkout_and_pull(default_branch)
         Fastlane::Helper::GitHelper.create_branch(@new_release_branch, from: default_branch)
         UI.message 'Done!'
 
-        UI.message 'Updating Fastlane deliver file...' unless params[:skip_deliver]
-        Fastlane::Helper::Ios::VersionHelper.update_fastlane_deliver(@new_short_version) unless params[:skip_deliver]
-        UI.message 'Done!' unless params[:skip_deliver]
-
         UI.message 'Updating XcConfig...'
         Fastlane::Helper::Ios::VersionHelper.update_xc_configs(@new_version, @new_short_version, @new_version_internal)
         UI.message 'Done!'
 
-        Fastlane::Helper::Ios::GitHelper.commit_version_bump(
-          include_deliverfile: !params[:skip_deliver],
-          include_metadata: false
-        )
+        Fastlane::Helper::Ios::GitHelper.commit_version_bump
 
         UI.message 'Done.'
       end
@@ -51,11 +44,6 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :skip_deliver,
-                                       env_name: 'FL_IOS_CODEFREEZE_BUMP_SKIPDELIVER',
-                                       description: 'Skips Deliver key update',
-                                       type: Boolean,
-                                       default_value: false),
           FastlaneCore::ConfigItem.new(key: :default_branch,
                                        env_name: 'FL_RELEASE_TOOLKIT_DEFAULT_BRANCH',
                                        description: 'Default branch of the repository',
@@ -78,11 +66,9 @@ module Fastlane
         [:ios, :mac].include?(platform)
       end
 
-      private
-
       def self.create_config
-        @current_version = Fastlane::Helper::Ios::VersionHelper.get_build_version()
-        @current_version_internal = Fastlane::Helper::Ios::VersionHelper.get_internal_version() unless ENV['INTERNAL_CONFIG_FILE'].nil?
+        @current_version = Fastlane::Helper::Ios::VersionHelper.get_build_version
+        @current_version_internal = Fastlane::Helper::Ios::VersionHelper.get_internal_version unless ENV['INTERNAL_CONFIG_FILE'].nil?
         @new_version_internal = Fastlane::Helper::Ios::VersionHelper.create_internal_version(@new_version) unless ENV['INTERNAL_CONFIG_FILE'].nil?
         @new_short_version = Fastlane::Helper::Ios::VersionHelper.get_short_version_string(@new_version)
         @new_release_branch = "release/#{@new_short_version}"

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_codefreeze_prechecks.rb

@@ -23,7 +23,7 @@ module Fastlane
         end
 
         # Check local repo status
-        other_action.ensure_git_status_clean()
+        other_action.ensure_git_status_clean
 
         # Return the current version
         current_version

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_completecodefreeze_prechecks.rb

@@ -20,7 +20,7 @@ module Fastlane
         end
 
         # Check local repo status
-        other_action.ensure_git_status_clean()
+        other_action.ensure_git_status_clean
 
         version
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_finalize_prechecks.rb

@@ -20,7 +20,7 @@ module Fastlane
         end
 
         # Check local repo status
-        other_action.ensure_git_status_clean()
+        other_action.ensure_git_status_clean
 
         version
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_get_app_version.rb

@@ -4,9 +4,8 @@ module Fastlane
       def self.run(params)
         require_relative '../../helper/ios/ios_version_helper'
 
-        UI.user_error!('You need to set at least the PUBLIC_CONFIG_FILE env var to the path to the public xcconfig file') unless ENV['PUBLIC_CONFIG_FILE']
-
-        Fastlane::Helper::Ios::VersionHelper.get_public_version
+        public_version_xcconfig_file = params[:public_version_xcconfig_file]
+        Fastlane::Helper::Ios::VersionHelper.get_xcconfig_public_version(xcconfig_file: public_version_xcconfig_file)
       end
 
       #####################################################
@@ -22,7 +21,15 @@ module Fastlane
       end
 
       def self.available_options
-        # Define all options your action supports.
+        [
+          FastlaneCore::ConfigItem.new(
+            key: :public_version_xcconfig_file,
+            env_name: 'FL_IOS_PUBLIC_VERSION_XCCONFIG_FILE',
+            description: 'Path to the .xcconfig file containing the public app version',
+            type: String,
+            optional: false
+          ),
+        ]
       end
 
       def self.output

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_hotfix_prechecks.rb

@@ -28,7 +28,7 @@ module Fastlane
         UI.crash!("Version #{prev_ver} is not tagged! Can't branch. Abort!") unless other_action.git_tag_exists(tag: prev_ver)
 
         # Check local repo status
-        other_action.ensure_git_status_clean()
+        other_action.ensure_git_status_clean
 
         # Return the current version
         prev_ver

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_lint_localizations.rb

@@ -68,7 +68,7 @@ module Fastlane
         duplicate_keys
       end
 
-      RETRY_MESSAGE = <<~MSG
+      RETRY_MESSAGE = <<~MSG.freeze
         Inconsistencies found during Localization linting.
         You need to fix them before continuing. From this point on, you should either:
 
@@ -91,7 +91,7 @@ module Fastlane
         Did you fix the `.strings` files locally and want to lint them again?
       MSG
 
-      ABORT_MESSAGE = <<~MSG
+      ABORT_MESSAGE = <<~MSG.freeze
         Inconsistencies found during Localization linting. Aborting.
       MSG
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_tag_build.rb

@@ -5,8 +5,8 @@ module Fastlane
         require_relative '../../helper/ios/ios_version_helper'
         require_relative '../../helper/ios/ios_git_helper'
 
-        itc_ver = Fastlane::Helper::Ios::VersionHelper.get_build_version()
-        int_ver = Fastlane::Helper::Ios::VersionHelper.get_internal_version() unless ENV['INTERNAL_CONFIG_FILE'].nil?
+        itc_ver = Fastlane::Helper::Ios::VersionHelper.get_build_version
+        int_ver = Fastlane::Helper::Ios::VersionHelper.get_internal_version unless ENV['INTERNAL_CONFIG_FILE'].nil?
         Fastlane::Helper::GitHelper.create_tag(itc_ver)
         Fastlane::Helper::GitHelper.create_tag(int_ver) unless int_ver.nil?
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_update_metadata_source.rb

@@ -3,7 +3,7 @@ module Fastlane
     class IosUpdateMetadataSourceAction < Action
       def self.run(params)
         # Check local repo status
-        other_action.ensure_git_status_clean()
+        other_action.ensure_git_status_clean
 
         other_action.gp_update_metadata_source(po_file_path: params[:po_file_path],
                                                source_files: params[:source_files],
@@ -43,21 +43,21 @@ module Fastlane
                                        description: 'The path of the .po file to update',
                                        type: String,
                                        verify_block: proc do |value|
-                                                       UI.user_error!("No .po file path for UpdateMetadataSourceAction given, pass using `po_file_path: 'file path'`") unless value && (!value.empty?)
+                                                       UI.user_error!("No .po file path for UpdateMetadataSourceAction given, pass using `po_file_path: 'file path'`") unless value && !value.empty?
                                                        UI.user_error!("Couldn't find file at path '#{value}'") unless File.exist?(value)
                                                      end),
           FastlaneCore::ConfigItem.new(key: :release_version,
                                        env_name: 'FL_IOS_UPDATE_METADATA_SOURCE_RELEASE_VERSION',
                                        description: 'The release version of the app (to use to mark the release notes)',
                                        verify_block: proc do |value|
-                                                       UI.user_error!("No relase version for UpdateMetadataSourceAction given, pass using `release_version: 'version'`") unless value && (!value.empty?)
+                                                       UI.user_error!("No relase version for UpdateMetadataSourceAction given, pass using `release_version: 'version'`") unless value && !value.empty?
                                                      end),
           FastlaneCore::ConfigItem.new(key: :source_files,
                                        env_name: 'FL_IOS_UPDATE_METADATA_SOURCE_SOURCE_FILES',
                                        description: 'The hash with the path to the source files and the key to use to include their content',
                                        type: Hash,
                                        verify_block: proc do |value|
-                                                       UI.user_error!("No source file hash for UpdateMetadataSourceAction given, pass using `source_files: 'source file hash'`") unless value && (!value.empty?)
+                                                       UI.user_error!("No source file hash for UpdateMetadataSourceAction given, pass using `source_files: 'source file hash'`") unless value && !value.empty?
                                                      end),
         ]
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_validate_ci_build.rb

@@ -5,8 +5,8 @@ module Fastlane
         require_relative '../../helper/ios/ios_git_helper'
         require_relative '../../helper/ios/ios_version_helper'
 
-        version = Fastlane::Helper::Ios::VersionHelper.get_public_version()
-        head_tags = Fastlane::Helper::GitHelper.list_tags_on_current_commit()
+        version = Fastlane::Helper::Ios::VersionHelper.get_public_version
+        head_tags = Fastlane::Helper::GitHelper.list_tags_on_current_commit
         UI.user_error!('HEAD is not on tag. Aborting!') if head_tags.empty?
 
         return head_tags.include?(version) # Current commit is tagged with "version" tag

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_localize_helper.rb

@@ -54,30 +54,29 @@ module Fastlane
           # Search for the string in the main file
           result = :added
           main_strings_xml.xpath('//string').each do |main_string_node|
-            if main_string_node.attr('name') == string_name
-              # Skip if the string has the content_override tag
-              return :skipped if skip_string_by_tag?(main_string_node)
-
-              # If nodes are equivalent, skip
-              return :found if lib_string_node =~ main_string_node
-
-              # The string needs an update
-              if main_string_node.attr('tools:ignore').nil?
-                # No `tools:ignore` attribute; completely replace existing main string node with lib's one
-                add_xml_attributes!(lib_string_node, library)
-                main_string_node.replace lib_string_node
-              else
-                # Has the `tools:ignore` flag; update the content without touching the other existing attributes
-                add_xml_attributes!(main_string_node, library)
-                main_string_node.content = string_content
-              end
-              return :updated
+            next unless main_string_node.attr('name') == string_name
+            # Skip if the string has the content_override tag
+            return :skipped if skip_string_by_tag?(main_string_node)
+
+            # If nodes are equivalent, skip
+            return :found if lib_string_node =~ main_string_node
+
+            # The string needs an update
+            if main_string_node.attr('tools:ignore').nil?
+              # No `tools:ignore` attribute; completely replace existing main string node with lib's one
+              add_xml_attributes!(lib_string_node, library)
+              main_string_node.replace lib_string_node
+            else
+              # Has the `tools:ignore` flag; update the content without touching the other existing attributes
+              add_xml_attributes!(main_string_node, library)
+              main_string_node.content = string_content
             end
+            return :updated
           end
 
           # String not found, or removed because needing update and not in the exclusion list: add to the main file
           add_xml_attributes!(lib_string_node, library)
-          main_strings_xml.xpath('//string').last().add_next_sibling("\n#{' ' * 4}#{lib_string_node.to_xml().strip}")
+          main_strings_xml.xpath('//string').last.add_next_sibling("\n#{' ' * 4}#{lib_string_node.to_xml.strip}")
           return result
         end
 
@@ -91,14 +90,13 @@ module Fastlane
 
           # Search for the string in the main file
           main_strings_xml.xpath('//string').each do |main_string_node|
-            if main_string_node.attr('name') == string_name
-              # Skip if the string has the content_override tag
-              return if skip_string_by_tag?(main_string_node)
+            next unless main_string_node.attr('name') == string_name
+            # Skip if the string has the content_override tag
+            return if skip_string_by_tag?(main_string_node)
 
-              # Check if up-to-date
-              UI.user_error!("String #{string_name} [#{string_content}] has been updated in the main file but not in the library #{library[:library]}.") if main_string_node.content != string_content
-              return
-            end
+            # Check if up-to-date
+            UI.user_error!("String #{string_name} [#{string_content}] has been updated in the main file but not in the library #{library[:library]}.") if main_string_node.content != string_content
+            return
           end
 
           # String not found and not in the exclusion list
@@ -133,14 +131,14 @@ module Fastlane
             case res
             when :updated
               UI.verbose "#{string_node.attr('name')} updated."
-              updated_count = updated_count + 1
+              updated_count += 1
             when :found
-              untouched_count = untouched_count + 1
+              untouched_count += 1
             when :added
               UI.verbose "#{string_node.attr('name')} added."
-              added_count = added_count + 1
+              added_count += 1
             when :skipped
-              skipped_count = skipped_count + 1
+              skipped_count += 1
             else
               UI.user_error!("Internal Error! #{res}")
             end
@@ -180,22 +178,22 @@ module Fastlane
 
         def self.verify_local_diff(main, library, main_strings, lib_strings)
           `git diff #{main}`.each_line do |line|
-            if line.start_with?('+ ') || line.start_with?('- ')
-              diffs = line.gsub(/\s+/m, ' ').strip.split
-              diffs.each do |diff|
-                verify_diff(diff, main_strings, lib_strings, library)
-              end
+            next unless line.start_with?('+ ') || line.start_with?('- ')
+
+            diffs = line.gsub(/\s+/m, ' ').strip.split
+            diffs.each do |diff|
+              verify_diff(diff, main_strings, lib_strings, library)
             end
           end
         end
 
         def self.verify_pr_diff(main, library, main_strings, lib_strings, source_diff)
           source_diff.each_line do |line|
-            if line.start_with?('+ ') || line.start_with?('- ')
-              diffs = line.gsub(/\s+/m, ' ').strip.split
-              diffs.each do |diff|
-                verify_diff(diff, main_strings, lib_strings, library)
-              end
+            next unless line.start_with?('+ ') || line.start_with?('- ')
+
+            diffs = line.gsub(/\s+/m, ' ').strip.split
+            diffs.each do |diff|
+              verify_diff(diff, main_strings, lib_strings, library)
             end
           end
         end
@@ -234,7 +232,7 @@ module Fastlane
         #        An array of locales to download. Each item in the array must be a Hash
         #        with keys `:glotpress` and `:android` containing the respective locale codes.
         #
-        def self.download_from_glotpress(res_dir:, glotpress_project_url:, glotpress_filters: { status: 'current' }, locales_map:)
+        def self.download_from_glotpress(res_dir:, glotpress_project_url:, locales_map:, glotpress_filters: { status: 'current' })
           glotpress_filters = [glotpress_filters] unless glotpress_filters.is_a?(Array)
 
           attributes_to_copy = %w[formatted] # Attributes that we want to replicate into translated `string.xml` files