fastlane-plugin-wpmreleasetoolkit 1.0.0 → 1.3.1

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

@@ -2,17 +2,17 @@ module Fastlane
   module Actions
     class IosBuildPrechecksAction < Action
       def self.run(params)
-        require_relative '../../helper/ios/ios_version_helper.rb'
+        require_relative '../../helper/ios/ios_version_helper'
 
         message = ''
         message << "Building version #{Fastlane::Helper::Ios::VersionHelper.get_internal_version()} and uploading to App Center\n" if params[:internal]
         message << "Building version #{Fastlane::Helper::Ios::VersionHelper.get_build_version()} and uploading to App Center\n" if params[:internal_on_single_version]
         message << "Building version #{Fastlane::Helper::Ios::VersionHelper.get_build_version()} and uploading to TestFlight\n" if params[:external]
 
-        if !params[:skip_confirm]
-          UI.user_error!('Aborted by user request') unless UI.confirm("#{message}Do you want to continue?")
-        else
+        if params[:skip_confirm]
           UI.message(message)
+        else
+          UI.user_error!('Aborted by user request') unless UI.confirm("#{message}Do you want to continue?")
         end
 
         # Check local repo status

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

@@ -4,8 +4,8 @@ module Fastlane
       def self.run(params)
         UI.message 'Bumping app release version...'
 
-        require_relative '../../helper/ios/ios_git_helper.rb'
-        require_relative '../../helper/ios/ios_version_helper.rb'
+        require_relative '../../helper/ios/ios_git_helper'
+        require_relative '../../helper/ios/ios_version_helper'
 
         Fastlane::Helper::GitHelper.ensure_on_branch!('release')
         create_config()

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

@@ -4,7 +4,7 @@ module Fastlane
       def self.run(params)
         UI.message 'Bumping app release version for hotfix...'
 
-        require_relative '../../helper/ios/ios_git_helper.rb'
+        require_relative '../../helper/ios/ios_git_helper'
         Fastlane::Helper::GitHelper.create_branch("release/#{params[:version]}", from: params[:previous_version])
         create_config(params[:previous_version], params[:version])
         show_config()

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

@@ -5,8 +5,8 @@ module Fastlane
         # fastlane will take care of reading in the parameter and fetching the environment variable:
         UI.message 'Bumping app release version...'
 
-        require_relative '../../helper/ios/ios_version_helper.rb'
-        require_relative '../../helper/ios/ios_git_helper.rb'
+        require_relative '../../helper/ios/ios_version_helper'
+        require_relative '../../helper/ios/ios_git_helper'
 
         other_action.ensure_git_branch(branch: 'develop')
 
@@ -21,12 +21,12 @@ module Fastlane
         UI.message 'Done!'
 
         UI.message 'Updating glotPressKeys...' unless params[:skip_glotpress]
-        update_glotpress_key unless params [:skip_glotpress]
-        UI.message 'Done' unless params [:skip_glotpress]
+        update_glotpress_key unless params[:skip_glotpress]
+        UI.message 'Done' unless params[:skip_glotpress]
 
         UI.message 'Updating Fastlane deliver file...' unless params[:skip_deliver]
         Fastlane::Helper::Ios::VersionHelper.update_fastlane_deliver(@new_short_version) unless params[:skip_deliver]
-        UI.message 'Done!' unless params [:skip_deliver]
+        UI.message 'Done!' unless params[:skip_deliver]
 
         UI.message 'Updating XcConfig...'
         Fastlane::Helper::Ios::VersionHelper.update_xc_configs(@new_version, @new_short_version, @new_version_internal)

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

@@ -2,8 +2,8 @@ module Fastlane
   module Actions
     class IosCheckBetaDepsAction < Action
       def self.run(params)
-        require_relative '../../helper/ios/ios_version_helper.rb'
-        require_relative '../../helper/ios/ios_git_helper.rb'
+        require_relative '../../helper/ios/ios_version_helper'
+        require_relative '../../helper/ios/ios_git_helper'
 
         beta_pods = []
         File.open(params[:podfile]).each do |li|

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

@@ -4,7 +4,7 @@ module Fastlane
       def self.run(params)
         UI.message("Deleting tags for version: #{params[:version]}")
 
-        require_relative '../../helper/git_helper.rb'
+        require_relative '../../helper/git_helper'
 
         # Download all the remote tags prior to starting – that way we don't miss any on the server
         Fastlane::Helper::GitHelper.fetch_all_tags

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

@@ -5,8 +5,8 @@ module Fastlane
         # fastlane will take care of reading in the parameter and fetching the environment variable:
         UI.message "Skip confirm on code freeze: #{params[:skip_confirm]}"
 
-        require_relative '../../helper/ios/ios_version_helper.rb'
-        require_relative '../../helper/ios/ios_git_helper.rb'
+        require_relative '../../helper/ios/ios_version_helper'
+        require_relative '../../helper/ios/ios_git_helper'
 
         # Checkout develop and update
         Fastlane::Helper::GitHelper.checkout_and_pull('develop')
@@ -17,8 +17,8 @@ module Fastlane
         next_version = Fastlane::Helper::Ios::VersionHelper.calc_next_release_version(current_version)
 
         # Ask user confirmation
-        unless params[:skip_confirm]
-          UI.user_error!('Aborted by user request') unless UI.confirm("Building a new release branch starting from develop.\nCurrent version is #{current_version} (#{current_build_version}).\nAfter codefreeze the new version will be: #{next_version}.\nDo you want to continue?")
+        unless params[:skip_confirm] || UI.confirm("Building a new release branch starting from develop.\nCurrent version is #{current_version} (#{current_build_version}).\nAfter codefreeze the new version will be: #{next_version}.\nDo you want to continue?")
+          UI.user_error!('Aborted by user request')
         end
 
         # Check local repo status

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

@@ -4,17 +4,17 @@ module Fastlane
       def self.run(params)
         UI.message "Skip confirm: #{params[:skip_confirm]}"
 
-        require_relative '../../helper/ios/ios_version_helper.rb'
-        require_relative '../../helper/ios/ios_git_helper.rb'
+        require_relative '../../helper/ios/ios_version_helper'
+        require_relative '../../helper/ios/ios_git_helper'
 
         UI.user_error!('This is not a release branch. Abort.') unless other_action.git_branch.start_with?('release/')
 
         version = Fastlane::Helper::Ios::VersionHelper.get_public_version
         message = "Completing code freeze for: #{version}\n"
-        if !params[:skip_confirm]
-          UI.user_error!('Aborted by user request') unless UI.confirm("#{message}Do you want to continue?")
-        else
+        if params[:skip_confirm]
           UI.message(message)
+        else
+          UI.user_error!('Aborted by user request') unless UI.confirm("#{message}Do you want to continue?")
         end
 
         # Check local repo status

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

@@ -2,7 +2,7 @@ module Fastlane
   module Actions
     class IosCurrentBranchIsHotfixAction < Action
       def self.run(params)
-        require_relative '../../helper/ios/ios_version_helper.rb'
+        require_relative '../../helper/ios/ios_version_helper'
         Fastlane::Helper::Ios::VersionHelper.is_hotfix?(Fastlane::Helper::Ios::VersionHelper.get_public_version)
       end
 

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

@@ -2,8 +2,8 @@ module Fastlane
   module Actions
     class IosFinalTagAction < Action
       def self.run(params)
-        require_relative '../../helper/ios/ios_git_helper.rb'
-        require_relative '../../helper/ios/ios_version_helper.rb'
+        require_relative '../../helper/ios/ios_git_helper'
+        require_relative '../../helper/ios/ios_version_helper'
         version = Fastlane::Helper::Ios::VersionHelper.get_public_version
 
         UI.message("Tagging final #{version}...")

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

@@ -4,17 +4,17 @@ module Fastlane
       def self.run(params)
         UI.message "Skip confirm: #{params[:skip_confirm]}"
 
-        require_relative '../../helper/ios/ios_version_helper.rb'
-        require_relative '../../helper/ios/ios_git_helper.rb'
+        require_relative '../../helper/ios/ios_version_helper'
+        require_relative '../../helper/ios/ios_git_helper'
 
         UI.user_error!('This is not a release branch. Abort.') unless other_action.git_branch.start_with?('release/')
 
         version = Fastlane::Helper::Ios::VersionHelper.get_public_version
         message = "Finalizing release: #{version}\n"
-        if !params[:skip_confirm]
-          UI.user_error!('Aborted by user request') unless UI.confirm("#{message}Do you want to continue?")
-        else
+        if params[:skip_confirm]
           UI.message(message)
+        else
+          UI.user_error!('Aborted by user request') unless UI.confirm("#{message}Do you want to continue?")
         end
 
         # Check local repo status

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

@@ -2,7 +2,7 @@ module Fastlane
   module Actions
     class IosGetAppVersionAction < Action
       def self.run(params)
-        require_relative '../../helper/ios/ios_version_helper.rb'
+        require_relative '../../helper/ios/ios_version_helper'
 
         UI.user_error!('You need to set at least the PUBLIC_CONFIG_FILE env var to the path to the public xcconfig file') unless ENV['PUBLIC_CONFIG_FILE']
 

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

@@ -2,7 +2,7 @@ module Fastlane
   module Actions
     class IosGetBuildVersionAction < Action
       def self.run(params)
-        require_relative '../../helper/ios/ios_version_helper.rb'
+        require_relative '../../helper/ios/ios_version_helper'
 
         UI.user_error!('You need to set at least the PUBLIC_CONFIG_FILE env var to the path to the public xcconfig file') unless ENV['PUBLIC_CONFIG_FILE']
 

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

@@ -1,4 +1,4 @@
-require_relative '../../helper/ios/ios_adc_app_sizes_helper.rb'
+require_relative '../../helper/ios/ios_adc_app_sizes_helper'
 
 module Fastlane
   module Actions

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

@@ -5,8 +5,8 @@ module Fastlane
         UI.message "Skip confirm: #{params[:skip_confirm]}"
         UI.message ''
 
-        require_relative '../../helper/ios/ios_version_helper.rb'
-        require_relative '../../helper/ios/ios_git_helper.rb'
+        require_relative '../../helper/ios/ios_version_helper'
+        require_relative '../../helper/ios/ios_git_helper'
 
         # Evaluate previous tag
         new_ver = params[:version]
@@ -16,10 +16,10 @@ module Fastlane
         message = "Requested Hotfix version: #{new_ver}\n"
         message << "Branching from: #{prev_ver}\n"
 
-        if !params[:skip_confirm]
-          UI.user_error!('Aborted by user request') unless UI.confirm("#{message}Do you want to continue?")
-        else
+        if params[:skip_confirm]
           UI.message(message)
+        else
+          UI.user_error!('Aborted by user request') unless UI.confirm("#{message}Do you want to continue?")
         end
 
         # Check tags

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

@@ -17,7 +17,7 @@ module Fastlane
       def self.run_linter(params)
         UI.message 'Linting localizations for parameter placeholders consistency...'
 
-        require_relative '../../helper/ios/ios_l10n_helper.rb'
+        require_relative '../../helper/ios/ios_l10n_helper'
         helper = Fastlane::Helper::Ios::L10nHelper.new(
           install_path: resolve_path(params[:install_path]),
           version: params[:version]

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

@@ -4,7 +4,7 @@ module Fastlane
       def self.run(params)
         UI.message 'Updating project localisation...'
 
-        require_relative '../../helper/ios/ios_git_helper.rb'
+        require_relative '../../helper/ios/ios_git_helper'
         other_action.cocoapods()
         Fastlane::Helper::Ios::GitHelper.localize_project()
 

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

@@ -27,8 +27,8 @@ module Fastlane
         join_files.each do |join_strings|
           my_strings = File.read(join_strings).split("\n")
           my_strings.each do |string|
-            if string[/^\"(.*)\" = \"(.*)\";$/]
-              /^\"(?<string_key>.*)\" = \"/i =~ string
+            if string[/^"(.*)" = "(.*)";$/]
+              /^"(?<string_key>.*)" = "/i =~ string
               unless extra_keys.include?(string_key)
                 extra_strings << string
                 extra_keys << string_key
@@ -50,9 +50,9 @@ module Fastlane
       end
 
       def self.check_line(line, extra_keys)
-        return line unless line[/^\"(.*)\" = \"(.*)\";$/]
+        return line unless line[/^"(.*)" = "(.*)";$/]
 
-        /^\"(?<line_key>.*)\" = \"/i =~ line
+        /^"(?<line_key>.*)" = "/i =~ line
         return '' if extra_keys.include?(line_key)
 
         return line

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

@@ -2,8 +2,8 @@ module Fastlane
   module Actions
     class IosTagBuildAction < Action
       def self.run(params)
-        require_relative '../../helper/ios/ios_version_helper.rb'
-        require_relative '../../helper/ios/ios_git_helper.rb'
+        require_relative '../../helper/ios/ios_version_helper'
+        require_relative '../../helper/ios/ios_git_helper'
 
         itc_ver = Fastlane::Helper::Ios::VersionHelper.get_build_version()
         int_ver = Fastlane::Helper::Ios::VersionHelper.get_internal_version() unless ENV['INTERNAL_CONFIG_FILE'].nil?

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

@@ -2,7 +2,7 @@ module Fastlane
   module Actions
     class IosUpdateMetadataAction < Action
       def self.run(params)
-        require_relative '../../helper/ios/ios_git_helper.rb'
+        require_relative '../../helper/ios/ios_git_helper'
 
         Fastlane::Helper::Ios::GitHelper.update_metadata()
       end

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

@@ -4,9 +4,9 @@ module Fastlane
       def self.run(params)
         UI.message 'Updating the release notes...'
 
-        require_relative '../../helper/ios/ios_version_helper.rb'
-        require_relative '../../helper/release_notes_helper.rb'
-        require_relative '../../helper/git_helper.rb'
+        require_relative '../../helper/ios/ios_version_helper'
+        require_relative '../../helper/release_notes_helper'
+        require_relative '../../helper/git_helper'
 
         path = File.join(ENV['PROJECT_ROOT_FOLDER'] || '.', 'RELEASE-NOTES.txt')
         next_version = Fastlane::Helper::Ios::VersionHelper.calc_next_release_version(params[:new_version])

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

@@ -2,8 +2,8 @@ module Fastlane
   module Actions
     class IosValidateCiBuildAction < Action
       def self.run(params)
-        require_relative '../../helper/ios/ios_git_helper.rb'
-        require_relative '../../helper/ios/ios_version_helper.rb'
+        require_relative '../../helper/ios/ios_git_helper'
+        require_relative '../../helper/ios/ios_version_helper'
 
         version = Fastlane::Helper::Ios::VersionHelper.get_public_version()
         head_tags = Fastlane::Helper::GitHelper.list_tags_on_current_commit()

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

@@ -91,7 +91,7 @@ module Fastlane
 
       def is_handler_for(key)
         values = key.split('_')
-        key.start_with?(@rel_note_key) && values.length == 3 && is_int?(values[2].sub(/^[0]*/, ''))
+        key.start_with?(@rel_note_key) && values.length == 3 && is_int?(values[2].sub(/^0*/, ''))
       end
 
       def handle_line(fw, line)
@@ -123,7 +123,7 @@ module Fastlane
       end
 
       def extract_key(line)
-        line.split(' ')[1].tr('\"', '')
+        line.split[1].tr('\"', '')
       end
 
       def is_int?(value)
@@ -141,7 +141,7 @@ module Fastlane
 
       def is_handler_for(key)
         values = key.split('_')
-        key.start_with?(@rel_note_key) && values.length == 4 && is_int?(values[3].sub(/^[0]*/, ''))
+        key.start_with?(@rel_note_key) && values.length == 4 && is_int?(values[3].sub(/^0*/, ''))
       end
 
       def generate_block(fw)

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

@@ -12,11 +12,20 @@ module Fastlane
         # @env PROJECT_NAME The name of the directory containing the project code (especially containing the `build.gradle` file)
         #
         def self.commit_version_bump
-          Fastlane::Helper::GitHelper.commit(
-            message: 'Bump version number',
-            files: File.join(ENV['PROJECT_ROOT_FOLDER'], ENV['PROJECT_NAME'], 'build.gradle'),
-            push: true
-          )
+          require_relative './android_version_helper'
+          if Fastlane::Helper::Android::VersionHelper.properties_file_exists
+            Fastlane::Helper::GitHelper.commit(
+              message: 'Bump version number',
+              files: File.join(ENV['PROJECT_ROOT_FOLDER'], 'version.properties'),
+              push: true
+            )
+          else
+            Fastlane::Helper::GitHelper.commit(
+              message: 'Bump version number',
+              files: File.join(ENV['PROJECT_ROOT_FOLDER'], ENV['PROJECT_NAME'], 'build.gradle'),
+              push: true
+            )
+          end
         end
 
         # Calls the `tools/update-translations.sh` script from the project repo, then lint them using the provided gradle task

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

@@ -154,7 +154,7 @@ 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 = line.gsub(/\s+/m, ' ').strip.split
               diffs.each do |diff|
                 verify_diff(diff, main_strings, lib_strings, library)
               end
@@ -165,7 +165,7 @@ module Fastlane
         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 = line.gsub(/\s+/m, ' ').strip.split
               diffs.each do |diff|
                 verify_diff(diff, main_strings, lib_strings, library)
               end
@@ -299,6 +299,15 @@ module Fastlane
         #
         def self.apply_substitutions(tag)
           tag.content = tag.content.gsub('...', '…')
+
+          # Typography en-dash
+          if tag.content.include?('-')
+            tag.content = tag.content.gsub(/(\d+\s*)-(\s*\d+)/) do |str|
+              match = Regexp.last_match # of type `MatchData`. match[0] == str == whole match, match[1] = 1st capture group (left part of the range), match[2] = second capture group (right part of the range)
+              is_negative_number = match[2][0] != ' ' && match[1][-1] == ' ' # if right part of range does not start with a space (e.g. `-3`), but left part of range does end with space, it's not a range after all but more likely a list containing negative numbers in it (e.g. `2 -3`)
+              is_negative_number ? str : "#{match[1]}\u{2013}#{match[2]}"
+            end
+          end
         end
         private_class_method :apply_substitutions
 

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

@@ -26,26 +26,29 @@ module Fastlane
         #    "1.2" # Assuming build.gradle contains versionName "1.2.0"
         #    "1.2.3" # Assuming build.gradle contains versionName "1.2.3"
         #
+        # @param [String] app The name of the app to be used for beta and alpha version update
+        #
         # @return [String] The public-facing version number, extracted from the `versionName` of the `build.gradle` 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_public_version
-          version = get_release_version
+        def self.get_public_version(app)
+          version = get_release_version(product_name: app)
           vp = get_version_parts(version[VERSION_NAME])
           return "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}" unless is_hotfix?(version)
 
           "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}.#{vp[HOTFIX_NUMBER]}"
         end
 
-        # Extract the version name and code from the `vanilla` flavor of the `$PROJECT_NAME/build.gradle file`
-        #   or for the defaultConfig if `HAS_ALPHA_VERSION` is not defined.
+        # Extract the version name and code from the release version of the app from `version.properties file`
         #
-        # @env HAS_ALPHA_VERSION If set (with any value), indicates that the project uses `vanilla` flavor.
+        # @param [String] product_name The name of the app to be used for beta and alpha version update
         #
         # @return [Hash] A hash with 2 keys "name" and "code" containing the extracted version name and code, respectively
         #
-        def self.get_release_version
+        def self.get_release_version(product_name:)
+          return get_version_from_properties(product_name: product_name) if properties_file_exists
+
           section = ENV['HAS_ALPHA_VERSION'].nil? ? 'defaultConfig' : 'vanilla {'
           gradle_path = self.gradle_path
           name = get_version_name_from_gradle_file(gradle_path, section)
@@ -53,12 +56,67 @@ module Fastlane
           return { VERSION_NAME => name, VERSION_CODE => code }
         end
 
-        # Extract the version name and code from the `defaultConfig` of the `$PROJECT_NAME/build.gradle` file
+        def self.properties_file_exists
+          properties_file_path = File.join(ENV['PROJECT_ROOT_FOLDER'] || '.', 'version.properties')
+
+          return File.exist?(properties_file_path)
+        end
+
+        # Extract the version name and code from the `version.properties` file in the project root
+        #
+        # @param [String] product_name The name of the app to extract the version from e.g. wordpress, simplenote
+        # @param [Boolean] is_alpha true if the alpha version should be returned, false otherwise
+        #
+        # @return [Hash] A hash with 2 keys "name" and "code" containing the extracted version name and code, respectively
+        #
+        def self.get_version_from_properties(product_name:, is_alpha: false)
+          alpha_variant = is_alpha ? alpha_flavor_name : nil
+          version_name_key = [product_name, alpha_variant, 'versionName'].compact.join('.')
+          version_code_key = [product_name, alpha_variant, 'versionCode'].compact.join('.')
+
+          properties_file_path = File.join(ENV['PROJECT_ROOT_FOLDER'] || '.', 'version.properties')
+
+          return nil unless File.exist?(properties_file_path)
+
+          File.open(properties_file_path, 'r') do |f|
+            text = f.read
+            name = text.match(/#{version_name_key}=(\S*)/m)&.captures&.first
+            code = text.match(/#{version_code_key}=(\S*)/m)&.captures&.first
+
+            f.close
+
+            return nil if name.nil? || code.nil?
+
+            return { VERSION_NAME => name, VERSION_CODE => code.to_i }
+          end
+        end
+
+        # Returns the name of the flavor used for alpha builds
+        #
+        # @env HAS_ALPHA_VERSION Should contain the name of the flavor used for alpha
+        #
+        # @return [String] The flavor name as provided by the env var, defaulting to `zalpha` if the env var
+        #                  is not set or is set to '1' ('boolean' value used in legacy call sites)
+        def self.alpha_flavor_name
+          # TODO: Have each fastlane action which depends on this take the alpha flavor name as ConfigItem/parameter
+          #   explicitly instead (and get rid of the HAS_ALPHA_VERSION global / env var after that)
+
+          # For now we pass the alpha flavor name by reusing the HAS_ALPHA_VERSION env var.
+          return ENV['HAS_ALPHA_VERSION'] if ENV['HAS_ALPHA_VERSION'] && ENV['HAS_ALPHA_VERSION'] != '1'
+
+          'zalpha' # Default value if HAS_ALPHA_VERSION is not set or hasn't been updated at call site to the flavor name instead of '1'
+        end
+
+        # Extract the version name and code from the `version.properties` file in the project root
+        #
+        # @param [String] app The name of the app to be used for beta and alpha version update
         #
         # @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.
         #
-        def self.get_alpha_version
+        def self.get_alpha_version(app)
+          return get_version_from_properties(product_name: app, is_alpha: true) if properties_file_exists
+
           return nil if ENV['HAS_ALPHA_VERSION'].nil?
 
           section = 'defaultConfig'
@@ -95,8 +153,8 @@ module Fastlane
         # - The final version name corresponds to the beta's versionName, without the `-rc` suffix
         # - The final version code corresponds to the versionCode for the alpha (or for the beta if alpha_version is nil) incremented by one.
         #
-        # @param [Hash] beta_version The version hash for the beta (vanilla flavor), containing values for keys "name" and "code"
-        # @param [Hash] alpha_version The version hash for the alpha (defaultConfig), containing values for keys "name" and "code",
+        # @param [Hash] beta_version The version hash for the beta, containing values for keys "name" and "code"
+        # @param [Hash] alpha_version The version hash for the alpha, containing values for keys "name" and "code",
         #                             or `nil` if no alpha version to consider.
         #
         # @return [Hash] A version hash with keys "name" and "code", containing the version name and code to use for final release.
@@ -254,11 +312,12 @@ module Fastlane
 
         # Prints the current and next release version names to stdout, then returns the next release version
         #
+        # @param [String] app The name of the app to be used for beta and alpha version update
         # @return [String] The next release version name to use after bumping the currently used release version.
         #
-        def self.bump_version_release
+        def self.bump_version_release(app)
           # Bump release
-          current_version = get_release_version()
+          current_version = get_release_version(product_name: app)
           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]}")
@@ -267,15 +326,30 @@ module Fastlane
           return verified_version
         end
 
-        # Update the `build.gradle` file with new `versionName` and `versionCode` values, both or the `defaultConfig` and `vanilla` flavors
+        # Update the `version.properties` file with new `versionName` and `versionCode` values
         #
-        # @param [Hash] new_version_beta The version hash for the beta (vanilla flavor), containing values for keys "name" and "code"
-        # @param [Hash] new_version_alpha The version hash for the alpha (defaultConfig), containing values for keys "name" and "code"
-        # @env HAS_ALPHA_VERSION If set (with any value), indicates that the project uses `vanilla` flavor.
+        # @param [String] app The name of the app to be used for beta and alpha version update
+        # @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)
-          self.update_version(new_version_beta, ENV['HAS_ALPHA_VERSION'].nil? ? 'defaultConfig' : 'vanilla {')
-          self.update_version(new_version_alpha, 'defaultConfig') unless new_version_alpha.nil?
+        def self.update_versions(app, new_version_beta, new_version_alpha)
+          if properties_file_exists
+            new_version_name_beta_key = "#{app}.versionName"
+            new_version_code_beta_key = "#{app}.versionCode"
+            Action.sh('./gradlew', 'updateVersionProperties', "-Pkey=#{new_version_name_beta_key}", "-Pvalue=#{new_version_beta[VERSION_NAME]}")
+            Action.sh('./gradlew', 'updateVersionProperties', "-Pkey=#{new_version_code_beta_key}", "-Pvalue=#{new_version_beta[VERSION_CODE]}")
+
+            unless new_version_alpha.nil?
+              new_version_name_alpha_key = "#{app}.#{alpha_flavor_name}.versionName"
+              new_version_code_alpha_key = "#{app}.#{alpha_flavor_name}.versionCode"
+
+              Action.sh('./gradlew', 'updateVersionProperties', "-Pkey=#{new_version_name_alpha_key}", "-Pvalue=#{new_version_alpha[VERSION_NAME]}") unless new_version_alpha.nil?
+              Action.sh('./gradlew', 'updateVersionProperties', "-Pkey=#{new_version_code_alpha_key}", "-Pvalue=#{new_version_alpha[VERSION_CODE]}") unless new_version_alpha.nil?
+            end
+          else
+            self.update_version(new_version_beta, ENV['HAS_ALPHA_VERSION'].nil? ? 'defaultConfig' : 'vanilla {')
+            self.update_version(new_version_alpha, 'defaultConfig') unless new_version_alpha.nil?
+          end
         end
 
         # Compute the name of the previous hotfix version.
@@ -337,6 +411,37 @@ module Fastlane
           return 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
+        #
+        # @param [String] version The version string to verify
+        #
+        # @return [String] The "major.minor" version string, only with the first 2 components
+        # @raise [UserError] If any of the parts of the version string is not a number
+        #
+        def self.verify_version(version)
+          v_parts = get_version_parts(version)
+
+          v_parts.each do |part|
+            UI.user_error!('Version value can only contains numbers.') unless is_int?(part)
+          end
+
+          "#{v_parts[MAJOR_NUMBER]}.#{v_parts[MINOR_NUMBER]}"
+        end
+
+        # Check if a string is an integer.
+        #
+        # @param [String] string The string to test
+        #
+        # @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
+        end
+
+        #########
+        # Functions to support versioning through build.gradle - can be removed once all projects adopt version.properties
+        ########
+
         # Extract the versionName from a build.gradle file
         #
         # @param [String] file_path The path to the `.gradle` file
@@ -377,43 +482,16 @@ module Fastlane
           found_section = false
           File.open(file_path, 'r') do |file|
             file.each_line do |line|
-              if !found_section
-                found_section = true if line.include?(section)
+              if found_section
+                return line.split[1] if line.include?(keyword) && !line.include?("\"#{keyword}\"") && !line.include?("P#{keyword}")
               else
-                return line.split(' ')[1] if line.include?(keyword) && !line.include?("\"#{keyword}\"") && !line.include?("P#{keyword}")
+                found_section = true if line.include?(section)
               end
             end
           end
           return nil
         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
-        #
-        # @param [String] version The version string to verify
-        #
-        # @return [String] The "major.minor" version string, only with the first 2 components
-        # @raise [UserError] If any of the parts of the version string is not a number
-        #
-        def self.verify_version(version)
-          v_parts = get_version_parts(version)
-
-          v_parts.each do |part|
-            UI.user_error!('Version value can only contains numbers.') unless is_int?(part)
-          end
-
-          "#{v_parts[MAJOR_NUMBER]}.#{v_parts[MINOR_NUMBER]}"
-        end
-
-        # Check if a string is an integer.
-        #
-        # @param [String] string The string to test
-        #
-        # @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
-        end
-
         # The path to the build.gradle file for the project.
         #
         # @env PROJECT_ROOT_FOLDER The path to the root of the project (the folder containing the `.git` directory).
@@ -442,24 +520,24 @@ module Fastlane
           version_updated = 0
           File.open(gradle_path, 'r') do |file|
             file.each_line do |line|
-              if !found_section
-                temp_file.puts line
-                found_section = true if line.include? section
-              else
+              if found_section
                 if version_updated < 2
                   if line.include?('versionName') && !line.include?('"versionName"') && !line.include?('PversionName')
-                    version_name = line.split(' ')[1].tr('\"', '')
+                    version_name = line.split[1].tr('\"', '')
                     line.sub!(version_name, version[VERSION_NAME].to_s)
                     version_updated = version_updated + 1
                   end
 
                   if line.include? 'versionCode'
-                    version_code = line.split(' ')[1]
+                    version_code = line.split[1]
                     line.sub!(version_code, version[VERSION_CODE].to_s)
                     version_updated = version_updated + 1
                   end
                 end
                 temp_file.puts line
+              else
+                temp_file.puts line
+                found_section = true if line.include? section
               end
             end
             file.close