fastlane-plugin-wpmreleasetoolkit 1.1.0 → 1.4.0

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

@@ -9,8 +9,10 @@ module Fastlane
 
         UI.user_error!('This is not a release branch. Abort.') unless other_action.git_branch.start_with?('release/')
 
-        version = Fastlane::Helper::Android::VersionHelper.get_public_version
-        message = "Completing code freeze for: #{version}\n"
+        app = params[:app]
+
+        version = Fastlane::Helper::Android::VersionHelper.get_public_version(app)
+        message = "Completing code freeze for: [#{app}]#{version}\n"
         unless params[:skip_confirm]
           UI.user_error!('Aborted by user request') unless UI.confirm("#{message}Do you want to continue?")
         else
@@ -42,6 +44,10 @@ module Fastlane
                                        description: 'Skips confirmation',
                                        is_string: false, # true: verifies the input is a string, false: every kind of value
                                        default_value: false), # the default value if the user didn't provide one
+          FastlaneCore::ConfigItem.new(key: :app,
+                                       env_name: 'PROJECT_NAME',
+                                       description: 'The name of the app to get the release version for',
+                                       is_string: true), # true: verifies the input is a string, false: every kind of value
         ]
       end
 

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

@@ -7,7 +7,8 @@ module Fastlane
     class AndroidCurrentBranchIsHotfixAction < Action
       def self.run(params)
         require_relative '../../helper/android/android_version_helper'
-        Fastlane::Helper::Android::VersionHelper.is_hotfix?(Fastlane::Helper::Android::VersionHelper.get_release_version)
+        version = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: params[:app])
+        Fastlane::Helper::Android::VersionHelper.is_hotfix?(version)
       end
 
       #####################################################
@@ -23,6 +24,13 @@ module Fastlane
       end
 
       def self.available_options
+        # Define all options your action supports.
+        [
+          FastlaneCore::ConfigItem.new(key: :app,
+                                       env_name: 'PROJECT_NAME',
+                                       description: 'The name of the app to get the release version for',
+                                       is_string: true), # true: verifies the input is a string, false: every kind of value
+        ]
       end
 
       def self.output

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

@@ -13,8 +13,8 @@ module Fastlane
 
         UI.user_error!('This is not a release branch. Abort.') unless other_action.git_branch.start_with?('release/')
 
-        version = Fastlane::Helper::Android::VersionHelper.get_public_version
-        message = "Finalizing release: #{version}\n"
+        version = Fastlane::Helper::Android::VersionHelper.get_public_version(params[:app])
+        message = "Finalizing #{params[:app]} release: #{version}\n"
         if params[:skip_confirm]
           UI.message(message)
         else
@@ -49,6 +49,10 @@ module Fastlane
                                        description: 'Skips confirmation',
                                        is_string: false, # true: verifies the input is a string, false: every kind of value
                                        default_value: false), # the default value if the user didn't provide one
+          FastlaneCore::ConfigItem.new(key: :app,
+                                       env_name: 'PROJECT_NAME',
+                                       description: 'The name of the app to get the release version for',
+                                       is_string: true), # true: verifies the input is a string, false: every kind of value
         ]
       end
 

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

@@ -3,7 +3,7 @@ module Fastlane
     class AndroidGetAlphaVersionAction < Action
       def self.run(params)
         require_relative '../../helper/android/android_version_helper'
-        Fastlane::Helper::Android::VersionHelper.get_alpha_version()
+        Fastlane::Helper::Android::VersionHelper.get_alpha_version(params[:app])
       end
 
       #####################################################
@@ -20,6 +20,12 @@ module Fastlane
 
       def self.available_options
         # Define all options your action supports.
+        [
+          FastlaneCore::ConfigItem.new(key: :app,
+                                       env_name: 'PROJECT_NAME',
+                                       description: 'The name of the app to get the release version for',
+                                       is_string: true), # true: verifies the input is a string, false: every kind of value
+        ]
       end
 
       def self.output

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

@@ -3,7 +3,7 @@ module Fastlane
     class AndroidGetAppVersionAction < Action
       def self.run(params)
         require_relative '../../helper/android/android_version_helper'
-        Fastlane::Helper::Android::VersionHelper.get_public_version
+        Fastlane::Helper::Android::VersionHelper.get_public_version(params[:app])
       end
 
       #####################################################
@@ -20,6 +20,12 @@ module Fastlane
 
       def self.available_options
         # Define all options your action supports.
+        [
+          FastlaneCore::ConfigItem.new(key: :app,
+                                       env_name: 'PROJECT_NAME',
+                                       description: 'The name of the app to get the release version for',
+                                       is_string: true), # true: verifies the input is a string, false: every kind of value
+        ]
       end
 
       def self.output

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

@@ -3,7 +3,7 @@ module Fastlane
     class AndroidGetReleaseVersionAction < Action
       def self.run(params)
         require_relative '../../helper/android/android_version_helper'
-        Fastlane::Helper::Android::VersionHelper.get_release_version()
+        Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: params[:app])
       end
 
       #####################################################
@@ -20,6 +20,12 @@ module Fastlane
 
       def self.available_options
         # Define all options your action supports.
+        [
+          FastlaneCore::ConfigItem.new(key: :app,
+                                       env_name: 'PROJECT_NAME',
+                                       description: 'The name of the app to get the release version for',
+                                       is_string: true), # true: verifies the input is a string, false: every kind of value
+        ]
       end
 
       def self.output

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

@@ -14,7 +14,7 @@ module Fastlane
 
         # Confirm
         message = "Requested Hotfix version: #{new_ver}\n"
-        message << "Branching from: #{prev_ver}\n"
+        message << "Branching from tag: #{prev_ver}\n"
 
         if params[:skip_confirm]
           UI.message(message)
@@ -50,13 +50,13 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :version_name,
                                        env_name: 'FL_ANDROID_HOTFIX_PRECHECKS_VERSION',
-                                       description: 'The version to work on', # a short description of this parameter
+                                       description: 'The hotfix version number to create',
                                        is_string: true),
           FastlaneCore::ConfigItem.new(key: :skip_confirm,
                                        env_name: 'FL_ANDROID_HOTFIX_PRECHECKS_SKIPCONFIRM',
                                        description: 'Skips confirmation',
-                                       is_string: false, # true: verifies the input is a string, false: every kind of value
-                                       default_value: false), # the default value if the user didn't provide one
+                                       is_string: false, # Boolean
+                                       default_value: false),
         ]
       end
 

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

@@ -5,10 +5,12 @@ module Fastlane
         require_relative '../../helper/android/android_version_helper'
         require_relative '../../helper/android/android_git_helper'
 
-        release_ver = Fastlane::Helper::Android::VersionHelper.get_release_version()
-        alpha_ver = Fastlane::Helper::Android::VersionHelper.get_alpha_version() unless ENV['HAS_ALPHA_VERSION'].nil?
+        app = ENV['PROJECT_NAME'].nil? ? params[:app] : ENV['PROJECT_NAME']
+
+        release_ver = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: app)
+        alpha_ver = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app)
         Fastlane::Helper::GitHelper.create_tag(release_ver[Fastlane::Helper::Android::VersionHelper::VERSION_NAME])
-        Fastlane::Helper::GitHelper.create_tag(alpha_ver[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]) unless ENV['HAS_ALPHA_VERSION'].nil? || (params[:tag_alpha] == false)
+        Fastlane::Helper::GitHelper.create_tag(alpha_ver[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]) unless alpha_ver.nil? || (params[:tag_alpha] == false)
       end
 
       #####################################################
@@ -30,6 +32,10 @@ module Fastlane
                                        description: 'True to skip tagging the alpha version',
                                        is_string: false,
                                        default_value: true),
+          FastlaneCore::ConfigItem.new(key: :app,
+                                       env_name: 'PROJECT_NAME',
+                                       description: 'The name of the app to get the release version for',
+                                       is_string: true), # true: verifies the input is a string, false: every kind of value
         ]
       end
 

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

@@ -0,0 +1,147 @@
+module Fastlane
+  module Actions
+    class CheckTranslationProgressAction < Action
+      def self.run(params)
+        require_relative '../../helper/glotpress_helper'
+
+        UI.message('Checking translations status...')
+
+        under_threshold_langs = check_translations(
+          glotpress_url: params[:glotpress_url],
+          language_codes: params[:language_codes],
+          abort_on_violations: params[:abort_on_violations],
+          threshold: params[:min_acceptable_translation_percentage]
+        )
+
+        unless under_threshold_langs.empty?
+          check_results(
+            under_threshold_langs: under_threshold_langs,
+            threshold: params[:min_acceptable_translation_percentage],
+            skip_confirm: params[:skip_confirm]
+          )
+        end
+
+        UI.success('Done')
+      end
+
+      # Check the status of the translations and returns the list of violations
+      #
+      # @param [String] URL to the GlotPress project.
+      # @param [String] The list of codes (in GlotPress format) of the languages to check.
+      # @param [Bool] Whether to abort on the first found violation or not.
+      # @param [Integer] The minimum acceptable percentage of translated strings.
+      #
+      # @return [Array] The list of violations (array of hashes of "language code" and "current percentage")
+      #
+      def self.check_translations(glotpress_url:, language_codes:, abort_on_violations:, threshold:)
+        under_threshold_langs = []
+
+        data = begin
+          Fastlane::Helper::GlotPressHelper.get_translation_status_data(glotpress_url: glotpress_url)
+        rescue StandardError
+          nil
+        end
+        UI.abort_with_message!("Can't retrieve data from #{glotpress_url}") if data.nil? || data.empty?
+
+        language_codes.each do |language_code|
+          UI.message("> Getting translation status for #{language_code}")
+          progress = begin
+            Fastlane::Helper::GlotPressHelper.get_translation_status(
+              data: data,
+              language_code: language_code
+            )
+          rescue StandardError
+            -1
+          end
+
+          if abort_on_violations
+            UI.abort_with_message!("Can't get data for language #{language_code}") if progress == -1
+            UI.abort_with_message!("#{language_code} is translated #{progress}% which is under the required #{threshold}%.") if progress < threshold
+          end
+
+          UI.message("Language #{language_code} is #{progress}% translated.")
+          under_threshold_langs.push({ lang: language_code, progress: progress }) if progress < threshold
+        end
+
+        under_threshold_langs
+      end
+
+      # Report the status of the translations and verify whether to abort or not
+      #
+      # @param [Array] The list of violations (array of hashes of "language code" and "current percentage")
+      # @param [Integer] The minimum acceptable percentage of translated strings.
+      # @param [Bool] If true, continue after the report without asking the user.
+      #
+      def self.check_results(under_threshold_langs:, threshold:, skip_confirm:)
+        message = "The translations for the following languages are below the #{threshold}% threshold:\n"
+
+        under_threshold_langs.each do |lang|
+          message << " - #{lang[:lang]} is at #{lang[:progress]}%.\n"
+        end
+
+        if skip_confirm
+          UI.important(message)
+        elsif UI.interactive?
+          UI.abort_with_message!('Aborted by user!') unless UI.confirm("#{message}Do you want to continue?")
+        else
+          UI.abort_with_message!(message)
+        end
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        'Raises an error if the translation percentage is lower than the provided threshold'
+      end
+
+      def self.details
+        'This actions checks the current status of the translations on GlotPress ' \
+        'and raises an error if it\'s below the provided threshold'
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :glotpress_url,
+                                       env_name: 'FL_CHECK_TRANSLATION_PROGRESS_GLOTPRESS_URL',
+                                       description: 'URL to the GlotPress project',
+                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :language_codes,
+                                       env_name: 'FL_CHECK_TRANSLATION_PROGRESS_LANGUAGE_CODES',
+                                       description: 'The list of the codes of the languages to check',
+                                       type: Array,
+                                       optional: true,
+                                       # Default to Mag16.
+                                       default_value: 'ar de es fr he id it ja ko nl pt-br ru sv tr zh-cn zh-tw'.split()),
+          FastlaneCore::ConfigItem.new(key: :min_acceptable_translation_percentage,
+                                       env_name: 'FL_CHECK_TRANSLATION_PROGRESS_MIN_ACCEPTABLE_TRANSLATION_PERCENTAGE',
+                                       description: 'The threshold under which an error is raised',
+                                       type: Integer,
+                                       optional: true,
+                                       default_value: 100),
+          FastlaneCore::ConfigItem.new(key: :abort_on_violations,
+                                       env_name: 'FL_CHECK_TRANSLATION_ABORT_ON_VIOLATIONS',
+                                       description: 'Should we abort with a global error if any violations are found?',
+                                       optional: true,
+                                       default_value: true,
+                                       is_string: false),
+          FastlaneCore::ConfigItem.new(key: :skip_confirm,
+                                       env_name: 'FL_CHECK_TRANSLATION_SKIP_CONFIRM',
+                                       description: 'Move ahead without requesting confirmation if violations are found. Only works if "abort_on_violations" is disabled',
+                                       optional: true,
+                                       default_value: false,
+                                       is_string: false),
+        ]
+      end
+
+      def self.authors
+        ['loremattei']
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+    end
+  end
+end

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

@@ -9,14 +9,18 @@ module Fastlane
         create_config(params[:previous_version], params[:version])
         show_config()
 
-        UI.message 'Updating Fastlane deliver file...'
-        Fastlane::Helper::Ios::VersionHelper.update_fastlane_deliver(@new_short_version)
-        UI.message 'Done!'
+        update_deliverfile = params[:skip_deliver] == false
+        if update_deliverfile
+          UI.message 'Updating Fastlane deliver file...'
+          Fastlane::Helper::Ios::VersionHelper.update_fastlane_deliver(@new_short_version)
+          UI.message 'Done!'
+        end
+
         UI.message 'Updating XcConfig...'
         Fastlane::Helper::Ios::VersionHelper.update_xc_configs(@new_version, @new_short_version, @new_version_internal)
         UI.message 'Done!'
 
-        Fastlane::Helper::Ios::GitHelper.commit_version_bump(include_deliverfile: true, include_metadata: false)
+        Fastlane::Helper::Ios::GitHelper.commit_version_bump(include_deliverfile: update_deliverfile, include_metadata: false)
 
         UI.message 'Done.'
       end
@@ -34,18 +38,29 @@ module Fastlane
       end
 
       def self.available_options
-        # Define all options your action supports.
-
-        # Below a few examples
         [
-          FastlaneCore::ConfigItem.new(key: :version,
-                                       env_name: 'FL_IOS_BUMP_VERSION_HOTFIX_VERSION',
-                                       description: 'The version of the hotfix',
-                                       is_string: true),
-          FastlaneCore::ConfigItem.new(key: :previous_version,
-                                       env_name: 'FL_IOS_BUMP_VERSION_HOTFIX_PREVIOUS_VERSION',
-                                       description: 'The version to branch from',
-                                       is_string: true), # the default value if the user didn't provide one
+          FastlaneCore::ConfigItem.new(
+            key: :version,
+            env_name: 'FL_IOS_BUMP_VERSION_HOTFIX_VERSION',
+            description: 'The version of the hotfix',
+            is_string: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :previous_version,
+            env_name: 'FL_IOS_BUMP_VERSION_HOTFIX_PREVIOUS_VERSION',
+            description: 'The version to branch from',
+            is_string: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :skip_deliver,
+            env_name: 'FL_IOS_BUMP_VERSION_HOTFIX_SKIP_DELIVER',
+            description: 'Skips Deliverfile key update',
+            is_string: false, # Boolean parameter
+            optional: true,
+            # Don't skip the Deliverfile by default. At the time of writing, 2 out of 3 consumers
+            # still have a Deliverfile.
+            default_value: false
+          ),
         ]
       end
 

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_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
@@ -387,33 +492,6 @@ module Fastlane
           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).