fastlane-plugin-wpmreleasetoolkit 9.1.0 → 9.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (26) hide show
  1. checksums.yaml +4 -4
  2. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_betabuild_prechecks.rb +48 -5
  3. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_build_prechecks.rb +41 -6
  4. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_beta.rb +45 -5
  5. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_final_release.rb +45 -5
  6. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_hotfix.rb +39 -3
  7. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_release.rb +48 -5
  8. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_codefreeze_prechecks.rb +38 -3
  9. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_completecodefreeze_prechecks.rb +28 -1
  10. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_current_branch_is_hotfix.rb +31 -2
  11. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_download_file_by_version.rb +13 -1
  12. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_download_translations_action.rb +3 -1
  13. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_finalize_prechecks.rb +28 -1
  14. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_get_alpha_version.rb +31 -2
  15. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_get_app_version.rb +31 -2
  16. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_get_release_version.rb +31 -2
  17. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_tag_build.rb +33 -2
  18. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_update_release_notes.rb +2 -0
  19. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_update_release_notes.rb +2 -0
  20. data/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_git_helper.rb +8 -9
  21. data/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_version_helper.rb +36 -50
  22. data/lib/fastlane/plugin/wpmreleasetoolkit/helper/deprecated.rb +66 -0
  23. data/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_l10n_linter_helper.rb +1 -1
  24. data/lib/fastlane/plugin/wpmreleasetoolkit/version.rb +1 -1
  25. data/lib/fastlane/plugin/wpmreleasetoolkit/versioning/calculators/abstract_version_calculator.rb +10 -0
  26. metadata +9 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e26f9a48b802c79f4ac19eafc0f3da18b717202ab42d01ca2b2735df4b4abd5d
4
- data.tar.gz: ee567a664e7831629f4a0886fc574eec192ef214c47468211a99aa679e98685b
3
+ metadata.gz: 532a49704e70664e7427884ad21f6377c9db1f97e818092747b4bf92b480a45c
4
+ data.tar.gz: ed3c20465d4e4fad5b0617650d0658ed126512b80677007f2e9dd46fab3ed4df
5
5
  SHA512:
6
- metadata.gz: 993ef98974907a12d687e1558f9134038bf9e746a24c98e35dec4d230c87971e3342cd485d398b80076a20d03626ae4bf3b4c8b09f8f4fed316fc4ec7dcd0f8c
7
- data.tar.gz: 3c6bebdb6b77966315088ea774e9a9275035b35abf87fcbf53b3ddfdadcdbd604c59a3ea2fe0d63082a6e572ead59e96cef851c0ec3c8d6187ed6f36326fb6e4
6
+ metadata.gz: c6cf00cfb1b01498ca2f53d320035ae3b391cf10876d3aef42cbd9662686991367f36cd428899fab805136784631f5dfbaaceb87fa148c88c06e298439226940
7
+ data.tar.gz: 42d58142086572aecc11c8718554733a298c30ffc2c3fa4ddf133cdb7fd7923e21c5c0ccf2110dd650fc9deec39db04fd2706614d595ef92344fef54c90279cc
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_betabuild_prechecks.rb CHANGED
@@ -8,18 +8,36 @@ module Fastlane
8
8
  require_relative '../../helper/android/android_version_helper'
9
9
  require_relative '../../helper/android/android_git_helper'
10
10
 
11
+ has_alpha_version = params[:has_alpha_version]
12
+ project_root_folder = params[:project_root_folder]
13
+ project_name = params[:project_name]
14
+ build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
15
+ version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
16
+
11
17
  # Checkout default branch and update
12
18
  default_branch = params[:default_branch]
13
19
  Fastlane::Helper::GitHelper.checkout_and_pull(default_branch)
14
20
 
15
21
  # Check versions
16
- release_version = Fastlane::Helper::Android::VersionHelper.get_release_version
22
+ release_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
23
+ build_gradle_path: build_gradle_path,
24
+ version_properties_path: version_properties_path,
25
+ has_alpha_version: has_alpha_version
26
+ )
17
27
  message = "The following current version has been detected: #{release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n"
18
- alpha_release_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version
28
+ alpha_release_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
29
+ build_gradle_path: build_gradle_path,
30
+ version_properties_path: version_properties_path,
31
+ has_alpha_version: has_alpha_version
32
+ )
19
33
  message << "The following Alpha version has been detected: #{alpha_release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n" unless alpha_release_version.nil?
20
34
 
21
35
  # Check branch
22
- app_version = Fastlane::Helper::Android::VersionHelper.get_public_version
36
+ app_version = Fastlane::Helper::Android::VersionHelper.get_public_version(
37
+ build_gradle_path: build_gradle_path,
38
+ version_properties_path: version_properties_path,
39
+ has_alpha_version: has_alpha_version
40
+ )
23
41
  UI.user_error!("#{message}Release branch for version #{app_version} doesn't exist. Abort.") unless !params[:base_version].nil? || Fastlane::Helper::GitHelper.checkout_and_pull(release: app_version)
24
42
 
25
43
  # Check user overwrite
@@ -50,9 +68,17 @@ module Fastlane
50
68
 
51
69
  def self.get_user_build_version(version:, message:)
52
70
  UI.user_error!("Release branch for version #{version} doesn't exist. Abort.") unless Fastlane::Helper::GitHelper.checkout_and_pull(release: version)
53
- release_version = Fastlane::Helper::Android::VersionHelper.get_release_version
71
+ release_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
72
+ build_gradle_path: build_gradle_path,
73
+ version_properties_path: version_properties_path,
74
+ has_alpha_version: has_alpha_version
75
+ )
54
76
  message << "Looking at branch release/#{version} as requested by user. Detected version: #{release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}.\n"
55
- alpha_release_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version
77
+ alpha_release_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
78
+ build_gradle_path: build_gradle_path,
79
+ version_properties_path: version_properties_path,
80
+ has_alpha_version: has_alpha_version
81
+ )
56
82
  message << "and Alpha Version: #{alpha_release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n" unless alpha_release_version.nil?
57
83
  [release_version, alpha_release_version]
58
84
  end
@@ -86,6 +112,23 @@ module Fastlane
86
112
  description: 'Default branch of the repository',
87
113
  type: String,
88
114
  default_value: Fastlane::Helper::GitHelper::DEFAULT_GIT_BRANCH),
115
+ FastlaneCore::ConfigItem.new(key: :build_gradle_path,
116
+ description: 'Path to the build.gradle file',
117
+ type: String,
118
+ optional: true,
119
+ conflicting_options: %i[project_name
120
+ project_root_folder
121
+ version_properties_path]),
122
+ FastlaneCore::ConfigItem.new(key: :version_properties_path,
123
+ description: 'Path to the version.properties file',
124
+ type: String,
125
+ optional: true,
126
+ conflicting_options: %i[build_gradle_path
127
+ project_name
128
+ project_root_folder]),
129
+ Fastlane::Helper::Deprecated.project_root_folder_config_item,
130
+ Fastlane::Helper::Deprecated.project_name_config_item,
131
+ Fastlane::Helper::Deprecated.has_alpha_version_config_item,
89
132
  ]
90
133
  end
91
134
 
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_build_prechecks.rb CHANGED
@@ -9,9 +9,27 @@ module Fastlane
9
9
 
10
10
  Fastlane::Helper::GitHelper.ensure_on_branch!('release') unless other_action.is_ci
11
11
 
12
+ has_alpha_version = params[:has_alpha_version]
13
+ project_root_folder = params[:project_root_folder]
14
+ project_name = params[:project_name]
15
+ build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
16
+ version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
17
+
12
18
  message = ''
13
- beta_version = Fastlane::Helper::Android::VersionHelper.get_release_version unless !params[:beta] && !params[:final]
14
- alpha_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version if params[:alpha]
19
+ unless !params[:beta] && !params[:final]
20
+ beta_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
21
+ build_gradle_path: build_gradle_path,
22
+ version_properties_path: version_properties_path,
23
+ has_alpha_version: has_alpha_version
24
+ )
25
+ end
26
+ if params[:alpha]
27
+ alpha_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
28
+ build_gradle_path: build_gradle_path,
29
+ version_properties_path: version_properties_path,
30
+ has_alpha_version: has_alpha_version
31
+ )
32
+ end
15
33
 
16
34
  UI.user_error!("Can't build a final release out of this branch because it's configured as a beta release!") if params[:final] && Fastlane::Helper::Android::VersionHelper.is_beta_version?(beta_version)
17
35
 
@@ -19,10 +37,10 @@ module Fastlane
19
37
  message << "Building version #{beta_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{beta_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}) (for upload to Beta Channel)\n" if params[:beta]
20
38
  message << "Building version #{alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}(#{alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}) (for upload to Alpha Channel)\n" if params[:alpha]
21
39
 
22
- if params[:skip_confirm]
23
- UI.message(message)
24
- else
25
- UI.user_error!('Aborted by user request') unless UI.confirm("#{message}Do you want to continue?")
40
+ UI.important(message)
41
+
42
+ if !options[:skip_confirm] && !UI.confirm('Do you want to continue?')
43
+ UI.user_error!('Aborted by user request')
26
44
  end
27
45
 
28
46
  # Check local repo status
@@ -63,6 +81,23 @@ module Fastlane
63
81
  description: 'True if this is for a final build',
64
82
  type: Boolean,
65
83
  default_value: false),
84
+ FastlaneCore::ConfigItem.new(key: :build_gradle_path,
85
+ description: 'Path to the build.gradle file',
86
+ type: String,
87
+ optional: true,
88
+ conflicting_options: %i[project_name
89
+ project_root_folder
90
+ version_properties_path]),
91
+ FastlaneCore::ConfigItem.new(key: :version_properties_path,
92
+ description: 'Path to the version.properties file',
93
+ type: String,
94
+ optional: true,
95
+ conflicting_options: %i[build_gradle_path
96
+ project_name
97
+ project_root_folder]),
98
+ Fastlane::Helper::Deprecated.project_root_folder_config_item,
99
+ Fastlane::Helper::Deprecated.project_name_config_item,
100
+ Fastlane::Helper::Deprecated.has_alpha_version_config_item,
66
101
  ]
67
102
  end
68
103
 
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_beta.rb CHANGED
@@ -9,8 +9,22 @@ module Fastlane
9
9
 
10
10
  Fastlane::Helper::GitHelper.ensure_on_branch!('release')
11
11
 
12
- current_version = Fastlane::Helper::Android::VersionHelper.get_release_version
13
- current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version
12
+ has_alpha_version = params[:has_alpha_version]
13
+ project_root_folder = params[:project_root_folder]
14
+ project_name = params[:project_name]
15
+ build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
16
+ version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
17
+
18
+ current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
19
+ build_gradle_path: build_gradle_path,
20
+ version_properties_path: version_properties_path,
21
+ has_alpha_version: has_alpha_version
22
+ )
23
+ current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
24
+ build_gradle_path: build_gradle_path,
25
+ version_properties_path: version_properties_path,
26
+ has_alpha_version: has_alpha_version
27
+ )
14
28
  new_version_beta = Fastlane::Helper::Android::VersionHelper.calc_next_beta_version(current_version, current_version_alpha)
15
29
  new_version_alpha = current_version_alpha.nil? ? nil : Fastlane::Helper::Android::VersionHelper.calc_next_alpha_version(new_version_beta, current_version_alpha)
16
30
 
@@ -22,10 +36,18 @@ module Fastlane
22
36
  UI.message("New alpha version: #{new_version_alpha[vname]}(#{new_version_alpha[vcode]})") unless current_version_alpha.nil?
23
37
 
24
38
  UI.message 'Updating app version...'
25
- Fastlane::Helper::Android::VersionHelper.update_versions(new_version_beta, new_version_alpha)
39
+ Fastlane::Helper::Android::VersionHelper.update_versions(
40
+ new_version_beta,
41
+ new_version_alpha,
42
+ version_properties_path: version_properties_path,
43
+ has_alpha_version: has_alpha_version
44
+ )
26
45
  UI.message 'Done!'
27
46
 
28
- Fastlane::Helper::Android::GitHelper.commit_version_bump
47
+ Fastlane::Helper::Android::GitHelper.commit_version_bump(
48
+ build_gradle_path: build_gradle_path,
49
+ version_properties_path: version_properties_path
50
+ )
29
51
  end
30
52
 
31
53
  #####################################################
@@ -41,7 +63,25 @@ module Fastlane
41
63
  end
42
64
 
43
65
  def self.available_options
44
- # Define all options your action supports.
66
+ [
67
+ FastlaneCore::ConfigItem.new(key: :build_gradle_path,
68
+ description: 'Path to the build.gradle file',
69
+ type: String,
70
+ optional: true,
71
+ conflicting_options: %i[project_name
72
+ project_root_folder
73
+ version_properties_path]),
74
+ FastlaneCore::ConfigItem.new(key: :version_properties_path,
75
+ description: 'Path to the version.properties file',
76
+ type: String,
77
+ optional: true,
78
+ conflicting_options: %i[build_gradle_path
79
+ project_name
80
+ project_root_folder]),
81
+ Fastlane::Helper::Deprecated.project_root_folder_config_item,
82
+ Fastlane::Helper::Deprecated.project_name_config_item,
83
+ Fastlane::Helper::Deprecated.has_alpha_version_config_item,
84
+ ]
45
85
  end
46
86
 
47
87
  def self.output
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_final_release.rb CHANGED
@@ -9,8 +9,22 @@ module Fastlane
9
9
 
10
10
  Fastlane::Helper::GitHelper.ensure_on_branch!('release')
11
11
 
12
- current_version = Fastlane::Helper::Android::VersionHelper.get_release_version
13
- current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version
12
+ has_alpha_version = params[:has_alpha_version]
13
+ project_root_folder = params[:project_root_folder]
14
+ project_name = params[:project_name]
15
+ build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
16
+ version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
17
+
18
+ current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
19
+ build_gradle_path: build_gradle_path,
20
+ version_properties_path: version_properties_path,
21
+ has_alpha_version: has_alpha_version
22
+ )
23
+ current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
24
+ build_gradle_path: build_gradle_path,
25
+ version_properties_path: version_properties_path,
26
+ has_alpha_version: has_alpha_version
27
+ )
14
28
  final_version = Fastlane::Helper::Android::VersionHelper.calc_final_release_version(current_version, current_version_alpha)
15
29
 
16
30
  vname = Fastlane::Helper::Android::VersionHelper::VERSION_NAME
@@ -20,10 +34,18 @@ module Fastlane
20
34
  UI.message("New release version: #{final_version[vname]}(#{final_version[vcode]})")
21
35
 
22
36
  UI.message 'Updating app version...'
23
- Fastlane::Helper::Android::VersionHelper.update_versions(final_version, current_version_alpha)
37
+ Fastlane::Helper::Android::VersionHelper.update_versions(
38
+ final_version,
39
+ current_version_alpha,
40
+ version_properties_path: version_properties_path,
41
+ has_alpha_version: has_alpha_version
42
+ )
24
43
  UI.message 'Done!'
25
44
 
26
- Fastlane::Helper::Android::GitHelper.commit_version_bump
45
+ Fastlane::Helper::Android::GitHelper.commit_version_bump(
46
+ build_gradle_path: build_gradle_path,
47
+ version_properties_path: version_properties_path
48
+ )
27
49
  end
28
50
 
29
51
  #####################################################
@@ -39,7 +61,25 @@ module Fastlane
39
61
  end
40
62
 
41
63
  def self.available_options
42
- # Define all options your action supports.
64
+ [
65
+ FastlaneCore::ConfigItem.new(key: :build_gradle_path,
66
+ description: 'Path to the build.gradle file',
67
+ type: String,
68
+ optional: true,
69
+ conflicting_options: %i[project_name
70
+ project_root_folder
71
+ version_properties_path]),
72
+ FastlaneCore::ConfigItem.new(key: :version_properties_path,
73
+ description: 'Path to the version.properties file',
74
+ type: String,
75
+ optional: true,
76
+ conflicting_options: %i[build_gradle_path
77
+ project_name
78
+ project_root_folder]),
79
+ Fastlane::Helper::Deprecated.project_root_folder_config_item,
80
+ Fastlane::Helper::Deprecated.project_name_config_item,
81
+ Fastlane::Helper::Deprecated.has_alpha_version_config_item,
82
+ ]
43
83
  end
44
84
 
45
85
  def self.authors
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_hotfix.rb CHANGED
@@ -5,9 +5,20 @@ module Fastlane
5
5
  UI.message 'Bumping app release version for hotfix...'
6
6
 
7
7
  require_relative '../../helper/android/android_git_helper'
8
+
9
+ has_alpha_version = params[:has_alpha_version]
10
+ project_root_folder = params[:project_root_folder]
11
+ project_name = params[:project_name]
12
+ build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
13
+ version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
14
+
8
15
  Fastlane::Helper::GitHelper.create_branch("release/#{params[:version_name]}", from: params[:previous_version_name])
9
16
 
10
- current_version = Fastlane::Helper::Android::VersionHelper.get_release_version
17
+ current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
18
+ build_gradle_path: build_gradle_path,
19
+ version_properties_path: version_properties_path,
20
+ has_alpha_version: has_alpha_version
21
+ )
11
22
  new_version = Fastlane::Helper::Android::VersionHelper.calc_next_hotfix_version(params[:version_name], params[:version_code]) # NOTE: this just puts the name/code values in a tuple, unchanged (no actual calc/bumping)
12
23
  new_release_branch = "release/#{params[:version_name]}"
13
24
 
@@ -18,10 +29,18 @@ module Fastlane
18
29
  UI.message("Release branch: #{new_release_branch}")
19
30
 
20
31
  UI.message 'Updating app version...'
21
- Fastlane::Helper::Android::VersionHelper.update_versions(new_version, nil)
32
+ Fastlane::Helper::Android::VersionHelper.update_versions(
33
+ new_version,
34
+ nil,
35
+ version_properties_path: version_properties_path,
36
+ has_alpha_version: has_alpha_version
37
+ )
22
38
  UI.message 'Done!'
23
39
 
24
- Fastlane::Helper::Android::GitHelper.commit_version_bump
40
+ Fastlane::Helper::Android::GitHelper.commit_version_bump(
41
+ build_gradle_path: build_gradle_path,
42
+ version_properties_path: version_properties_path
43
+ )
25
44
 
26
45
  UI.message 'Done.'
27
46
  end
@@ -52,6 +71,23 @@ module Fastlane
52
71
  env_name: 'FL_ANDROID_BUMP_VERSION_HOTFIX_PREVIOUS_VERSION',
53
72
  description: 'The version to branch from',
54
73
  type: String),
74
+ FastlaneCore::ConfigItem.new(key: :build_gradle_path,
75
+ description: 'Path to the build.gradle file',
76
+ type: String,
77
+ optional: true,
78
+ conflicting_options: %i[project_name
79
+ project_root_folder
80
+ version_properties_path]),
81
+ FastlaneCore::ConfigItem.new(key: :version_properties_path,
82
+ description: 'Path to the version.properties file',
83
+ type: String,
84
+ optional: true,
85
+ conflicting_options: %i[build_gradle_path
86
+ project_name
87
+ project_root_folder]),
88
+ Fastlane::Helper::Deprecated.project_root_folder_config_item,
89
+ Fastlane::Helper::Deprecated.project_name_config_item,
90
+ Fastlane::Helper::Deprecated.has_alpha_version_config_item,
55
91
  ]
56
92
  end
57
93
 
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_release.rb CHANGED
@@ -8,14 +8,32 @@ module Fastlane
8
8
  require_relative '../../helper/android/android_version_helper'
9
9
  require_relative '../../helper/android/android_git_helper'
10
10
 
11
+ has_alpha_version = params[:has_alpha_version]
12
+ project_root_folder = params[:project_root_folder]
13
+ project_name = params[:project_name]
14
+ build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
15
+ version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
16
+
11
17
  default_branch = params[:default_branch]
12
18
  other_action.ensure_git_branch(branch: default_branch)
13
19
 
14
20
  # Create new configuration
15
- new_short_version = Fastlane::Helper::Android::VersionHelper.bump_version_release
21
+ new_short_version = Fastlane::Helper::Android::VersionHelper.bump_version_release(
22
+ build_gradle_path: build_gradle_path,
23
+ version_properties_path: version_properties_path,
24
+ has_alpha_version: has_alpha_version
25
+ )
16
26
 
17
- current_version = Fastlane::Helper::Android::VersionHelper.get_release_version
18
- current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version
27
+ current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
28
+ build_gradle_path: build_gradle_path,
29
+ version_properties_path: version_properties_path,
30
+ has_alpha_version: has_alpha_version
31
+ )
32
+ current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
33
+ build_gradle_path: build_gradle_path,
34
+ version_properties_path: version_properties_path,
35
+ has_alpha_version: has_alpha_version
36
+ )
19
37
  new_version_beta = Fastlane::Helper::Android::VersionHelper.calc_next_release_version(current_version, current_version_alpha)
20
38
  new_version_alpha = current_version_alpha.nil? ? nil : Fastlane::Helper::Android::VersionHelper.calc_next_alpha_version(new_version_beta, current_version_alpha)
21
39
  new_release_branch = "release/#{new_short_version}"
@@ -35,8 +53,16 @@ module Fastlane
35
53
  UI.message 'Done!'
36
54
 
37
55
  UI.message 'Updating app version...'
38
- Fastlane::Helper::Android::VersionHelper.update_versions(new_version_beta, new_version_alpha)
39
- Fastlane::Helper::Android::GitHelper.commit_version_bump
56
+ Fastlane::Helper::Android::VersionHelper.update_versions(
57
+ new_version_beta,
58
+ new_version_alpha,
59
+ version_properties_path: version_properties_path,
60
+ has_alpha_version: has_alpha_version
61
+ )
62
+ Fastlane::Helper::Android::GitHelper.commit_version_bump(
63
+ build_gradle_path: build_gradle_path,
64
+ version_properties_path: version_properties_path
65
+ )
40
66
  UI.message 'Done.'
41
67
  end
42
68
 
@@ -59,6 +85,23 @@ module Fastlane
59
85
  description: 'Default branch of the repository',
60
86
  type: String,
61
87
  default_value: Fastlane::Helper::GitHelper::DEFAULT_GIT_BRANCH),
88
+ FastlaneCore::ConfigItem.new(key: :build_gradle_path,
89
+ description: 'Path to the build.gradle file',
90
+ type: String,
91
+ optional: true,
92
+ conflicting_options: %i[project_name
93
+ project_root_folder
94
+ version_properties_path]),
95
+ FastlaneCore::ConfigItem.new(key: :version_properties_path,
96
+ description: 'Path to the version.properties file',
97
+ type: String,
98
+ optional: true,
99
+ conflicting_options: %i[build_gradle_path
100
+ project_name
101
+ project_root_folder]),
102
+ Fastlane::Helper::Deprecated.project_root_folder_config_item,
103
+ Fastlane::Helper::Deprecated.project_name_config_item,
104
+ Fastlane::Helper::Deprecated.has_alpha_version_config_item,
62
105
  ]
63
106
  end
64
107
 
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_codefreeze_prechecks.rb CHANGED
@@ -11,13 +11,27 @@ module Fastlane
11
11
  require_relative '../../helper/android/android_version_helper'
12
12
  require_relative '../../helper/android/android_git_helper'
13
13
 
14
+ has_alpha_version = params[:has_alpha_version]
15
+ project_root_folder = params[:project_root_folder]
16
+ project_name = params[:project_name]
17
+ build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
18
+ version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
19
+
14
20
  # Checkout default branch and update
15
21
  default_branch = params[:default_branch]
16
22
  Fastlane::Helper::GitHelper.checkout_and_pull(default_branch)
17
23
 
18
24
  # Create versions
19
- current_version = Fastlane::Helper::Android::VersionHelper.get_release_version
20
- current_alpha_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version
25
+ current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
26
+ build_gradle_path: build_gradle_path,
27
+ version_properties_path: version_properties_path,
28
+ has_alpha_version: has_alpha_version
29
+ )
30
+ current_alpha_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
31
+ build_gradle_path: build_gradle_path,
32
+ version_properties_path: version_properties_path,
33
+ has_alpha_version: has_alpha_version
34
+ )
21
35
  next_version = Fastlane::Helper::Android::VersionHelper.calc_next_release_version(current_version, current_alpha_version)
22
36
  next_alpha_version = current_alpha_version.nil? ? nil : Fastlane::Helper::Android::VersionHelper.calc_next_alpha_version(next_version, current_alpha_version)
23
37
 
@@ -36,7 +50,11 @@ module Fastlane
36
50
  other_action.ensure_git_status_clean
37
51
 
38
52
  # Return the current version
39
- Fastlane::Helper::Android::VersionHelper.get_public_version
53
+ Fastlane::Helper::Android::VersionHelper.get_public_version(
54
+ build_gradle_path: build_gradle_path,
55
+ version_properties_path: version_properties_path,
56
+ has_alpha_version: has_alpha_version
57
+ )
40
58
  end
41
59
 
42
60
  #####################################################
@@ -64,6 +82,23 @@ module Fastlane
64
82
  description: 'Default branch of the repository',
65
83
  type: String,
66
84
  default_value: Fastlane::Helper::GitHelper::DEFAULT_GIT_BRANCH),
85
+ FastlaneCore::ConfigItem.new(key: :build_gradle_path,
86
+ description: 'Path to the build.gradle file',
87
+ type: String,
88
+ optional: true,
89
+ conflicting_options: %i[project_name
90
+ project_root_folder
91
+ version_properties_path]),
92
+ FastlaneCore::ConfigItem.new(key: :version_properties_path,
93
+ description: 'Path to the version.properties file',
94
+ type: String,
95
+ optional: true,
96
+ conflicting_options: %i[build_gradle_path
97
+ project_name
98
+ project_root_folder]),
99
+ Fastlane::Helper::Deprecated.project_root_folder_config_item,
100
+ Fastlane::Helper::Deprecated.project_name_config_item,
101
+ Fastlane::Helper::Deprecated.has_alpha_version_config_item,
67
102
  ]
68
103
  end
69
104
 
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_completecodefreeze_prechecks.rb CHANGED
@@ -11,7 +11,17 @@ module Fastlane
11
11
  current_branch = Fastlane::Helper::GitHelper.current_git_branch
12
12
  UI.user_error!("Current branch - '#{current_branch}' - is not a release branch. Abort.") unless current_branch.start_with?('release/')
13
13
 
14
- version = Fastlane::Helper::Android::VersionHelper.get_public_version
14
+ has_alpha_version = params[:has_alpha_version]
15
+ project_root_folder = params[:project_root_folder]
16
+ project_name = params[:project_name]
17
+ build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
18
+ version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
19
+
20
+ version = Fastlane::Helper::Android::VersionHelper.get_public_version(
21
+ build_gradle_path: build_gradle_path,
22
+ version_properties_path: version_properties_path,
23
+ has_alpha_version: has_alpha_version
24
+ )
15
25
  message = "Completing code freeze for: #{version}\n"
16
26
  if params[:skip_confirm]
17
27
  UI.message(message)
@@ -44,6 +54,23 @@ module Fastlane
44
54
  description: 'Skips confirmation',
45
55
  type: Boolean,
46
56
  default_value: false), # the default value if the user didn't provide one
57
+ FastlaneCore::ConfigItem.new(key: :build_gradle_path,
58
+ description: 'Path to the build.gradle file',
59
+ type: String,
60
+ optional: true,
61
+ conflicting_options: %i[project_name
62
+ project_root_folder
63
+ version_properties_path]),
64
+ FastlaneCore::ConfigItem.new(key: :version_properties_path,
65
+ description: 'Path to the version.properties file',
66
+ type: String,
67
+ optional: true,
68
+ conflicting_options: %i[build_gradle_path
69
+ project_name
70
+ project_root_folder]),
71
+ Fastlane::Helper::Deprecated.project_root_folder_config_item,
72
+ Fastlane::Helper::Deprecated.project_name_config_item,
73
+ Fastlane::Helper::Deprecated.has_alpha_version_config_item,
47
74
  ]
48
75
  end
49
76
 
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_current_branch_is_hotfix.rb CHANGED
@@ -7,7 +7,18 @@ module Fastlane
7
7
  class AndroidCurrentBranchIsHotfixAction < Action
8
8
  def self.run(params)
9
9
  require_relative '../../helper/android/android_version_helper'
10
- version = Fastlane::Helper::Android::VersionHelper.get_release_version
10
+
11
+ has_alpha_version = params[:has_alpha_version]
12
+ project_root_folder = params[:project_root_folder]
13
+ project_name = params[:project_name]
14
+ build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
15
+ version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
16
+
17
+ version = Fastlane::Helper::Android::VersionHelper.get_release_version(
18
+ build_gradle_path: build_gradle_path,
19
+ version_properties_path: version_properties_path,
20
+ has_alpha_version: has_alpha_version
21
+ )
11
22
  Fastlane::Helper::Android::VersionHelper.is_hotfix?(version)
12
23
  end
13
24
 
@@ -24,7 +35,25 @@ module Fastlane
24
35
  end
25
36
 
26
37
  def self.available_options
27
- # Define all options your action supports.
38
+ [
39
+ FastlaneCore::ConfigItem.new(key: :build_gradle_path,
40
+ description: 'Path to the build.gradle file',
41
+ type: String,
42
+ optional: true,
43
+ conflicting_options: %i[project_name
44
+ project_root_folder
45
+ version_properties_path]),
46
+ FastlaneCore::ConfigItem.new(key: :version_properties_path,
47
+ description: 'Path to the version.properties file',
48
+ type: String,
49
+ optional: true,
50
+ conflicting_options: %i[build_gradle_path
51
+ project_name
52
+ project_root_folder]),
53
+ Fastlane::Helper::Deprecated.project_root_folder_config_item,
54
+ Fastlane::Helper::Deprecated.project_name_config_item,
55
+ Fastlane::Helper::Deprecated.has_alpha_version_config_item,
56
+ ]
28
57
  end
29
58
 
30
59
  def self.output
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_download_file_by_version.rb CHANGED
@@ -5,7 +5,13 @@ module Fastlane
5
5
  require_relative '../../helper/android/android_localize_helper'
6
6
  require_relative '../../helper/github_helper'
7
7
 
8
- version = Fastlane::Helper::Android::VersionHelper.get_library_version_from_gradle_config(import_key: params[:import_key])
8
+ project_root_folder = params[:project_root_folder]
9
+ build_gradle_path = params[:build_gradle_path] || File.join(project_root_folder || '.', 'build.gradle')
10
+
11
+ version = Fastlane::Helper::Android::VersionHelper.get_library_version_from_gradle_config(
12
+ build_gradle_path: build_gradle_path,
13
+ import_key: params[:import_key]
14
+ )
9
15
  UI.user_error!("Can't find any reference for key #{params[:import_key]}") if version.nil?
10
16
  UI.message "Downloading #{params[:file_path]} from #{params[:repository]} at version #{version} to #{params[:download_folder]}"
11
17
 
@@ -58,7 +64,13 @@ module Fastlane
58
64
  description: 'The prefix which is used in the GitHub release title',
59
65
  type: String,
60
66
  optional: true),
67
+ FastlaneCore::ConfigItem.new(key: :build_gradle_path,
68
+ description: 'Path to the build.gradle file',
69
+ type: String,
70
+ optional: true,
71
+ conflicting_options: [:project_root_folder]),
61
72
  Fastlane::Helper::GithubHelper.github_token_config_item,
73
+ Fastlane::Helper::Deprecated.project_root_folder_config_item,
62
74
  ]
63
75
  end
64
76