fastlane-plugin-wpmreleasetoolkit 9.4.0 → 10.0.0

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

@@ -30,11 +30,10 @@ module Fastlane
         #         - If this version is a hotfix (more than 2 parts and 3rd part is non-zero), returns the "X.Y.Z" formatted string
         #         - Otherwise (not a hotfix / 3rd part of version is 0), returns "X.Y" formatted version number
         #
-        def self.get_public_version(build_gradle_path:, version_properties_path:, has_alpha_version:)
+        def self.get_public_version(build_gradle_path:, version_properties_path:)
           version = 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
           )
           vp = get_version_parts(version[VERSION_NAME])
           return "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}" unless is_hotfix?(version)
@@ -46,13 +45,13 @@ module Fastlane
         #
         # @return [Hash] A hash with 2 keys "name" and "code" containing the extracted version name and code, respectively
         #
-        def self.get_release_version(build_gradle_path:, version_properties_path:, has_alpha_version:)
+        def self.get_release_version(build_gradle_path:, version_properties_path:)
           return get_version_from_properties(version_properties_path: version_properties_path) if File.exist?(version_properties_path)
 
-          section = has_alpha_version.nil? ? 'defaultConfig' : 'vanilla {'
+          section = 'defaultConfig'
           name = get_version_name_from_gradle_file(build_gradle_path, section)
           code = get_version_build_from_gradle_file(build_gradle_path, section)
-          return { VERSION_NAME => name, VERSION_CODE => code }
+          { VERSION_NAME => name, VERSION_CODE => code }
         end
 
         # Extract the version name and code from the `version.properties` file in the project root
@@ -71,23 +70,20 @@ module Fastlane
           name = text.match(/#{version_name_key}=(\S*)/m)&.captures&.first
           code = text.match(/#{version_code_key}=(\S*)/m)&.captures&.first
 
-          return name.nil? || code.nil? ? nil : { VERSION_NAME => name, VERSION_CODE => code.to_i }
+          name.nil? || code.nil? ? nil : { VERSION_NAME => name, VERSION_CODE => code.to_i }
         end
 
         # Extract the version name and code from the `version.properties` file in the project root
         #
-        # @return [Hash] A hash with 2 keys `"name"` and `"code"` containing the extracted version name and code, respectively,
-        #                or `nil` if `$HAS_ALPHA_VERSION` is not defined.
+        # @return [Hash] A hash with 2 keys `"name"` and `"code"` containing the extracted version name and code, respectively
         #
-        def self.get_alpha_version(build_gradle_path:, version_properties_path:, has_alpha_version:)
+        def self.get_alpha_version(build_gradle_path:, version_properties_path:)
           return get_version_from_properties(version_properties_path: version_properties_path, is_alpha: true) if File.exist?(version_properties_path)
 
-          return nil if has_alpha_version.nil?
-
           section = 'defaultConfig'
           name = get_version_name_from_gradle_file(build_gradle_path, section)
           code = get_version_build_from_gradle_file(build_gradle_path, section)
-          return { VERSION_NAME => name, VERSION_CODE => code }
+          { VERSION_NAME => name, VERSION_CODE => code }
         end
 
         # Determines if a version name corresponds to an alpha version (starts with `"alpha-"`` prefix)
@@ -185,8 +181,8 @@ module Fastlane
         # @return [String] The version name for the next release
         #
         def self.calc_next_release_short_version(version)
-          v = self.calc_next_release_base_version(VERSION_NAME => version, VERSION_CODE => nil)
-          return v[VERSION_NAME]
+          v = calc_next_release_base_version(VERSION_NAME => version, VERSION_CODE => nil)
+          v[VERSION_NAME]
         end
 
         # Compute the next release version name for the given version, without incrementing the version code
@@ -251,7 +247,7 @@ module Fastlane
         #
         def self.calc_prev_release_version(version)
           vp = get_version_parts(version)
-          if vp[MINOR_NUMBER] == 0
+          if (vp[MINOR_NUMBER]).zero?
             vp[MAJOR_NUMBER] -= 1
             vp[MINOR_NUMBER] = 9
           else
@@ -271,26 +267,23 @@ module Fastlane
           return false if is_alpha_version?(version)
 
           vp = get_version_parts(version[VERSION_NAME])
-          return (vp.length > 2) && (vp[HOTFIX_NUMBER] != 0)
+          (vp.length > 2) && (vp[HOTFIX_NUMBER] != 0)
         end
 
         # Prints the current and next release version names to stdout, then returns the next release version
         #
         # @return [String] The next release version name to use after bumping the currently used release version.
         #
-        def self.bump_version_release(build_gradle_path:, version_properties_path:, has_alpha_version:)
+        def self.bump_version_release(build_gradle_path:, version_properties_path:)
           # Bump release
-          current_version = self.get_release_version(
+          current_version = 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
           )
           UI.message("Current version: #{current_version[VERSION_NAME]}")
           new_version = calc_next_release_base_version(current_version)
           UI.message("New version: #{new_version[VERSION_NAME]}")
-          verified_version = verify_version(new_version[VERSION_NAME])
-
-          return verified_version
+          verify_version(new_version[VERSION_NAME])
         end
 
         # Update the `version.properties` file with new `versionName` and `versionCode` values
@@ -298,7 +291,7 @@ module Fastlane
         # @param [Hash] new_version_beta The version hash for the beta, containing values for keys "name" and "code"
         # @param [Hash] new_version_alpha The version hash for the alpha , containing values for keys "name" and "code"
         #
-        def self.update_versions(new_version_beta, new_version_alpha, version_properties_path:, has_alpha_version:)
+        def self.update_versions(new_version_beta, new_version_alpha, version_properties_path:)
           if File.exist?(version_properties_path)
             replacements = {
               versionName: (new_version_beta || {})[VERSION_NAME],
@@ -314,8 +307,8 @@ module Fastlane
             end
             File.write(version_properties_path, content)
           else
-            self.update_version(new_version_beta, has_alpha_version.nil? ? 'defaultConfig' : 'vanilla {')
-            self.update_version(new_version_alpha, 'defaultConfig') unless new_version_alpha.nil?
+            update_version(new_version_beta, 'defaultConfig')
+            update_version(new_version_alpha, 'defaultConfig') unless new_version_alpha.nil?
           end
         end
 
@@ -328,8 +321,8 @@ module Fastlane
         #
         def self.calc_prev_hotfix_version_name(version_name)
           vp = get_version_parts(version_name)
-          vp[HOTFIX_NUMBER] -= 1 unless vp[HOTFIX_NUMBER] == 0
-          return "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}.#{vp[HOTFIX_NUMBER]}" unless vp[HOTFIX_NUMBER] == 0
+          vp[HOTFIX_NUMBER] -= 1 unless (vp[HOTFIX_NUMBER]).zero?
+          return "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}.#{vp[HOTFIX_NUMBER]}" unless (vp[HOTFIX_NUMBER]).zero?
 
           "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}"
         end
@@ -372,7 +365,7 @@ module Fastlane
         def self.get_version_parts(version)
           parts = version.split('.').map(&:to_i)
           parts.fill(0, parts.length...3) # add 0 if needed to ensure array has at least 3 components
-          return parts
+          parts
         end
 
         # Ensure that a version string is correctly formatted (that is, each of its parts is a number) and returns the 2-parts version number
@@ -399,7 +392,9 @@ module Fastlane
         # @return [Bool] true if the string is representing an integer value, false if not
         #
         def self.is_int?(string)
-          true if Integer(string) rescue false
+          true if Integer(string)
+        rescue StandardError
+          false
         end
 
         #########
@@ -416,7 +411,7 @@ module Fastlane
         def self.get_version_name_from_gradle_file(file_path, section)
           res = get_keyword_from_gradle_file(file_path, section, 'versionName')
           res = res.tr('\"', '') unless res.nil?
-          return res
+          res
         end
 
         # Extract the versionCode rom a build.gradle file
@@ -428,7 +423,7 @@ module Fastlane
         #
         def self.get_version_build_from_gradle_file(file_path, section)
           res = get_keyword_from_gradle_file(file_path, section, 'versionCode')
-          return res.to_i
+          res.to_i
         end
 
         # Extract the value for a specific keyword in a specific section of a `.gradle` file
@@ -453,7 +448,7 @@ module Fastlane
               end
             end
           end
-          return nil
+          nil
         end
 
         # Update both the versionName and versionCode of the build.gradle file to the specified version.

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/configure_helper.rb

@@ -1,3 +1,4 @@
+require 'English'
 require 'fastlane_core/ui/ui'
 require 'fileutils'
 
@@ -12,7 +13,7 @@ module Fastlane
       ### If the file doesn't exist, it'll return an empty Configuration
       ### that can later be saved to `.configure`.
       def self.configuration
-        if self.configuration_path_exists
+        if configuration_path_exists
           Configuration.from_file(FilesystemHelper.configure_file)
         else
           Configuration.new
@@ -95,13 +96,13 @@ module Fastlane
       ### Returns whether or not the `.configure` file has a pinned hash that's older than the most recent
       ### ~/.mobile-secrets` commit hash.
       def self.configure_file_is_behind_local
-        configure_file_commits_behind_repo > 0
+        configure_file_commits_behind_repo.positive?
       end
 
       def self.configure_file_commits_behind_repo
         # Get a sily number of revisions to ensure we don't miss any
         result = `cd #{repository_path} && git --no-pager log -10000 --pretty=format:"%H" && echo`
-        hashes = result.each_line.map { |s| s.strip }.reverse
+        hashes = result.each_line.map(&:strip).reverse
 
         index_of_configure_hash = hashes.find_index(configure_file_commit_hash)
         index_of_repo_commit_hash = hashes.find_index(repo_commit_hash)
@@ -114,13 +115,13 @@ module Fastlane
       ### Get a list of files changed in the secrets repo between to commits
       def self.files_changed_between(commit_hash_1, commit_hash_2)
         result = `cd #{repository_path} && git diff --name-only #{commit_hash_1}...#{commit_hash_2}`
-        result.each_line.map { |s| s.strip }
+        result.each_line.map(&:strip)
       end
 
       ### Determine whether ~/.mobile-secrets` repository is behind its remote counterpart.
       ### (ie – the remote repo has changes that the local repo doesn't)
       def self.repo_is_behind_remote
-        repo_commits_behind_remote > 0
+        repo_commits_behind_remote.positive?
       end
 
       ### Determine how far behind the remote repo the ~/.mobile-secrets` repository is.
@@ -135,7 +136,7 @@ module Fastlane
       ### Determine whether ~/.mobile-secrets` repository is ahead of its remote counterpart.
       ### (ie – the local repo has changes that the remote repo doesn't)
       def self.repo_is_ahead_of_remote
-        repo_commits_ahead_of_remote > 0
+        repo_commits_ahead_of_remote.positive?
       end
 
       ### Determine how far ahead of the remote repo the ~/.mobile-secrets` repository is.
@@ -173,38 +174,36 @@ module Fastlane
 
       ### Returns the list of files to copy from `.configure`.
       def self.files_to_copy
-        self.configuration.files_to_copy
+        configuration.files_to_copy
       end
 
       ### Returns the list of files that this project uses from `.configure`.
       def self.file_dependencies
-        file_dependencies = self.configuration.file_dependencies
+        file_dependencies = configuration.file_dependencies
         file_dependencies ||= []
 
         # Allows support for specifying directories – they'll be expanded recursively
         expanded_file_dependencies = file_dependencies.map do |path|
-          abs_path = self.mobile_secrets_path(path)
-
-          if File.directory?(abs_path)
-            Dir.glob("#{abs_path}**/*").map do |sub_path|
-              sub_path.gsub("#{repository_path}/", '')
-            end
-          else
-            return path
+          abs_path = mobile_secrets_path(path)
+
+          return path unless File.directory?(abs_path)
+
+          Dir.glob("#{abs_path}**/*").map do |sub_path|
+            sub_path.gsub("#{repository_path}/", '')
           end
         end
 
-        self.files_to_copy.map { |o| o.file } + expanded_file_dependencies
+        files_to_copy.map(&:file) + expanded_file_dependencies
       end
 
       ## If we specify a directory in `file_dependencies` instead of listing each file
       ## individually, there may be new files that we don't know about. This method finds those.
       def self.new_files_in(files)
-        file_dependencies = self.configuration.file_dependencies
+        file_dependencies = configuration.file_dependencies
         file_dependencies ||= []
 
         directory_dependencies = file_dependencies.select do |path|
-          File.directory?(self.mobile_secrets_path(path))
+          File.directory?(mobile_secrets_path(path))
         end
 
         new_files = []
@@ -229,7 +228,7 @@ module Fastlane
           UI.user_error! "Attempted to add a file to a location which is not ignored under Git (#{params[:destination]}). Please either edit your `.configure` file to use an already-ignored destination, or add that destination to the `.gitignore` manually to fix this."
         end
 
-        new_config = self.configuration
+        new_config = configuration
         new_config.add_file_to_copy(params[:source], params[:destination], encrypt: params[:encrypt])
         update_configuration(new_config)
       end
@@ -275,7 +274,7 @@ module Fastlane
         `cd #{repository_path} && git add keys.json && git commit -m "Update keys.json for #{configuration.project_name}" && git push origin #{repo_branch_name}`
 
         # Check command success
-        UI.user_error!("Failed to update encryption key for #{configuration.project_name}") unless $?.success?
+        UI.user_error!("Failed to update encryption key for #{configuration.project_name}") unless $CHILD_STATUS.success?
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/filesystem_helper.rb

@@ -66,7 +66,7 @@ module Fastlane
 
       ### Returns the path to the `~/.mobile-secrets` directory.
       def self.secret_store_dir
-        return "#{Dir.home}/.mobile-secrets"
+        "#{Dir.home}/.mobile-secrets"
       end
 
       ### Transforms a relative path within the secret store to an absolute path on disk.

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/git_helper.rb

@@ -25,7 +25,7 @@ module Fastlane
 
         # If we reached the root, we haven't found a repo.
         # (Technically, there could be a repo in the root of the system, but that's a usecase that we don't need to support at this time)
-        return dir.root? == false
+        dir.root? == false
       end
 
       # Travels back the hierarchy of the given path until it finds an existing ancestor, or it reaches the root of the file system.
@@ -37,7 +37,7 @@ module Fastlane
       def self.first_existing_ancestor_of(path:)
         p = Pathname(path).expand_path
         p = p.parent until p.exist? || p.root?
-        return p
+        p
       end
 
       # Check if the current directory has git-lfs enabled
@@ -62,14 +62,17 @@ module Fastlane
         branch = branch.first.join('/') if branch.is_a?(Hash)
         Action.sh('git', 'checkout', branch)
         Action.sh('git', 'pull')
-        return true
-      rescue
-        return false
+        true
+      rescue StandardError
+        false
       end
 
       # Update every submodule in the current git repository
       #
+      # @deprecated This method is going to be removed soon. Fastlane has a built-in `git_submodule_update` action that can be used instead.
+      #
       def self.update_submodules
+        UI.deprecated("The `update_submodules` method will soon be removed from `release-toolkit`. Please use fastlane's `git_submodule_update` action instead.")
         Action.sh('git', 'submodule', 'update', '--init', '--recursive')
       end
 
@@ -111,9 +114,9 @@ module Fastlane
         end
         begin
           Action.sh('git', 'commit', *args, '-m', message)
-          return true
-        rescue
-          return false
+          true
+        rescue StandardError
+          false
         end
       end
 
@@ -209,7 +212,14 @@ module Fastlane
       #
       # @raise [UserError] Raises a user_error! and interrupts the lane if we are not on the expected branch.
       #
+      # @deprecated This method is going to be removed soon. Fastlane has a built-in `ensure_git_branch` action that can be used instead.
+      #             After updating to Fastlane version `2.217.0` or later, the `FL_GIT_BRANCH_DONT_USE_ENV_VARS` environment
+      #             variable can be set to `true` to disable the use of environment variables for the `git_branch` action that
+      #             `ensure_git_branch` relies on. This will make `ensure_git_branch` work as expected in CI environments.
+      #             See https://github.com/fastlane/fastlane/pull/21597 for more details.
+      #
       def self.ensure_on_branch!(branch_name)
+        UI.deprecated("The `ensure_on_branch!` method will soon be removed from `release-toolkit`. Please use fastlane's `ensure_git_branch` action (+ potentially set `FL_GIT_BRANCH_DONT_USE_ENV_VARS=true`) instead.")
         current_branch_name = Action.sh('git', 'symbolic-ref', '-q', 'HEAD')
         UI.user_error!("This command works only on #{branch_name} branch") unless current_branch_name.include?(branch_name)
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/github_helper.rb

@@ -37,16 +37,16 @@ module Fastlane
         end
       end
 
-      # Fetch all the PRs for a given milestone
+      # Fetch all the PRs and issues for a given milestone
       #
       # @param [String] repository The repository name, including the organization (e.g. `wordpress-mobile/wordpress-ios`)
       # @param [Sawyer::Resource, String] milestone The milestone object, or title of the milestone, we want to fetch the list of PRs for (e.g.: `16.9`)
       # @param [Boolean] include_closed If set to true, will include both opened and closed PRs. Otherwise, will only include opened PRs.
       # @return [Array<Sawyer::Resource>] A list of the PRs for the given milestone, sorted by number
       #
-      def get_prs_for_milestone(repository:, milestone:, include_closed: false)
+      def get_prs_and_issues_for_milestone(repository:, milestone:, include_closed: false)
         milestone_title = milestone.is_a?(Sawyer::Resource) ? milestone.title : milestone
-        query = %(repo:#{repository} type:pr milestone:"#{milestone_title}")
+        query = %(repo:#{repository} milestone:"#{milestone_title}")
         query += ' is:open' unless include_closed
 
         client.search_issues(query)[:items].sort_by(&:number)
@@ -55,17 +55,17 @@ module Fastlane
       # Set/Update the milestone assigned to a given PR or issue
       #
       # @param [String] repository The repository name, including the organization (e.g. `wordpress-mobile/wordpress-ios`)
-      # @param [Integer] pr_number The PR (or issue) number to update the milestone of
+      # @param [Integer] number The PR (or issue) number to update the milestone of
       # @param [Sawyer::Resource?, Integer?] milestone The milestone object or number to set on this PR, or nil to unset the milestone
       # @note Use `get_milestone` to get a milestone object from a version number
       # @raise [Fastlane::UI::Error] UI.user_error! if PR does not exist or milestone provided is invalid
       #
-      def set_pr_milestone(repository:, pr_number:, milestone:)
+      def set_milestone(repository:, number:, milestone:)
         milestone_num = milestone.is_a?(Sawyer::Resource) ? milestone.number : milestone
 
-        client.update_issue(repository, pr_number, { milestone: milestone_num })
+        client.update_issue(repository, number, { milestone: milestone_num })
       rescue Octokit::NotFound
-        UI.user_error!("Could not find PR ##{pr_number} in #{repository}")
+        UI.user_error!("Could not find PR or issue ##{number} in #{repository}")
       rescue Octokit::UnprocessableEntity
         UI.user_error!("Invalid milestone #{milestone_num}")
       end
@@ -237,7 +237,7 @@ module Fastlane
           comment.user.id == client.user.id and comment.body.include?(reuse_marker)
         end
 
-        comment_body = reuse_marker + body
+        comment_body = "#{reuse_marker}\n\n#{body}"
 
         if existing_comment.nil?
           client.add_comment(project_slug, pr_number, comment_body)

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/glotpress_helper.rb

@@ -72,7 +72,7 @@ module Fastlane
         # 2. Match the info and extract the value in group 1.
         # 3. Values use comma as thousands separator, so remove it.
         # 4. Convert to integer.
-        data.grep(/#{regex}/)[0].match(/#{regex}/)[1].gsub(/,/, '').to_i
+        data.grep(/#{regex}/)[0].match(/#{regex}/)[1].gsub(',', '').to_i
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/interactive_prompt_reminder.rb

@@ -61,7 +61,7 @@ module FastlaneCore
       # if we replied before the timeout, kill the thread so message won't be triggered
       thread.kill
       # If the block given returned a value, pass it
-      return res
+      res
     end
 
     # Monkey-Patch fastlane's `UI.input`, `UI.confirm`, `UI.select` and `UI.password` interactive methods

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_adc_app_sizes_helper.rb

@@ -21,14 +21,18 @@ module Fastlane
           UI.message 'Fetching the list of versions...'
           versions = app.app_store_versions.select { |v| v.version_string == only_version && !v.build.nil? }
           versions = app.get_app_store_versions.reject { |v| v.build.nil? } if versions.empty?
-          UI.message "Found #{versions.count} versions." + (limit == 0 ? '' : " Limiting to last #{limit}")
-          versions = versions.first(limit) unless limit == 0
+          UI.message "Found #{versions.count} versions." + (limit.zero? ? '' : " Limiting to last #{limit}")
+          versions = versions.first(limit) unless limit.zero?
 
           UI.message 'Fetching App Sizes...'
 
           builds_details = versions.each_with_index.map do |v, idx|
             print "Fetching info for: #{v.version_string.rjust(8)} (#{v.build.version.rjust(11)}) [#{idx.to_s.rjust(3)}/#{versions.count}]\r"
-            Spaceship::Tunes.client.build_details(app_id: app.id, train: v.version_string, build_number: v.build.version, platform: 'ios') rescue nil
+            begin
+              Spaceship::Tunes.client.build_details(app_id: app.id, train: v.version_string, build_number: v.build.version, platform: 'ios')
+            rescue StandardError
+              nil
+            end
           end.compact.reverse
           print("#{' ' * 55}\n")
 

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_l10n_helper.rb

@@ -30,9 +30,9 @@ module Fastlane
           return nil unless status.success?
 
           case format_desc
-          when /Apple binary property list/ then return :binary
-          when /XML/ then return :xml
-          when /text/ then return :text
+          when /Apple binary property list/ then :binary
+          when /XML/ then :xml
+          when /text/ then :text
           end
         end
 
@@ -173,7 +173,7 @@ module Fastlane
           rescue StandardError => e
             UI.error "Error downloading locale `#{locale}` — #{e.message} (#{uri})"
             retry if e.is_a?(OpenURI::HTTPError) && UI.confirm("Retry downloading `#{locale}`?")
-            return nil
+            nil
           end
         end
       end

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_l10n_linter_helper.rb

@@ -31,9 +31,9 @@ module Fastlane
           # The SwiftGen version string has this format:
           #
           # SwiftGen v6.4.0 (Stencil v0.13.1, StencilSwiftKit v2.7.2, SwiftGenKit v6.4.0)
-          return vers_string.include?("SwiftGen v#{version}")
-        rescue
-          return false
+          vers_string.include?("SwiftGen v#{version}")
+        rescue StandardError
+          false
         end
 
         # Download the ZIP of SwiftGen for the requested `version` and install it in the `install_path`
@@ -135,7 +135,7 @@ module Fastlane
           config_file = File.join(output_dir, CONFIG_FILE_NAME)
           File.write(config_file, config.to_yaml)
 
-          return [config_file, langs]
+          [config_file, langs]
         end
 
         # Returns a Hash mapping the list of expected parameter types for each of the keys based in the %… placeholders found in their `.strings` files

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_version_helper.rb

@@ -89,7 +89,7 @@ module Fastlane
         #
         def self.calc_prev_release_version(version)
           vp = get_version_parts(version)
-          if vp[MINOR_NUMBER] == 0
+          if (vp[MINOR_NUMBER]).zero?
             vp[MAJOR_NUMBER] -= 1
             vp[MINOR_NUMBER] = 9
           else
@@ -134,7 +134,7 @@ module Fastlane
         #
         def self.calc_prev_build_version(version)
           vp = get_version_parts(version)
-          vp[BUILD_NUMBER] -= 1 unless vp[BUILD_NUMBER] == 0
+          vp[BUILD_NUMBER] -= 1 unless (vp[BUILD_NUMBER]).zero?
           "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}.#{vp[HOTFIX_NUMBER]}.#{vp[BUILD_NUMBER]}"
         end
 
@@ -147,8 +147,8 @@ module Fastlane
         #
         def self.calc_prev_hotfix_version(version)
           vp = get_version_parts(version)
-          vp[HOTFIX_NUMBER] -= 1 unless vp[HOTFIX_NUMBER] == 0
-          return "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}.#{vp[HOTFIX_NUMBER]}" unless vp[HOTFIX_NUMBER] == 0
+          vp[HOTFIX_NUMBER] -= 1 unless (vp[HOTFIX_NUMBER]).zero?
+          return "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}.#{vp[HOTFIX_NUMBER]}" unless (vp[HOTFIX_NUMBER]).zero?
 
           "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}"
         end
@@ -184,7 +184,7 @@ module Fastlane
         #
         def self.is_hotfix?(version)
           vp = get_version_parts(version)
-          return (vp.length > 2) && (vp[HOTFIX_NUMBER] != 0)
+          (vp.length > 2) && (vp[HOTFIX_NUMBER] != 0)
         end
 
         # Returns the current value of the `VERSION_LONG` key from the public xcconfig file
@@ -215,9 +215,7 @@ module Fastlane
           UI.message("Current version: #{current_version}")
           new_version = calc_next_release_version(current_version)
           UI.message("New version: #{new_version}")
-          verified_version = verify_version(new_version)
-
-          return verified_version
+          verify_version(new_version)
         end
 
         # Update the `.xcconfig` files (the public one, and the internal one if it exists) with the new version strings.
@@ -269,10 +267,10 @@ module Fastlane
         #
         def self.get_version_parts(version)
           parts = version.split('.')
-          parts = parts.fill('0', parts.length...4).map { |chr| chr.to_i }
+          parts = parts.fill('0', parts.length...4).map(&:to_i)
           UI.user_error!("Bad version string: #{version}") if parts.length > 4
 
-          return parts
+          parts
         end
 
         # Extract the VERSION_LONG entry from an `xcconfig` file
@@ -330,7 +328,9 @@ module Fastlane
         # @return [Bool] true if the string is representing an integer value, false if not
         #
         def self.is_int?(string)
-          true if Integer(string) rescue false
+          true if Integer(string)
+        rescue StandardError
+          false
         end
       end
     end

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/metadata_download_helper.rb

@@ -34,8 +34,8 @@ module Fastlane
         end
 
         loc_data.each do |d|
-          key = d[0].split(/\u0004/).first
-          source = d[0].split(/\u0004/).last
+          key = d[0].split("\u0004").first
+          source = d[0].split("\u0004").last
 
           target_files.each do |file|
             next unless file[0].to_s == key
@@ -50,8 +50,8 @@ module Fastlane
       # Parse JSON data and update the local files
       def reparse_alternates(target_locale, loc_data, is_source)
         loc_data.each do |d|
-          key = d[0].split(/\u0004/).first
-          source = d[0].split(/\u0004/).last
+          key = d[0].split("\u0004").first
+          source = d[0].split("\u0004").last
 
           @alternates.each do |file|
             puts "Data: #{file[0]} - key: #{key}"
@@ -109,7 +109,11 @@ module Fastlane
           # All good, parse the result
           UI.success("Successfully downloaded `#{locale}`.")
           @alternates.clear
-          loc_data = JSON.parse(response.body) rescue loc_data = nil
+          loc_data = begin
+            JSON.parse(response.body)
+          rescue StandardError
+            loc_data = nil
+          end
           parse_data(locale, loc_data, is_source)
           reparse_alternates(target_locale, loc_data, is_source) unless @alternates.empty?
         when '301'