fastlane-plugin-wpmreleasetoolkit 9.4.0 → 10.0.0

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_download_translations_action.rb

@@ -7,8 +7,7 @@ module Fastlane
         require_relative '../../helper/android/android_localize_helper'
         require_relative '../../helper/git_helper'
 
-        project_root_folder = params[:project_root_folder]
-        res_dir = File.join(project_root_folder || '.', params[:res_dir])
+        res_dir = File.join('.', params[:res_dir])
 
         Fastlane::Helper::Android::LocalizeHelper.create_available_languages_file(
           res_dir: res_dir,
@@ -23,7 +22,10 @@ module Fastlane
 
         # Update submodules then lint translations
         unless params[:lint_task].nil? || params[:lint_task].empty?
-          Fastlane::Helper::GitHelper.update_submodules
+          git_submodule_update(
+            recursive: true,
+            init: true
+          )
           Action.sh('./gradlew', params[:lint_task])
         end
 
@@ -95,7 +97,6 @@ module Fastlane
             type: Boolean,
             default_value: false
           ),
-          Fastlane::Helper::Deprecated.project_root_folder_config_item,
         ]
       end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_finalize_prechecks.rb

@@ -15,16 +15,12 @@ module Fastlane
         current_branch = Fastlane::Helper::GitHelper.current_git_branch
         UI.user_error!("Current branch - '#{current_branch}' - is not a release branch. Abort.") unless current_branch.start_with?('release/')
 
-        has_alpha_version = params[:has_alpha_version]
-        project_root_folder = params[:project_root_folder]
-        project_name = params[:project_name]
-        build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
-        version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
+        build_gradle_path = params[:build_gradle_path]
+        version_properties_path = params[:version_properties_path]
 
         version = Fastlane::Helper::Android::VersionHelper.get_public_version(
           build_gradle_path: build_gradle_path,
-          version_properties_path: version_properties_path,
-          has_alpha_version: has_alpha_version
+          version_properties_path: version_properties_path
         )
         message = "Finalizing release: #{version}\n"
         if params[:skip_confirm]
@@ -65,19 +61,12 @@ module Fastlane
                                        description: 'Path to the build.gradle file',
                                        type: String,
                                        optional: true,
-                                       conflicting_options: %i[project_name
-                                                               project_root_folder
-                                                               version_properties_path]),
+                                       conflicting_options: [:version_properties_path]),
           FastlaneCore::ConfigItem.new(key: :version_properties_path,
                                        description: 'Path to the version.properties file',
                                        type: String,
                                        optional: true,
-                                       conflicting_options: %i[build_gradle_path
-                                                               project_name
-                                                               project_root_folder]),
-          Fastlane::Helper::Deprecated.project_root_folder_config_item,
-          Fastlane::Helper::Deprecated.project_name_config_item,
-          Fastlane::Helper::Deprecated.has_alpha_version_config_item,
+                                       conflicting_options: [:build_gradle_path]),
         ]
       end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_firebase_test.rb

@@ -50,11 +50,11 @@ module Fastlane
 
         if result.success?
           UI.success 'Firebase Tests Complete'
-          return true
+          true
         else
           ui_method = params[:crash_on_test_failure] ? :test_failure! : :error
           FastlaneCore::UI.send(ui_method, "Firebase Tests failed – more information can be found at #{result.more_details_url}")
-          return false
+          false
         end
       end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_get_alpha_version.rb

@@ -4,16 +4,12 @@ module Fastlane
       def self.run(params)
         require_relative '../../helper/android/android_version_helper'
 
-        has_alpha_version = params[:has_alpha_version]
-        project_root_folder = params[:project_root_folder]
-        project_name = params[:project_name]
-        build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
-        version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
+        build_gradle_path = params[:build_gradle_path]
+        version_properties_path = params[:version_properties_path]
 
         Fastlane::Helper::Android::VersionHelper.get_alpha_version(
           build_gradle_path: build_gradle_path,
-          version_properties_path: version_properties_path,
-          has_alpha_version: has_alpha_version
+          version_properties_path: version_properties_path
         )
       end
 
@@ -35,19 +31,12 @@ module Fastlane
                                        description: 'Path to the build.gradle file',
                                        type: String,
                                        optional: true,
-                                       conflicting_options: %i[project_name
-                                                               project_root_folder
-                                                               version_properties_path]),
+                                       conflicting_options: [:version_properties_path]),
           FastlaneCore::ConfigItem.new(key: :version_properties_path,
                                        description: 'Path to the version.properties file',
                                        type: String,
                                        optional: true,
-                                       conflicting_options: %i[build_gradle_path
-                                                               project_name
-                                                               project_root_folder]),
-          Fastlane::Helper::Deprecated.project_root_folder_config_item,
-          Fastlane::Helper::Deprecated.project_name_config_item,
-          Fastlane::Helper::Deprecated.has_alpha_version_config_item,
+                                       conflicting_options: [:build_gradle_path]),
         ]
       end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_get_app_version.rb

@@ -4,16 +4,12 @@ module Fastlane
       def self.run(params)
         require_relative '../../helper/android/android_version_helper'
 
-        has_alpha_version = params[:has_alpha_version]
-        project_root_folder = params[:project_root_folder]
-        project_name = params[:project_name]
-        build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
-        version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
+        build_gradle_path = params[:build_gradle_path]
+        version_properties_path = params[:version_properties_path]
 
         Fastlane::Helper::Android::VersionHelper.get_public_version(
           build_gradle_path: build_gradle_path,
-          version_properties_path: version_properties_path,
-          has_alpha_version: has_alpha_version
+          version_properties_path: version_properties_path
         )
       end
 
@@ -35,19 +31,12 @@ module Fastlane
                                        description: 'Path to the build.gradle file',
                                        type: String,
                                        optional: true,
-                                       conflicting_options: %i[project_name
-                                                               project_root_folder
-                                                               version_properties_path]),
+                                       conflicting_options: [:version_properties_path]),
           FastlaneCore::ConfigItem.new(key: :version_properties_path,
                                        description: 'Path to the version.properties file',
                                        type: String,
                                        optional: true,
-                                       conflicting_options: %i[build_gradle_path
-                                                               project_name
-                                                               project_root_folder]),
-          Fastlane::Helper::Deprecated.project_root_folder_config_item,
-          Fastlane::Helper::Deprecated.project_name_config_item,
-          Fastlane::Helper::Deprecated.has_alpha_version_config_item,
+                                       conflicting_options: [:build_gradle_path]),
         ]
       end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_get_release_version.rb

@@ -4,16 +4,12 @@ module Fastlane
       def self.run(params)
         require_relative '../../helper/android/android_version_helper'
 
-        has_alpha_version = params[:has_alpha_version]
-        project_root_folder = params[:project_root_folder]
-        project_name = params[:project_name]
-        build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
-        version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
+        build_gradle_path = params[:build_gradle_path]
+        version_properties_path = params[:version_properties_path]
 
         Fastlane::Helper::Android::VersionHelper.get_release_version(
           build_gradle_path: build_gradle_path,
-          version_properties_path: version_properties_path,
-          has_alpha_version: has_alpha_version
+          version_properties_path: version_properties_path
         )
       end
 
@@ -35,19 +31,12 @@ module Fastlane
                                        description: 'Path to the build.gradle file',
                                        type: String,
                                        optional: true,
-                                       conflicting_options: %i[project_name
-                                                               project_root_folder
-                                                               version_properties_path]),
+                                       conflicting_options: [:version_properties_path]),
           FastlaneCore::ConfigItem.new(key: :version_properties_path,
                                        description: 'Path to the version.properties file',
                                        type: String,
                                        optional: true,
-                                       conflicting_options: %i[build_gradle_path
-                                                               project_name
-                                                               project_root_folder]),
-          Fastlane::Helper::Deprecated.project_root_folder_config_item,
-          Fastlane::Helper::Deprecated.project_name_config_item,
-          Fastlane::Helper::Deprecated.has_alpha_version_config_item,
+                                       conflicting_options: [:build_gradle_path]),
         ]
       end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_tag_build.rb

@@ -5,21 +5,16 @@ module Fastlane
         require_relative '../../helper/android/android_version_helper'
         require_relative '../../helper/android/android_git_helper'
 
-        has_alpha_version = params[:has_alpha_version]
-        project_root_folder = params[:project_root_folder]
-        project_name = params[:project_name]
-        build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
-        version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
+        build_gradle_path = params[:build_gradle_path]
+        version_properties_path = params[:version_properties_path]
 
         release_ver = Fastlane::Helper::Android::VersionHelper.get_release_version(
           build_gradle_path: build_gradle_path,
-          version_properties_path: version_properties_path,
-          has_alpha_version: has_alpha_version
+          version_properties_path: version_properties_path
         )
         alpha_ver = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
           build_gradle_path: build_gradle_path,
-          version_properties_path: version_properties_path,
-          has_alpha_version: has_alpha_version
+          version_properties_path: version_properties_path
         )
         Fastlane::Helper::GitHelper.create_tag(release_ver[Fastlane::Helper::Android::VersionHelper::VERSION_NAME])
         Fastlane::Helper::GitHelper.create_tag(alpha_ver[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]) unless alpha_ver.nil? || (params[:tag_alpha] == false)
@@ -48,19 +43,12 @@ module Fastlane
                                        description: 'Path to the build.gradle file',
                                        type: String,
                                        optional: true,
-                                       conflicting_options: %i[project_name
-                                                               project_root_folder
-                                                               version_properties_path]),
+                                       conflicting_options: [:version_properties_path]),
           FastlaneCore::ConfigItem.new(key: :version_properties_path,
                                        description: 'Path to the version.properties file',
                                        type: String,
                                        optional: true,
-                                       conflicting_options: %i[build_gradle_path
-                                                               project_name
-                                                               project_root_folder]),
-          Fastlane::Helper::Deprecated.project_root_folder_config_item,
-          Fastlane::Helper::Deprecated.project_name_config_item,
-          Fastlane::Helper::Deprecated.has_alpha_version_config_item,
+                                       conflicting_options: [:build_gradle_path]),
         ]
       end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_update_release_notes.rb

@@ -8,8 +8,6 @@ module Fastlane
         require_relative '../../helper/release_notes_helper'
         require_relative '../../helper/git_helper'
 
-        UI.deprecated('The `PROJECT_ROOT_FOLDER` environment variable is deprecated and will be removed in a future release. Please pass a path to the `release_notes_file_path` param instead.') unless ENV['PROJECT_ROOT_FOLDER'].nil?
-
         path = params[:release_notes_file_path]
         next_version = Fastlane::Helper::Android::VersionHelper.calc_next_release_short_version(params[:new_version])
 
@@ -41,7 +39,7 @@ module Fastlane
                                        env_name: 'FL_ANDROID_UPDATE_RELEASE_NOTES_FILE_PATH',
                                        description: 'The path to the release notes file to be updated',
                                        type: String,
-                                       default_value: File.join(ENV['PROJECT_ROOT_FOLDER'] || '.', 'RELEASE-NOTES.txt')),
+                                       default_value: 'RELEASE-NOTES.txt'),
         ]
       end
 

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

@@ -14,10 +14,10 @@ module Fastlane
           extracted_notes_file.nil? ? puts(line) : extracted_notes_file.write(line)
         end
 
-        unless extracted_notes_file.nil?
-          extracted_notes_file.close
-          check_and_commit_extracted_notes_file(extracted_notes_file_path, version)
-        end
+        return if extracted_notes_file.nil?
+
+        extracted_notes_file.close
+        check_and_commit_extracted_notes_file(extracted_notes_file_path, version)
       end
 
       def self.extract_notes(release_notes_file_path, version)

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

@@ -35,7 +35,7 @@ module Fastlane
       # .po fo the others.
       def self.create_temp_po(params)
         orig = params[:po_file_path]
-        target = self.create_target_file_path(orig)
+        target = create_target_file_path(orig)
 
         # Clear if older exists
         FileUtils.rm_f(target)
@@ -47,7 +47,7 @@ module Fastlane
               write_target_block(fw, fr)
             end
           end
-        rescue
+        rescue StandardError
           FileUtils.rm_f(target)
           raise
         end

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

@@ -8,8 +8,8 @@ module Fastlane
     class PromoScreenshotsAction < Action
       def self.run(params)
         UI.message 'Creating Promo Screenshots'
-        UI.message "#{self.check_path(params[:orig_folder])} Original Screenshot Source: #{params[:orig_folder]}"
-        UI.message "#{self.check_path(params[:metadata_folder])} Translation source: #{params[:metadata_folder]}"
+        UI.message "#{check_path(params[:orig_folder])} Original Screenshot Source: #{params[:orig_folder]}"
+        UI.message "#{check_path(params[:metadata_folder])} Translation source: #{params[:metadata_folder]}"
 
         config = helper.read_config(params[:config_file])
 
@@ -19,7 +19,7 @@ module Fastlane
         image_directories = subdirectories_for_path(params[:orig_folder])
 
         if helper.can_resolve_path(params[:output_folder])
-          UI.message "#{self.check_path(params[:output_folder])} Output Folder: #{params[:output_folder]}"
+          UI.message "#{check_path(params[:output_folder])} Output Folder: #{params[:output_folder]}"
         else
           UI.message "✅ Created Output Folder: #{params[:output_folder]}"
           FileUtils.mkdir_p(params[:output_folder])
@@ -113,11 +113,11 @@ module Fastlane
       end
 
       def self.check_path(path)
-        self.helper.can_resolve_path(path) ? '✅' : '🚫'
+        helper.can_resolve_path(path) ? '✅' : '🚫'
       end
 
       def self.helper
-        return Fastlane::Helper::PromoScreenshots.new
+        Fastlane::Helper::PromoScreenshots.new
       end
 
       def self.description

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

@@ -55,16 +55,5 @@ module Fastlane
         true
       end
     end
-
-    # For backwards compatibility
-    class RemovebranchprotectionAction < RemoveBranchProtectionAction
-      def self.category
-        :deprecated
-      end
-
-      def self.deprecated_notes
-        "This action has been renamed `#{superclass.action_name}`"
-      end
-    end
   end
 end

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

@@ -138,16 +138,5 @@ module Fastlane
         true
       end
     end
-
-    # For backwards compatibility
-    class SetbranchprotectionAction < SetBranchProtectionAction
-      def self.category
-        :deprecated
-      end
-
-      def self.deprecated_notes
-        "This action has been renamed `#{superclass.action_name}`"
-      end
-    end
   end
 end

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/{setfrozentag_action.rb → set_milestone_frozen_marker_action.rb}

@@ -3,7 +3,7 @@ require_relative '../../helper/github_helper'
 
 module Fastlane
   module Actions
-    class SetfrozentagAction < Action
+    class SetMilestoneFrozenMarkerAction < Action
       def self.run(params)
         repository = params[:repository]
         milestone_title = params[:milestone]
@@ -12,49 +12,45 @@ module Fastlane
         github_helper = Fastlane::Helper::GithubHelper.new(github_token: params[:github_token])
         milestone = github_helper.get_milestone(repository, milestone_title)
 
-        UI.user_error!("Milestone #{milestone_title} not found.") if milestone.nil?
+        UI.user_error!("Milestone `#{milestone_title}` not found.") if milestone.nil?
 
         mile_title = milestone[:title]
-        puts freeze
+
         if freeze
           # Check if the state needs changes
           if is_frozen(milestone)
-            UI.message("Milestone #{mile_title} is already frozen. Nothing to do")
+            UI.message("Milestone `#{mile_title}` is already frozen. Nothing to do")
             return # Already frozen: nothing to do
           end
 
           mile_title = "#{mile_title} ❄️"
         else
-          mile_title = milestone_title
+          unless is_frozen(milestone)
+            UI.message("Milestone `#{mile_title}` is not frozen. Nothing to do")
+            return # Not frozen: nothing to do
+          end
+
+          mile_title = milestone[:title].gsub(/ ?❄️/, '')
         end
 
-        UI.message("New milestone: #{mile_title}")
+        UI.message("New milestone title: `#{mile_title}`")
         github_helper.update_milestone(repository: repository, number: milestone[:number], title: mile_title)
       end
 
       def self.is_frozen(milestone)
         return milestone[:title].include?('❄️') unless milestone.nil?
 
-        return false
+        false
       end
 
       def self.description
-        'Sets the frozen tag for the specified milestone'
+        'Add or remove the frozen marker (❄️ emoji) on a given GitHub milestone'
       end
 
       def self.authors
         ['Automattic']
       end
 
-      def self.return_value
-        # If your method provides a return value, you can describe here what it does
-      end
-
-      def self.details
-        # Optional:
-        'Sets the frozen tag for the specified milestone'
-      end
-
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :repository,
@@ -68,7 +64,7 @@ module Fastlane
                                        optional: false,
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :freeze,
-                                       description: 'If true, the action will add the ❄️ emoji to the milestone title',
+                                       description: 'If true, the action will add the ❄️ emoji to the milestone title; otherwise, will remove it if already present',
                                        optional: false,
                                        default_value: true,
                                        type: Boolean),

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/{update_pull_requests_milestone_action.rb → update_assigned_milestone_action.rb}

@@ -3,16 +3,16 @@ require_relative '../../helper/github_helper'
 
 module Fastlane
   module Actions
-    class UpdatePullRequestsMilestoneAction < Action
+    class UpdateAssignedMilestoneAction < Action
       def self.run(params)
         repository = params[:repository]
 
         github_helper = Fastlane::Helper::GithubHelper.new(github_token: params[:github_token])
 
-        pr_numbers = params[:pr_numbers]
+        numbers = params[:numbers]
         from_milestone = params[:from_milestone]
         to_milestone = params[:to_milestone]
-        pr_comment = params[:pr_comment]
+        comment = params[:comment]
 
         target_milestone = nil
         unless to_milestone.nil?
@@ -20,39 +20,39 @@ module Fastlane
           UI.user_error!("Unable to find target milestone matching version #{to_milestone}") if target_milestone.nil?
         end
 
-        prs_nums = if pr_numbers
-                     pr_numbers
-                   elsif from_milestone
-                     # get the milestone object based on title starting text
-                     m = github_helper.get_milestone(repository, from_milestone)
-                     UI.user_error!("Unable to find source milestone matching version #{from_milestone}") if m.nil?
+        issues_list = if numbers
+                        numbers
+                      elsif from_milestone
+                        # get the milestone object based on title starting text
+                        m = github_helper.get_milestone(repository, from_milestone)
+                        UI.user_error!("Unable to find source milestone matching version #{from_milestone}") if m.nil?
 
-                     # get all open PRs in that milestone
-                     github_helper.get_prs_for_milestone(repository: repository, milestone: m).map(&:number)
-                   else
-                     UI.user_error!('One of `pr_numbers` or `from_milestone` must be provided to indicate which PR(s) to update')
-                   end
+                        # get all open PRs in that milestone
+                        github_helper.get_prs_and_issues_for_milestone(repository: repository, milestone: m).map(&:number)
+                      else
+                        UI.user_error!('One of `numbers` or `from_milestone` must be provided to indicate which PR(s)/issue(s) to update')
+                      end
 
-        UI.message("Updating milestone of #{prs_nums.count} PRs to `#{target_milestone&.title}`")
+        UI.message("Updating milestone of #{issues_list.count} PRs/Issues to `#{target_milestone&.title}`")
 
-        prs_nums.each do |pr_num|
-          github_helper.set_pr_milestone(
+        issues_list.each do |num|
+          github_helper.set_milestone(
             repository: repository,
-            pr_number: pr_num,
+            number: num,
             milestone: target_milestone
           )
-          next if pr_comment.nil? || pr_comment.empty?
+          next if comment.nil? || comment.empty?
 
           github_helper.comment_on_pr(
             project_slug: repository,
-            pr_number: pr_num,
-            body: pr_comment
+            pr_number: num,
+            body: comment
           )
         end
       end
 
       def self.description
-        'Updates the milestone field of PRs'
+        'Updates the milestone field of GitHub Issues and PRs'
       end
 
       def self.authors
@@ -60,11 +60,11 @@ module Fastlane
       end
 
       def self.return_value
-        'The PR numbers of all the PRs that were updated with the new milestone'
+        'The numbers of all the PRs and Isses that were updated with the new milestone'
       end
 
       def self.details
-        'Updates the milestone field of a PR, of or all still-opened PRs in a milestone'
+        'Updates the milestone field of a given list of PRs/Issues, or of all still-opened PRs/Issues in a given milestone'
       end
 
       def self.available_options
@@ -74,22 +74,22 @@ module Fastlane
                                        description: 'The remote path of the GH repository on which we work',
                                        optional: false,
                                        type: String),
-          FastlaneCore::ConfigItem.new(key: :pr_numbers,
-                                       description: 'The PR numbers to update the milestone of',
+          FastlaneCore::ConfigItem.new(key: :numbers,
+                                       description: 'The PR and/or issue numbers to update the milestone of',
                                        optional: true,
                                        type: Array,
                                        conflicting_options: [:from_milestone]),
           FastlaneCore::ConfigItem.new(key: :from_milestone,
-                                       description: 'The version (milestone title\'s start) for which we want to update all open PRs of to a new milestone',
+                                       description: 'The version (start of the milestone title) for which we intend to update all open PRs and issues to a new milestone',
                                        optional: true,
                                        type: String,
-                                       conflicting_options: [:pr_numbers]),
+                                       conflicting_options: [:numbers]),
           FastlaneCore::ConfigItem.new(key: :to_milestone,
-                                       description: 'The version (milestone title\'s start) for the new milestone to assign to the targeted PRs. Pass nil to unset the milestone',
+                                       description: 'The version (start of the milestone title) for the new milestone to assign to the targeted PRs and issues. Pass nil to unset the milestone',
                                        optional: true,
                                        type: String),
-          FastlaneCore::ConfigItem.new(key: :pr_comment,
-                                       description: 'If non-nil, the custom comment to leave on each PR whose milestone has been updated',
+          FastlaneCore::ConfigItem.new(key: :comment,
+                                       description: 'If non-nil, the custom comment to leave on each PR and issue whose milestone has been updated',
                                        optional: true,
                                        type: String),
           Fastlane::Helper::GithubHelper.github_token_config_item,

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

@@ -53,7 +53,7 @@ module Fastlane
 
         Actions.lane_context[SharedValues::S3_UPLOADED_FILE_PATH] = key
 
-        return key
+        key
       end
 
       def self.file_is_already_uploaded?(bucket, key)
@@ -61,9 +61,9 @@ module Fastlane
           bucket: bucket,
           key: key
         )
-        return response[:content_length].positive?
+        response[:content_length].positive?
       rescue Aws::S3::Errors::NotFound
-        return false
+        false
       end
 
       def self.description

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

@@ -24,9 +24,7 @@ module Fastlane
             continue = false
           end
 
-          Fastlane::Helper::ConfigureHelper.files_to_copy.each do |file_reference|
-            file_reference.update
-          end
+          Fastlane::Helper::ConfigureHelper.files_to_copy.each(&:update)
         end
       end
 

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

@@ -34,9 +34,7 @@ module Fastlane
           update_configure_file
         end
 
-        Fastlane::Helper::ConfigureHelper.files_to_copy.each do |file_reference|
-          file_reference.update
-        end
+        Fastlane::Helper::ConfigureHelper.files_to_copy.each(&:update)
 
         UI.success "Configuration Secrets are up to date – don't forget to commit your changes to `.configure`."
 
@@ -56,10 +54,10 @@ module Fastlane
       end
 
       def self.prompt_to_update_to_most_recent_version
-        if UI.confirm("The current branch is #{repo_commits_behind_remote} commit(s) behind. Would you like to update it?")
-          update_branch
-          update_configure_file
-        end
+        return unless UI.confirm("The current branch is #{repo_commits_behind_remote} commit(s) behind. Would you like to update it?")
+
+        update_branch
+        update_configure_file
       end
 
       def self.prompt_to_update_configure_file_to_most_recent_hash