fastlane-plugin-wpmreleasetoolkit 1.0.0 → 1.3.1

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

@@ -4,13 +4,23 @@ module Fastlane
       def self.run(params)
         UI.message 'Bumping app release version for hotfix...'
 
-        require_relative '../../helper/android/android_git_helper.rb'
+        require_relative '../../helper/android/android_git_helper'
         Fastlane::Helper::GitHelper.create_branch("release/#{params[:version_name]}", from: params[:previous_version_name])
-        create_config(params[:previous_version_name], params[:version_name], params[:version_code])
-        show_config()
 
-        UI.message 'Updating build.gradle...'
-        Fastlane::Helper::Android::VersionHelper.update_versions(@new_version, @current_version_alpha)
+        app = params[:app]
+
+        current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: app)
+        current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app)
+        new_version = Fastlane::Helper::Android::VersionHelper.calc_next_hotfix_version(params[:version_name], params[:version_code])
+        new_short_version = new_version_name
+        new_release_branch = "release/#{new_short_version}"
+
+        UI.message("Current version[#{app}]: #{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]})")
+        UI.message("New hotfix version[#{app}]: #{new_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{new_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]})")
+        UI.message("Release branch: #{new_release_branch}")
+
+        UI.message 'Updating app version...'
+        Fastlane::Helper::Android::VersionHelper.update_versions(app, new_version, current_version_alpha)
         UI.message 'Done!'
 
         Fastlane::Helper::Android::GitHelper.commit_version_bump()
@@ -23,11 +33,11 @@ module Fastlane
       #####################################################
 
       def self.description
-        'Bumps the version of the app and creates the new release branch'
+        'Bumps the version of the app for a new beta. Requires the `updateVersionProperties` gradle task to update the keys if you are using a `version.properties` file.'
       end
 
       def self.details
-        'Bumps the version of the app and creates the new release branch'
+        'Bumps the version of the app for a new beta. Requires the `updateVersionProperties` gradle task to update the keys if you are using a `version.properties` file.'
       end
 
       def self.available_options
@@ -46,6 +56,10 @@ module Fastlane
                                        env_name: 'FL_ANDROID_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: :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
 
@@ -56,22 +70,6 @@ module Fastlane
       def self.is_supported?(platform)
         platform == :android
       end
-
-      private
-
-      def self.create_config(previous_version, new_version_name, new_version_code)
-        @current_version = Fastlane::Helper::Android::VersionHelper.get_release_version()
-        @current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version()
-        @new_version = Fastlane::Helper::Android::VersionHelper.calc_next_hotfix_version(new_version_name, new_version_code)
-        @new_short_version = new_version_name
-        @new_release_branch = "release/#{@new_short_version}"
-      end
-
-      def self.show_config
-        UI.message("Current version: #{@current_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{@current_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]})")
-        UI.message("New hotfix version: #{@new_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{@new_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]})")
-        UI.message("Release branch: #{@new_release_branch}")
-      end
     end
   end
 end

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

@@ -5,23 +5,37 @@ 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/android/android_version_helper.rb'
-        require_relative '../../helper/android/android_git_helper.rb'
+        require_relative '../../helper/android/android_version_helper'
+        require_relative '../../helper/android/android_git_helper'
 
         other_action.ensure_git_branch(branch: 'develop')
 
         # Create new configuration
-        @new_short_version = Fastlane::Helper::Android::VersionHelper.bump_version_release()
-        create_config()
-        show_config()
+        app = params[:app]
+        new_short_version = Fastlane::Helper::Android::VersionHelper.bump_version_release(app)
+
+        current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: app)
+        current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app)
+        new_version_beta = Fastlane::Helper::Android::VersionHelper.calc_next_release_version(current_version, current_version_alpha)
+        new_version_alpha = current_version_alpha.nil? ? nil : Fastlane::Helper::Android::VersionHelper.calc_next_alpha_version(new_version_beta, current_version_alpha)
+        new_release_branch = "release/#{new_short_version}"
+
+        vname = Fastlane::Helper::Android::VersionHelper::VERSION_NAME
+        vcode = Fastlane::Helper::Android::VersionHelper::VERSION_CODE
+        UI.message("Current version[#{app}]: #{current_version[vname]}(#{current_version[vcode]})")
+        UI.message("Current alpha version[#{app}]: #{current_version_alpha[vname]}(#{current_version_alpha[vcode]})") unless current_version_alpha.nil?
+        UI.message("New beta version[#{app}]: #{new_version_beta[vname]}(#{new_version_beta[vcode]})")
+        UI.message("New alpha version[#{app}]: #{new_version_alpha[vname]}(#{new_version_alpha[vcode]})") unless current_version_alpha.nil?
+        UI.message("New version[#{app}]: #{new_short_version}")
+        UI.message("Release branch: #{new_release_branch}")
 
         # Update local develop and branch
         UI.message 'Creating new branch...'
-        Fastlane::Helper::GitHelper.create_branch(@new_release_branch, from: 'develop')
+        Fastlane::Helper::GitHelper.create_branch(new_release_branch, from: 'develop')
         UI.message 'Done!'
 
-        UI.message 'Updating versions...'
-        Fastlane::Helper::Android::VersionHelper.update_versions(@new_version_beta, @new_version_alpha)
+        UI.message 'Updating app version...'
+        Fastlane::Helper::Android::VersionHelper.update_versions(app, new_version_beta, new_version_alpha)
         Fastlane::Helper::Android::GitHelper.commit_version_bump()
         UI.message 'Done.'
       end
@@ -31,14 +45,21 @@ module Fastlane
       #####################################################
 
       def self.description
-        'Bumps the version of the app and creates the new release branch'
+        'Bumps the version of the app for a new beta. Requires the `updateVersionProperties` gradle task to update the keys if you are using a `version.properties` file.'
       end
 
       def self.details
-        'Bumps the version of the app and creates the new release branch'
+        'Bumps the version of the app for a new beta. Requires the `updateVersionProperties` gradle task to update the keys if you are using a `version.properties` file.'
       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
@@ -54,36 +75,6 @@ module Fastlane
       def self.is_supported?(platform)
         platform == :android
       end
-
-      private
-
-      def self.create_config
-        @current_version = Fastlane::Helper::Android::VersionHelper.get_release_version()
-        @current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version()
-        @new_version_beta = Fastlane::Helper::Android::VersionHelper.calc_next_release_version(@current_version, @current_version_alpha)
-        @new_version_alpha = ENV['HAS_ALPHA_VERSION'].nil? ? nil : Fastlane::Helper::Android::VersionHelper.calc_next_alpha_version(@new_version_beta, @current_version_alpha)
-        @new_release_branch = "release/#{@new_short_version}"
-      end
-
-      def self.show_config
-        vname = Fastlane::Helper::Android::VersionHelper::VERSION_NAME
-        vcode = Fastlane::Helper::Android::VersionHelper::VERSION_CODE
-        UI.message("Current version: #{@current_version[vname]}(#{@current_version[vcode]})")
-        UI.message("Current alpha version: #{@current_version_alpha[vname]}(#{@current_version_alpha[vcode]})") unless ENV['HAS_ALPHA_VERSION'].nil?
-        UI.message("New beta version: #{@new_version_beta[vname]}(#{@new_version_beta[vcode]})")
-        UI.message("New alpha version: #{@new_version_alpha[vname]}(#{@new_version_alpha[vcode]})") unless ENV['HAS_ALPHA_VERSION'].nil?
-        UI.message("New version: #{@new_short_version}")
-        UI.message("Release branch: #{@new_release_branch}")
-      end
-
-      def self.update_glotpress_key
-        dm_file = ENV['DOWNLOAD_METADATA']
-        if File.exist?(dm_file)
-          sh("sed -i '' \"s/let glotPressWhatsNewKey.*/let glotPressWhatsNewKey = \\\"v#{@new_short_version}-whats-new\\\"/\" #{dm_file}")
-        else
-          UI.user_error!("Can't find #{dm_file}.")
-        end
-      end
     end
   end
 end

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

@@ -8,24 +8,27 @@ 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/android/android_version_helper.rb'
-        require_relative '../../helper/android/android_git_helper.rb'
+        require_relative '../../helper/android/android_version_helper'
+        require_relative '../../helper/android/android_git_helper'
 
         # Checkout develop and update
         Fastlane::Helper::GitHelper.checkout_and_pull('develop')
 
+        app = params[:app]
+
         # Create versions
-        current_version = Fastlane::Helper::Android::VersionHelper.get_release_version
-        current_alpha_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version
+        current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(product_name: app)
+        current_alpha_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app)
         next_version = Fastlane::Helper::Android::VersionHelper.calc_next_release_version(current_version, current_alpha_version)
-        next_alpha_version = ENV['HAS_ALPHA_VERSION'].nil? ? nil : Fastlane::Helper::Android::VersionHelper.calc_next_alpha_version(next_version, current_alpha_version)
+        next_alpha_version = current_alpha_version.nil? ? nil : Fastlane::Helper::Android::VersionHelper.calc_next_alpha_version(next_version, current_alpha_version)
 
+        no_alpha_version_message = "No alpha version configured. If you wish to configure an alpha version please update version.properties to include an alpha key for this app\n"
         # Ask user confirmation
         unless params[:skip_confirm]
-          confirm_message = "Building a new release branch starting from develop.\nCurrent version is #{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
-          confirm_message += ENV['HAS_ALPHA_VERSION'].nil? ? "No alpha version configured.\n" : "Current Alpha version is #{current_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{current_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
+          confirm_message = "[#{app}]Building a new release branch starting from develop.\nCurrent version is #{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
+          confirm_message += current_alpha_version.nil? ? no_alpha_version_message : "Current Alpha version is #{current_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{current_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
           confirm_message += "After codefreeze the new version will be: #{next_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{next_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
-          confirm_message += ENV['HAS_ALPHA_VERSION'].nil? ? '' : "After codefreeze the new Alpha will be: #{next_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{next_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
+          confirm_message += current_alpha_version.nil? ? '' : "After codefreeze the new Alpha will be: #{next_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{next_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
           confirm_message += 'Do you want to continue?'
           UI.user_error!('Aborted by user request') unless UI.confirm(confirm_message)
         end
@@ -34,7 +37,7 @@ module Fastlane
         other_action.ensure_git_status_clean()
 
         # Return the current version
-        Fastlane::Helper::Android::VersionHelper.get_public_version
+        Fastlane::Helper::Android::VersionHelper.get_public_version(app)
       end
 
       #####################################################
@@ -57,6 +60,10 @@ module Fastlane
                                        description: 'Skips confirmation before codefreeze',
                                        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_completecodefreeze_prechecks.rb

@@ -4,13 +4,15 @@ module Fastlane
       def self.run(params)
         UI.message "Skip confirm: #{params[:skip_confirm]}"
 
-        require_relative '../../helper/android/android_version_helper.rb'
-        require_relative '../../helper/android/android_git_helper.rb'
+        require_relative '../../helper/android/android_version_helper'
+        require_relative '../../helper/android/android_git_helper'
 
         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_create_xml_release_notes.rb

@@ -2,9 +2,9 @@ module Fastlane
   module Actions
     class AndroidCreateXmlReleaseNotesAction < Action
       def self.run(params)
-        require_relative '../../helper/android/android_git_helper.rb'
+        require_relative '../../helper/android/android_git_helper'
 
-        release_notes_path = params[:download_path] + '/release_notes.xml'
+        release_notes_path = "#{params[:download_path]}/release_notes.xml"
         open(release_notes_path, 'w') do |f|
           params[:locales].each do |loc|
             puts "Looking for language: #{loc[1]}"

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

@@ -6,8 +6,9 @@ module Fastlane
 
     class AndroidCurrentBranchIsHotfixAction < Action
       def self.run(params)
-        require_relative '../../helper/android/android_version_helper.rb'
-        Fastlane::Helper::Android::VersionHelper.is_hotfix?(Fastlane::Helper::Android::VersionHelper.get_release_version)
+        require_relative '../../helper/android/android_version_helper'
+        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_download_file_by_version.rb

@@ -2,7 +2,7 @@ module Fastlane
   module Actions
     class AndroidDownloadFileByVersionAction < Action
       def self.run(params)
-        require_relative '../../helper/android/android_localize_helper.rb'
+        require_relative '../../helper/android/android_localize_helper'
         require_relative '../../helper/github_helper'
 
         version = Fastlane::Helper::Android::VersionHelper.get_library_version_from_gradle_config(import_key: params[:import_key])

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

@@ -4,8 +4,8 @@ module Fastlane
   module Actions
     class AndroidDownloadTranslationsAction < Action
       def self.run(params)
-        require_relative '../../helper/android/android_localize_helper.rb'
-        require_relative '../../helper/git_helper.rb'
+        require_relative '../../helper/android/android_localize_helper'
+        require_relative '../../helper/git_helper'
 
         res_dir = File.join(ENV['PROJECT_ROOT_FOLDER'] || '.', params[:res_dir])
 

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

@@ -8,17 +8,17 @@ module Fastlane
       def self.run(params)
         UI.message "Skip confirm: #{params[:skip_confirm]}"
 
-        require_relative '../../helper/android/android_version_helper.rb'
-        require_relative '../../helper/android/android_git_helper.rb'
+        require_relative '../../helper/android/android_version_helper'
+        require_relative '../../helper/android/android_git_helper'
 
         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"
-        if !params[:skip_confirm]
-          UI.user_error!('Aborted by user request') unless UI.confirm("#{message}Do you want to continue?")
-        else
+        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
+          UI.user_error!('Aborted by user request') unless UI.confirm("#{message}Do you want to continue?")
         end
 
         # Check local repo status
@@ -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

@@ -2,8 +2,8 @@ module Fastlane
   module Actions
     class AndroidGetAlphaVersionAction < Action
       def self.run(params)
-        require_relative '../../helper/android/android_version_helper.rb'
-        Fastlane::Helper::Android::VersionHelper.get_alpha_version()
+        require_relative '../../helper/android/android_version_helper'
+        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

@@ -2,8 +2,8 @@ module Fastlane
   module Actions
     class AndroidGetAppVersionAction < Action
       def self.run(params)
-        require_relative '../../helper/android/android_version_helper.rb'
-        Fastlane::Helper::Android::VersionHelper.get_public_version
+        require_relative '../../helper/android/android_version_helper'
+        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

@@ -2,8 +2,8 @@ module Fastlane
   module Actions
     class AndroidGetReleaseVersionAction < Action
       def self.run(params)
-        require_relative '../../helper/android/android_version_helper.rb'
-        Fastlane::Helper::Android::VersionHelper.get_release_version()
+        require_relative '../../helper/android/android_version_helper'
+        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

@@ -5,8 +5,8 @@ module Fastlane
         UI.message "Skip confirm: #{params[:skip_confirm]}"
         UI.message ''
 
-        require_relative '../../helper/android/android_version_helper.rb'
-        require_relative '../../helper/android/android_git_helper.rb'
+        require_relative '../../helper/android/android_version_helper'
+        require_relative '../../helper/android/android_git_helper'
 
         # Evaluate previous tag
         new_ver = params[:version_name]
@@ -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