fastlane-plugin-wpmreleasetoolkit 8.0.1 → 9.0.0

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

@@ -1,7 +1,7 @@
 module Fastlane
   module Helper
     # Basic line handler
-    class MetadataBlock
+    class AnMetadataBlock
       attr_reader :block_key
 
       def initialize(block_key)
@@ -17,7 +17,7 @@ module Fastlane
       end
     end
 
-    class UnknownMetadataBlock < MetadataBlock
+    class AnUnknownMetadataBlock < AnMetadataBlock
       attr_reader :content_file_path
 
       def initialize
@@ -25,7 +25,7 @@ module Fastlane
       end
     end
 
-    class StandardMetadataBlock < MetadataBlock
+    class AnStandardMetadataBlock < AnMetadataBlock
       attr_reader :content_file_path
 
       def initialize(block_key, content_file_path)
@@ -67,7 +67,7 @@ module Fastlane
       end
     end
 
-    class ReleaseNoteMetadataBlock < StandardMetadataBlock
+    class AnReleaseNoteMetadataBlock < AnStandardMetadataBlock
       attr_reader :new_key, :keep_key, :rel_note_key, :release_version
 
       def initialize(block_key, content_file_path, release_version)
@@ -83,7 +83,7 @@ module Fastlane
         version_minor = Integer(values[1])
         @new_key = "#{@rel_note_key}_#{version_major.to_s.rjust(2, '0')}#{version_minor}"
 
-        version_major = version_major - 1 if version_minor == 0
+        version_major -= 1 if version_minor == 0
         version_minor = version_minor == 0 ? 9 : version_minor - 1
 
         @keep_key = "#{@rel_note_key}_#{version_major.to_s.rjust(2, '0')}#{version_minor}"
@@ -131,7 +131,7 @@ module Fastlane
       end
     end
 
-    class ReleaseNoteShortMetadataBlock < ReleaseNoteMetadataBlock
+    class AnReleaseNoteShortMetadataBlock < AnReleaseNoteMetadataBlock
       def initialize(block_key, content_file_path, release_version)
         super(block_key, content_file_path, release_version)
         @rel_note_key = 'release_note_short'

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

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

@@ -5,9 +5,9 @@ module Fastlane
       #
       module VersionHelper
         # The key used in internal version Hash objects to hold the versionName value
-        VERSION_NAME = 'name'
+        VERSION_NAME = 'name'.freeze
         # The key used in internal version Hash objects to hold the versionCode value
-        VERSION_CODE = 'code'
+        VERSION_CODE = 'code'.freeze
         # The index for the major version number part
         MAJOR_NUMBER = 0
         # The index for the minor version number part
@@ -15,9 +15,9 @@ module Fastlane
         # The index for the hotfix version number part
         HOTFIX_NUMBER = 2
         # The prefix used in front of the versionName for alpha versions
-        ALPHA_PREFIX = 'alpha-'
+        ALPHA_PREFIX = 'alpha-'.freeze
         # The suffix used in the versionName for RC (beta) versions
-        RC_SUFFIX = '-rc'
+        RC_SUFFIX = '-rc'.freeze
 
         # Returns the public-facing version string.
         #
@@ -43,7 +43,7 @@ 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
-          return get_version_from_properties() if File.exist?(version_properties_file)
+          return get_version_from_properties if File.exist?(version_properties_file)
 
           section = ENV['HAS_ALPHA_VERSION'].nil? ? 'defaultConfig' : 'vanilla {'
           gradle_path = self.gradle_path
@@ -145,7 +145,7 @@ module Fastlane
         def self.calc_next_alpha_version(version, alpha_version)
           # Bump alpha name
           alpha_number = alpha_version[VERSION_NAME].sub(ALPHA_PREFIX, '')
-          alpha_name = "#{ALPHA_PREFIX}#{alpha_number.to_i() + 1}"
+          alpha_name = "#{ALPHA_PREFIX}#{alpha_number.to_i + 1}"
 
           # Bump alpha code
           alpha_code = version[VERSION_CODE] + 1
@@ -349,7 +349,6 @@ module Fastlane
         end
 
         #----------------------------------------
-        private
 
         # Remove the beta suffix (part after the `-`) from a version string
         #
@@ -449,8 +448,8 @@ module Fastlane
             file.each_line do |line|
               if found_section
                 return line.split[1] if line.include?(keyword) && !line.include?("\"#{keyword}\"") && !line.include?("P#{keyword}")
-              else
-                found_section = true if line.include?(section)
+              elsif line.include?(section)
+                found_section = true
               end
             end
           end
@@ -490,13 +489,13 @@ module Fastlane
                   if line.include?('versionName') && !line.include?('"versionName"') && !line.include?('PversionName')
                     version_name = line.split[1].tr('\"', '')
                     line.sub!(version_name, version[VERSION_NAME].to_s)
-                    version_updated = version_updated + 1
+                    version_updated += 1
                   end
 
                   if line.include? 'versionCode'
                     version_code = line.split[1]
                     line.sub!(version_code, version[VERSION_CODE].to_s)
-                    version_updated = version_updated + 1
+                    version_updated += 1
                   end
                 end
                 temp_file.puts line

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

@@ -72,7 +72,7 @@ module Fastlane
       ### NB: Returns nil if the repo is in a detached HEAD state.
       def self.repo_branch_name
         result = `cd #{repository_path} && git rev-parse --abbrev-ref HEAD`.strip
-        (result == 'HEAD') ? nil : result
+        result == 'HEAD' ? nil : result
       end
 
       ### Returns the most recent commit hash in the `~/.mobile-secrets` repository.

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

@@ -47,7 +47,7 @@ module Fastlane
       def self.has_git_lfs?
         return false unless is_git_repo?
 
-        `git config --get-regex lfs`.length > 0
+        !`git config --get-regex lfs`.empty?
       end
 
       # Switch to the given branch and pull its latest commits.

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

@@ -121,7 +121,7 @@ module Fastlane
       # @param [TrueClass|FalseClass] prerelease Indicates if this should be created as a pre-release (i.e. for alpha/beta)
       # @param [TrueClass|FalseClass] is_draft Indicates if this should be created as a draft release
       #
-      def create_release(repository:, version:, target: nil, description:, assets:, prerelease:, is_draft:)
+      def create_release(repository:, version:, description:, assets:, prerelease:, is_draft:, target: nil)
         release = client.create_release(
           repository,
           version, # tag name
@@ -134,6 +134,44 @@ module Fastlane
         assets.each do |file_path|
           client.upload_asset(release[:url], file_path, content_type: 'application/octet-stream')
         end
+        release[:html_url]
+      end
+
+      # Use the GitHub API to generate release notes based on the list of PRs between current tag and previous tag.
+      # @note This API uses the `.github/release.yml` config file to classify the PRs by category in the generated list according to PR labels.
+      #
+      # @param [String] repository The repository to create the GitHub release on. Typically a repo slug (<org>/<repo>).
+      # @param [String] tag_name The name of the git tag to generate the changelog for.
+      # @param [String] previous_tag The name of the git tag to compare to.
+      # @param [String] target_commitish The commit sha1 or branch name to use as the head for the comparison if the `tag_name` tag does not exist yet. Unused if `tag_name` exists.
+      # @param [String] config_file_path The path to the GitHub configuration file to use for generating release notes. Will use `.github/release.yml` by default if it exists.
+      #
+      # @return [String] The string returned by GitHub API listing PRs between `previous_tag` and current `tag_name`
+      # @raise [StandardError] Might raise if there was an error during the API call
+      #
+      def generate_release_notes(repository:, tag_name:, previous_tag:, target_commitish: nil, config_file_path: nil)
+        repo_path = Octokit::Repository.path(repository)
+        api_url = "#{repo_path}/releases/generate-notes"
+        res = client.post(
+          api_url,
+          tag_name: tag_name,
+          target_commitish: target_commitish, # Only used if no git tag named `tag_name` exists yet
+          previous_tag_name: previous_tag,
+          config_file_path: config_file_path
+        )
+        res.body
+      end
+
+      # Returns the URL of the GitHub release pointing at a given tag
+      # @param [String] repository The repository to create the GitHub release on. Typically a repo slug (<org>/<repo>).
+      # @param [String] tag_name The name of the git tag to get the associated release of
+      #
+      # @return [String] URL of the corresponding GitHub Release, or nil if none was found.
+      #
+      def get_release_url(repository:, tag_name:)
+        client.release_for_tag(repository, tag_name).html_url
+      rescue Octokit::NotFound
+        nil
       end
 
       # Downloads a file from the given GitHub tag

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

@@ -4,7 +4,7 @@ module Fastlane
   module Helper
     module Ios
       module ADCAppSizesHelper
-        DEFAULT_DEVICES = ['Universal', 'iPhone 8', 'iPhone X']
+        DEFAULT_DEVICES = ['Universal', 'iPhone 8', 'iPhone X'].freeze
 
         # Fetch the App Sizes stats from ADC
         #
@@ -13,7 +13,7 @@ module Fastlane
         #         Value for key `sizeInBytes` is itself a Hash with one entry per device name (including special name "Universal")
         #         whose value is a Hash with keys `compressed` and `uncompressed`
         #
-        def self.get_adc_sizes(adc_user:, adc_team: 'Automattic, Inc.', bundle_id:, only_version: nil, limit: 10)
+        def self.get_adc_sizes(adc_user:, bundle_id:, adc_team: 'Automattic, Inc.', only_version: nil, limit: 10)
           UI.message 'Connecting to ADC...'
           Spaceship::ConnectAPI.login(adc_user, team_name: adc_team)
           app = Spaceship::ConnectAPI::App.find(bundle_id)

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

@@ -8,68 +8,15 @@ module Fastlane
         #
         # This typically commits:
         #  - The files in `./config/*` – especially `Version.*.xcconfig` files
-        #  - The `fastlane/Deliverfile` file (which contains the `app_version` line)
-        #  - The `<ProjectRoot>/<ProjectName>/Resources/AppStoreStrings.pot` file, containing a key for that version's release notes
         #
         # @env PROJECT_ROOT_FOLDER The path to the git root of the project
-        # @env PROJECT_NAME The name of the directory containing the project code (especially containing the Resources/ subfolder)
         #
-        # @param [Bool] include_deliverfile If true (the default), includes the `fastlane/Deliverfile` in files being commited
-        # @param [Bool] include_metadata If true (the default), includes the `fastlane/download_metadata.swift` file and the `.pot` file (which typically contains an entry or release notes for the new version)
-        #
-        def self.commit_version_bump(include_deliverfile: true, include_metadata: true)
-          files_list = [File.join(ENV['PROJECT_ROOT_FOLDER'], 'config', '.')]
-          files_list.append File.join('fastlane', 'Deliverfile') if include_deliverfile
-          if include_metadata
-            files_list.append File.join('fastlane', 'download_metadata.swift')
-            files_list.append File.join(ENV['PROJECT_ROOT_FOLDER'], ENV['PROJECT_NAME'], 'Resources', ENV['APP_STORE_STRINGS_FILE_NAME'])
-          end
+        def self.commit_version_bump
+          files_list = [File.join(get_from_env!(key: 'PROJECT_ROOT_FOLDER'), 'config', '.')]
 
           Fastlane::Helper::GitHelper.commit(message: 'Bump version number', files: files_list)
         end
 
-        # Calls the `Scripts/localize.py` script in the project root folder and commit the `*.strings` files
-        #
-        # That script updates the `.strings` files with translations from GlotPress.
-        #
-        # @env PROJECT_ROOT_FOLDER The path to the git root of the project
-        # @env PROJECT_NAME The name of the directory containing the project code (especially containing the `build.gradle` file)
-        #
-        # @deprecated This method is only used by the `ios_localize_project` action, which is itself deprecated
-        #             in favor of the new `ios_generate_strings_file_from_code` action
-        # @todo [Next Major] Remove this method once we fully remove `ios_localize_project`
-        #
-        def self.localize_project
-          Action.sh("cd #{get_from_env!(key: 'PROJECT_ROOT_FOLDER')} && ./Scripts/localize.py")
-
-          Fastlane::Helper::GitHelper.commit(message: 'Update strings for localization', files: strings_files) || UI.message('No new strings, skipping commit')
-        end
-
-        # Call the `Scripts/update-translations.rb` then the `fastlane/download_metadata` Scripts from the host project folder
-        #
-        # @env PROJECT_ROOT_FOLDER The path to the git root of the project
-        # @env PROJECT_NAME The name of the directory containing the project code (especially containing the `build.gradle` file)
-        #
-        # @todo Migrate the scripts, currently in each host repo and called by this method, to be helpers and actions
-        #       in the release-toolkit instead, and move this code away from `ios_git_helper`.
-        #
-        def self.update_metadata
-          Action.sh("cd #{get_from_env!(key: 'PROJECT_ROOT_FOLDER')} && ./Scripts/update-translations.rb")
-
-          Fastlane::Helper::GitHelper.commit(message: 'Update translations', files: strings_files)
-
-          Action.sh('cd fastlane && ./download_metadata.swift')
-
-          Fastlane::Helper::GitHelper.commit(message: 'Update metadata translations', files: './fastlane/metadata/')
-        end
-
-        def self.strings_files
-          project_root = get_from_env!(key: 'PROJECT_ROOT_FOLDER')
-          project_name = get_from_env!(key: 'PROJECT_NAME')
-
-          Dir.glob(File.join(project_root, project_name, '**', '*.strings'))
-        end
-
         def self.get_from_env!(key:)
           ENV.fetch(key) do
             UI.user_error! "Could not find value for \"#{key}\" in environment."

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

@@ -5,9 +5,9 @@ module Fastlane
   module Helper
     module Ios
       class L10nLinterHelper
-        SWIFTGEN_VERSION = '6.4.0'
-        DEFAULT_BASE_LANG = 'en'
-        CONFIG_FILE_NAME = 'swiftgen-stringtypes.yml'
+        SWIFTGEN_VERSION = '6.4.0'.freeze
+        DEFAULT_BASE_LANG = 'en'.freeze
+        CONFIG_FILE_NAME = 'swiftgen-stringtypes.yml'.freeze
 
         attr_reader :install_path, :version
 

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

@@ -1,3 +1,5 @@
+require 'xcodeproj'
+
 module Fastlane
   module Helper
     module Ios
@@ -13,12 +15,33 @@ module Fastlane
         # The index for the build version number part
         BUILD_NUMBER = 3
 
+        # Returns the public-facing version string.
+        #
+        # @param [String] xcconfig_file The path for the .xcconfig file containing the public-facing version
+        #
+        # @return [String] The public-facing version number, extracted from the VERSION_LONG entry of the xcconfig file.
+        #         - 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_xcconfig_public_version(xcconfig_file:)
+          version = read_long_version_from_config_file(xcconfig_file)
+
+          UI.user_error!(".xcconfig file doesn't have a version configured") if version.nil?
+
+          vp = get_version_parts(version)
+          return "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}" unless is_hotfix?(version)
+
+          "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}.#{vp[HOTFIX_NUMBER]}"
+        end
+
         # Returns the public-facing version string.
         #
         # @return [String] The public-facing version number, extracted from the VERSION_LONG entry of the xcconfig file.
         #         - 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
         #
+        # @deprecated This method is going to be removed soon due to it's dependency on `ENV['PUBLIC_CONFIG_FILE']` via `get_build_version`.
+        #
         def self.get_public_version
           version = get_build_version
           vp = get_version_parts(version)
@@ -139,8 +162,8 @@ module Fastlane
         def self.create_internal_version(version)
           vp = get_version_parts(version)
           d = DateTime.now
-          todayDate = d.strftime('%Y%m%d')
-          "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}.#{vp[HOTFIX_NUMBER]}.#{todayDate}"
+          today_date = d.strftime('%Y%m%d')
+          "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}.#{vp[HOTFIX_NUMBER]}.#{today_date}"
         end
 
         # Return the build number value incremented by one.
@@ -169,7 +192,8 @@ module Fastlane
         # @return [String] The current version according to the public xcconfig file.
         #
         def self.get_build_version
-          versions = get_version_strings()[0]
+          xcconfig_file = ENV['PUBLIC_CONFIG_FILE']
+          read_long_version_from_config_file(xcconfig_file)
         end
 
         # Returns the current value of the `VERSION_LONG` key from the internal xcconfig file
@@ -177,7 +201,8 @@ module Fastlane
         # @return [String] The current version according to the internal xcconfig file.
         #
         def self.get_internal_version
-          get_version_strings()[1]
+          xcconfig_file = ENV['INTERNAL_CONFIG_FILE']
+          read_long_version_from_config_file(xcconfig_file)
         end
 
         # Prints the current and next release version numbers to stdout, then return the next release version
@@ -186,7 +211,7 @@ module Fastlane
         #
         def self.bump_version_release
           # Bump release
-          current_version = get_public_version()
+          current_version = get_public_version
           UI.message("Current version: #{current_version}")
           new_version = calc_next_release_version(current_version)
           UI.message("New version: #{new_version}")
@@ -195,20 +220,6 @@ module Fastlane
           return verified_version
         end
 
-        # Updates the `app_version` entry in the `Deliverfile`
-        #
-        # @param [String] new_version The new value to set the `app_version` entry to.
-        # @raise [UserError] If the Deliverfile was not found.
-        #
-        def self.update_fastlane_deliver(new_version)
-          fd_file = './fastlane/Deliverfile'
-          if File.exist?(fd_file)
-            Action.sh("sed -i '' \"s/app_version.*/app_version \\\"#{new_version}\\\"/\" #{fd_file}")
-          else
-            UI.user_error!("Can't find #{fd_file}.")
-          end
-        end
-
         # Update the `.xcconfig` files (the public one, and the internal one if it exists) with the new version strings.
         #
         # @env PUBLIC_CONFIG_FILE The path to the xcconfig file containing the public version numbers.
@@ -248,7 +259,6 @@ module Fastlane
         end
 
         #----------------------------------------
-        private
 
         # Split a version string into its 4 parts, ensuring its parts count is valid
         #
@@ -267,54 +277,34 @@ module Fastlane
 
         # Extract the VERSION_LONG entry from an `xcconfig` file
         #
-        # @param [String] filePath The path to the `.xcconfig` file to read the value from
+        # @param [String] file_path The path to the `.xcconfig` file to read the value from
         # @return [String] The long version found in said xcconfig file, or nil if not found
         #
-        def self.read_long_version_from_config_file(filePath)
-          read_from_config_file('VERSION_LONG', filePath)
+        def self.read_long_version_from_config_file(file_path)
+          read_from_config_file('VERSION_LONG', file_path)
         end
 
         # Extract the BUILD_NUMBER entry from an `xcconfig` file
         #
-        # @param [String] filePath The path to the `.xcconfig` file to read the value from
+        # @param [String] file_path The path to the `.xcconfig` file to read the value from
         # @return [String] The build number found in said xcconfig file, or nil if not found
         #
-        def self.read_build_number_from_config_file(filePath)
-          read_from_config_file('BUILD_NUMBER', filePath)
+        def self.read_build_number_from_config_file(file_path)
+          read_from_config_file('BUILD_NUMBER', file_path)
         end
 
         # Read the value of a given key from an `.xcconfig` file.
         #
         # @param [String] key The xcconfig key to get the value for
-        # @param [String] filePath The path to the `.xcconfig` file to read the value from
+        # @param [String] file_path The path to the `.xcconfig` file to read the value from
         #
         # @return [String] The value for the given key, or `nil` if the key was not found.
         #
-        def self.read_from_config_file(key, filePath)
-          File.open(filePath, 'r') do |f|
-            f.each_line do |line|
-              line = line.strip()
-              return line.split('=')[1] if line.start_with?("#{key}=")
-            end
-          end
-
-          return nil
-        end
-
-        # Read the version numbers from the xcconfig file
-        #
-        # @env PUBLIC_CONFIG_FILE The path to the xcconfig file containing the public version numbers.
-        # @env INTERNAL_CONFIG_FILE The path to the xcconfig file containing the internal version numbers. Can be nil.
-        #
-        # @return [String] Array of long version strings found.
-        #         The first element is always present and contains the version extracted from the public config file
-        #         The second element is the version extracted from the internal config file, only present if one was provided.
-        def self.get_version_strings
-          version_strings = []
-          version_strings << read_long_version_from_config_file(ENV['PUBLIC_CONFIG_FILE'])
-          version_strings << read_long_version_from_config_file(ENV['INTERNAL_CONFIG_FILE']) unless ENV['INTERNAL_CONFIG_FILE'].nil?
+        def self.read_from_config_file(key, file_path)
+          UI.user_error!(".xcconfig file #{file_path} not found") unless File.exist?(file_path)
 
-          return version_strings
+          config = Xcodeproj::Config.new(file_path)
+          config.attributes[key]
         end
 
         # Ensure that the version provided is only composed of number parts and return the validated string
@@ -339,7 +329,7 @@ module Fastlane
         #
         # @return [Bool] true if the string is representing an integer value, false if not
         #
-        def self.is_int? string
+        def self.is_int?(string)
           true if Integer(string) rescue false
         end
       end