fastlane-plugin-wpmreleasetoolkit 9.2.0 → 9.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_betabuild_prechecks.rb +12 -5
- data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_build_prechecks.rb +6 -2
- data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_beta.rb +8 -3
- data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_final_release.rb +8 -3
- data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_hotfix.rb +6 -2
- data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_release.rb +10 -4
- data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_codefreeze_prechecks.rb +8 -3
- data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_completecodefreeze_prechecks.rb +4 -1
- data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_current_branch_is_hotfix.rb +4 -1
- data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_finalize_prechecks.rb +4 -1
- data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_get_alpha_version.rb +4 -1
- data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_get_app_version.rb +4 -1
- data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_get_release_version.rb +4 -1
- data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_tag_build.rb +6 -2
- data/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_version_helper.rb +12 -10
- data/lib/fastlane/plugin/wpmreleasetoolkit/helper/deprecated.rb +20 -0
- data/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_l10n_linter_helper.rb +1 -1
- data/lib/fastlane/plugin/wpmreleasetoolkit/version.rb +1 -1
- data/lib/fastlane/plugin/wpmreleasetoolkit/versioning/calculators/abstract_version_calculator.rb +10 -0
- metadata +8 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 532a49704e70664e7427884ad21f6377c9db1f97e818092747b4bf92b480a45c
|
4
|
+
data.tar.gz: ed3c20465d4e4fad5b0617650d0658ed126512b80677007f2e9dd46fab3ed4df
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c6cf00cfb1b01498ca2f53d320035ae3b391cf10876d3aef42cbd9662686991367f36cd428899fab805136784631f5dfbaaceb87fa148c88c06e298439226940
|
7
|
+
data.tar.gz: 42d58142086572aecc11c8718554733a298c30ffc2c3fa4ddf133cdb7fd7923e21c5c0ccf2110dd650fc9deec39db04fd2706614d595ef92344fef54c90279cc
|
@@ -8,6 +8,7 @@ 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]
|
11
12
|
project_root_folder = params[:project_root_folder]
|
12
13
|
project_name = params[:project_name]
|
13
14
|
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
|
@@ -20,19 +21,22 @@ module Fastlane
|
|
20
21
|
# Check versions
|
21
22
|
release_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
|
22
23
|
build_gradle_path: build_gradle_path,
|
23
|
-
version_properties_path: version_properties_path
|
24
|
+
version_properties_path: version_properties_path,
|
25
|
+
has_alpha_version: has_alpha_version
|
24
26
|
)
|
25
27
|
message = "The following current version has been detected: #{release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n"
|
26
28
|
alpha_release_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
|
27
29
|
build_gradle_path: build_gradle_path,
|
28
|
-
version_properties_path: version_properties_path
|
30
|
+
version_properties_path: version_properties_path,
|
31
|
+
has_alpha_version: has_alpha_version
|
29
32
|
)
|
30
33
|
message << "The following Alpha version has been detected: #{alpha_release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n" unless alpha_release_version.nil?
|
31
34
|
|
32
35
|
# Check branch
|
33
36
|
app_version = Fastlane::Helper::Android::VersionHelper.get_public_version(
|
34
37
|
build_gradle_path: build_gradle_path,
|
35
|
-
version_properties_path: version_properties_path
|
38
|
+
version_properties_path: version_properties_path,
|
39
|
+
has_alpha_version: has_alpha_version
|
36
40
|
)
|
37
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)
|
38
42
|
|
@@ -66,12 +70,14 @@ module Fastlane
|
|
66
70
|
UI.user_error!("Release branch for version #{version} doesn't exist. Abort.") unless Fastlane::Helper::GitHelper.checkout_and_pull(release: version)
|
67
71
|
release_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
|
68
72
|
build_gradle_path: build_gradle_path,
|
69
|
-
version_properties_path: version_properties_path
|
73
|
+
version_properties_path: version_properties_path,
|
74
|
+
has_alpha_version: has_alpha_version
|
70
75
|
)
|
71
76
|
message << "Looking at branch release/#{version} as requested by user. Detected version: #{release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}.\n"
|
72
77
|
alpha_release_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
|
73
78
|
build_gradle_path: build_gradle_path,
|
74
|
-
version_properties_path: version_properties_path
|
79
|
+
version_properties_path: version_properties_path,
|
80
|
+
has_alpha_version: has_alpha_version
|
75
81
|
)
|
76
82
|
message << "and Alpha Version: #{alpha_release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n" unless alpha_release_version.nil?
|
77
83
|
[release_version, alpha_release_version]
|
@@ -122,6 +128,7 @@ module Fastlane
|
|
122
128
|
project_root_folder]),
|
123
129
|
Fastlane::Helper::Deprecated.project_root_folder_config_item,
|
124
130
|
Fastlane::Helper::Deprecated.project_name_config_item,
|
131
|
+
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
|
125
132
|
]
|
126
133
|
end
|
127
134
|
|
@@ -9,6 +9,7 @@ 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]
|
12
13
|
project_root_folder = params[:project_root_folder]
|
13
14
|
project_name = params[:project_name]
|
14
15
|
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
|
@@ -18,13 +19,15 @@ module Fastlane
|
|
18
19
|
unless !params[:beta] && !params[:final]
|
19
20
|
beta_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
|
20
21
|
build_gradle_path: build_gradle_path,
|
21
|
-
version_properties_path: version_properties_path
|
22
|
+
version_properties_path: version_properties_path,
|
23
|
+
has_alpha_version: has_alpha_version
|
22
24
|
)
|
23
25
|
end
|
24
26
|
if params[:alpha]
|
25
27
|
alpha_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
|
26
28
|
build_gradle_path: build_gradle_path,
|
27
|
-
version_properties_path: version_properties_path
|
29
|
+
version_properties_path: version_properties_path,
|
30
|
+
has_alpha_version: has_alpha_version
|
28
31
|
)
|
29
32
|
end
|
30
33
|
|
@@ -94,6 +97,7 @@ module Fastlane
|
|
94
97
|
project_root_folder]),
|
95
98
|
Fastlane::Helper::Deprecated.project_root_folder_config_item,
|
96
99
|
Fastlane::Helper::Deprecated.project_name_config_item,
|
100
|
+
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
|
97
101
|
]
|
98
102
|
end
|
99
103
|
|
@@ -9,6 +9,7 @@ module Fastlane
|
|
9
9
|
|
10
10
|
Fastlane::Helper::GitHelper.ensure_on_branch!('release')
|
11
11
|
|
12
|
+
has_alpha_version = params[:has_alpha_version]
|
12
13
|
project_root_folder = params[:project_root_folder]
|
13
14
|
project_name = params[:project_name]
|
14
15
|
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
|
@@ -16,11 +17,13 @@ module Fastlane
|
|
16
17
|
|
17
18
|
current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
|
18
19
|
build_gradle_path: build_gradle_path,
|
19
|
-
version_properties_path: version_properties_path
|
20
|
+
version_properties_path: version_properties_path,
|
21
|
+
has_alpha_version: has_alpha_version
|
20
22
|
)
|
21
23
|
current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
|
22
24
|
build_gradle_path: build_gradle_path,
|
23
|
-
version_properties_path: version_properties_path
|
25
|
+
version_properties_path: version_properties_path,
|
26
|
+
has_alpha_version: has_alpha_version
|
24
27
|
)
|
25
28
|
new_version_beta = Fastlane::Helper::Android::VersionHelper.calc_next_beta_version(current_version, current_version_alpha)
|
26
29
|
new_version_alpha = current_version_alpha.nil? ? nil : Fastlane::Helper::Android::VersionHelper.calc_next_alpha_version(new_version_beta, current_version_alpha)
|
@@ -36,7 +39,8 @@ module Fastlane
|
|
36
39
|
Fastlane::Helper::Android::VersionHelper.update_versions(
|
37
40
|
new_version_beta,
|
38
41
|
new_version_alpha,
|
39
|
-
version_properties_path: version_properties_path
|
42
|
+
version_properties_path: version_properties_path,
|
43
|
+
has_alpha_version: has_alpha_version
|
40
44
|
)
|
41
45
|
UI.message 'Done!'
|
42
46
|
|
@@ -76,6 +80,7 @@ module Fastlane
|
|
76
80
|
project_root_folder]),
|
77
81
|
Fastlane::Helper::Deprecated.project_root_folder_config_item,
|
78
82
|
Fastlane::Helper::Deprecated.project_name_config_item,
|
83
|
+
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
|
79
84
|
]
|
80
85
|
end
|
81
86
|
|
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_final_release.rb
CHANGED
@@ -9,6 +9,7 @@ module Fastlane
|
|
9
9
|
|
10
10
|
Fastlane::Helper::GitHelper.ensure_on_branch!('release')
|
11
11
|
|
12
|
+
has_alpha_version = params[:has_alpha_version]
|
12
13
|
project_root_folder = params[:project_root_folder]
|
13
14
|
project_name = params[:project_name]
|
14
15
|
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
|
@@ -16,11 +17,13 @@ module Fastlane
|
|
16
17
|
|
17
18
|
current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
|
18
19
|
build_gradle_path: build_gradle_path,
|
19
|
-
version_properties_path: version_properties_path
|
20
|
+
version_properties_path: version_properties_path,
|
21
|
+
has_alpha_version: has_alpha_version
|
20
22
|
)
|
21
23
|
current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
|
22
24
|
build_gradle_path: build_gradle_path,
|
23
|
-
version_properties_path: version_properties_path
|
25
|
+
version_properties_path: version_properties_path,
|
26
|
+
has_alpha_version: has_alpha_version
|
24
27
|
)
|
25
28
|
final_version = Fastlane::Helper::Android::VersionHelper.calc_final_release_version(current_version, current_version_alpha)
|
26
29
|
|
@@ -34,7 +37,8 @@ module Fastlane
|
|
34
37
|
Fastlane::Helper::Android::VersionHelper.update_versions(
|
35
38
|
final_version,
|
36
39
|
current_version_alpha,
|
37
|
-
version_properties_path: version_properties_path
|
40
|
+
version_properties_path: version_properties_path,
|
41
|
+
has_alpha_version: has_alpha_version
|
38
42
|
)
|
39
43
|
UI.message 'Done!'
|
40
44
|
|
@@ -74,6 +78,7 @@ module Fastlane
|
|
74
78
|
project_root_folder]),
|
75
79
|
Fastlane::Helper::Deprecated.project_root_folder_config_item,
|
76
80
|
Fastlane::Helper::Deprecated.project_name_config_item,
|
81
|
+
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
|
77
82
|
]
|
78
83
|
end
|
79
84
|
|
@@ -6,6 +6,7 @@ module Fastlane
|
|
6
6
|
|
7
7
|
require_relative '../../helper/android/android_git_helper'
|
8
8
|
|
9
|
+
has_alpha_version = params[:has_alpha_version]
|
9
10
|
project_root_folder = params[:project_root_folder]
|
10
11
|
project_name = params[:project_name]
|
11
12
|
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
|
@@ -15,7 +16,8 @@ module Fastlane
|
|
15
16
|
|
16
17
|
current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
|
17
18
|
build_gradle_path: build_gradle_path,
|
18
|
-
version_properties_path: version_properties_path
|
19
|
+
version_properties_path: version_properties_path,
|
20
|
+
has_alpha_version: has_alpha_version
|
19
21
|
)
|
20
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)
|
21
23
|
new_release_branch = "release/#{params[:version_name]}"
|
@@ -30,7 +32,8 @@ module Fastlane
|
|
30
32
|
Fastlane::Helper::Android::VersionHelper.update_versions(
|
31
33
|
new_version,
|
32
34
|
nil,
|
33
|
-
version_properties_path: version_properties_path
|
35
|
+
version_properties_path: version_properties_path,
|
36
|
+
has_alpha_version: has_alpha_version
|
34
37
|
)
|
35
38
|
UI.message 'Done!'
|
36
39
|
|
@@ -84,6 +87,7 @@ module Fastlane
|
|
84
87
|
project_root_folder]),
|
85
88
|
Fastlane::Helper::Deprecated.project_root_folder_config_item,
|
86
89
|
Fastlane::Helper::Deprecated.project_name_config_item,
|
90
|
+
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
|
87
91
|
]
|
88
92
|
end
|
89
93
|
|
@@ -8,6 +8,7 @@ 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]
|
11
12
|
project_root_folder = params[:project_root_folder]
|
12
13
|
project_name = params[:project_name]
|
13
14
|
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
|
@@ -19,16 +20,19 @@ module Fastlane
|
|
19
20
|
# Create new configuration
|
20
21
|
new_short_version = Fastlane::Helper::Android::VersionHelper.bump_version_release(
|
21
22
|
build_gradle_path: build_gradle_path,
|
22
|
-
version_properties_path: version_properties_path
|
23
|
+
version_properties_path: version_properties_path,
|
24
|
+
has_alpha_version: has_alpha_version
|
23
25
|
)
|
24
26
|
|
25
27
|
current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
|
26
28
|
build_gradle_path: build_gradle_path,
|
27
|
-
version_properties_path: version_properties_path
|
29
|
+
version_properties_path: version_properties_path,
|
30
|
+
has_alpha_version: has_alpha_version
|
28
31
|
)
|
29
32
|
current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
|
30
33
|
build_gradle_path: build_gradle_path,
|
31
|
-
version_properties_path: version_properties_path
|
34
|
+
version_properties_path: version_properties_path,
|
35
|
+
has_alpha_version: has_alpha_version
|
32
36
|
)
|
33
37
|
new_version_beta = Fastlane::Helper::Android::VersionHelper.calc_next_release_version(current_version, current_version_alpha)
|
34
38
|
new_version_alpha = current_version_alpha.nil? ? nil : Fastlane::Helper::Android::VersionHelper.calc_next_alpha_version(new_version_beta, current_version_alpha)
|
@@ -52,7 +56,8 @@ module Fastlane
|
|
52
56
|
Fastlane::Helper::Android::VersionHelper.update_versions(
|
53
57
|
new_version_beta,
|
54
58
|
new_version_alpha,
|
55
|
-
version_properties_path: version_properties_path
|
59
|
+
version_properties_path: version_properties_path,
|
60
|
+
has_alpha_version: has_alpha_version
|
56
61
|
)
|
57
62
|
Fastlane::Helper::Android::GitHelper.commit_version_bump(
|
58
63
|
build_gradle_path: build_gradle_path,
|
@@ -96,6 +101,7 @@ module Fastlane
|
|
96
101
|
project_root_folder]),
|
97
102
|
Fastlane::Helper::Deprecated.project_root_folder_config_item,
|
98
103
|
Fastlane::Helper::Deprecated.project_name_config_item,
|
104
|
+
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
|
99
105
|
]
|
100
106
|
end
|
101
107
|
|
@@ -11,6 +11,7 @@ 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]
|
14
15
|
project_root_folder = params[:project_root_folder]
|
15
16
|
project_name = params[:project_name]
|
16
17
|
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
|
@@ -23,11 +24,13 @@ module Fastlane
|
|
23
24
|
# Create versions
|
24
25
|
current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
|
25
26
|
build_gradle_path: build_gradle_path,
|
26
|
-
version_properties_path: version_properties_path
|
27
|
+
version_properties_path: version_properties_path,
|
28
|
+
has_alpha_version: has_alpha_version
|
27
29
|
)
|
28
30
|
current_alpha_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
|
29
31
|
build_gradle_path: build_gradle_path,
|
30
|
-
version_properties_path: version_properties_path
|
32
|
+
version_properties_path: version_properties_path,
|
33
|
+
has_alpha_version: has_alpha_version
|
31
34
|
)
|
32
35
|
next_version = Fastlane::Helper::Android::VersionHelper.calc_next_release_version(current_version, current_alpha_version)
|
33
36
|
next_alpha_version = current_alpha_version.nil? ? nil : Fastlane::Helper::Android::VersionHelper.calc_next_alpha_version(next_version, current_alpha_version)
|
@@ -49,7 +52,8 @@ module Fastlane
|
|
49
52
|
# Return the current version
|
50
53
|
Fastlane::Helper::Android::VersionHelper.get_public_version(
|
51
54
|
build_gradle_path: build_gradle_path,
|
52
|
-
version_properties_path: version_properties_path
|
55
|
+
version_properties_path: version_properties_path,
|
56
|
+
has_alpha_version: has_alpha_version
|
53
57
|
)
|
54
58
|
end
|
55
59
|
|
@@ -94,6 +98,7 @@ module Fastlane
|
|
94
98
|
project_root_folder]),
|
95
99
|
Fastlane::Helper::Deprecated.project_root_folder_config_item,
|
96
100
|
Fastlane::Helper::Deprecated.project_name_config_item,
|
101
|
+
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
|
97
102
|
]
|
98
103
|
end
|
99
104
|
|
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_completecodefreeze_prechecks.rb
CHANGED
@@ -11,6 +11,7 @@ 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
|
+
has_alpha_version = params[:has_alpha_version]
|
14
15
|
project_root_folder = params[:project_root_folder]
|
15
16
|
project_name = params[:project_name]
|
16
17
|
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
|
@@ -18,7 +19,8 @@ module Fastlane
|
|
18
19
|
|
19
20
|
version = Fastlane::Helper::Android::VersionHelper.get_public_version(
|
20
21
|
build_gradle_path: build_gradle_path,
|
21
|
-
version_properties_path: version_properties_path
|
22
|
+
version_properties_path: version_properties_path,
|
23
|
+
has_alpha_version: has_alpha_version
|
22
24
|
)
|
23
25
|
message = "Completing code freeze for: #{version}\n"
|
24
26
|
if params[:skip_confirm]
|
@@ -68,6 +70,7 @@ module Fastlane
|
|
68
70
|
project_root_folder]),
|
69
71
|
Fastlane::Helper::Deprecated.project_root_folder_config_item,
|
70
72
|
Fastlane::Helper::Deprecated.project_name_config_item,
|
73
|
+
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
|
71
74
|
]
|
72
75
|
end
|
73
76
|
|
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_current_branch_is_hotfix.rb
CHANGED
@@ -8,6 +8,7 @@ module Fastlane
|
|
8
8
|
def self.run(params)
|
9
9
|
require_relative '../../helper/android/android_version_helper'
|
10
10
|
|
11
|
+
has_alpha_version = params[:has_alpha_version]
|
11
12
|
project_root_folder = params[:project_root_folder]
|
12
13
|
project_name = params[:project_name]
|
13
14
|
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
|
@@ -15,7 +16,8 @@ module Fastlane
|
|
15
16
|
|
16
17
|
version = Fastlane::Helper::Android::VersionHelper.get_release_version(
|
17
18
|
build_gradle_path: build_gradle_path,
|
18
|
-
version_properties_path: version_properties_path
|
19
|
+
version_properties_path: version_properties_path,
|
20
|
+
has_alpha_version: has_alpha_version
|
19
21
|
)
|
20
22
|
Fastlane::Helper::Android::VersionHelper.is_hotfix?(version)
|
21
23
|
end
|
@@ -50,6 +52,7 @@ module Fastlane
|
|
50
52
|
project_root_folder]),
|
51
53
|
Fastlane::Helper::Deprecated.project_root_folder_config_item,
|
52
54
|
Fastlane::Helper::Deprecated.project_name_config_item,
|
55
|
+
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
|
53
56
|
]
|
54
57
|
end
|
55
58
|
|
@@ -15,6 +15,7 @@ module Fastlane
|
|
15
15
|
current_branch = Fastlane::Helper::GitHelper.current_git_branch
|
16
16
|
UI.user_error!("Current branch - '#{current_branch}' - is not a release branch. Abort.") unless current_branch.start_with?('release/')
|
17
17
|
|
18
|
+
has_alpha_version = params[:has_alpha_version]
|
18
19
|
project_root_folder = params[:project_root_folder]
|
19
20
|
project_name = params[:project_name]
|
20
21
|
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
|
@@ -22,7 +23,8 @@ module Fastlane
|
|
22
23
|
|
23
24
|
version = Fastlane::Helper::Android::VersionHelper.get_public_version(
|
24
25
|
build_gradle_path: build_gradle_path,
|
25
|
-
version_properties_path: version_properties_path
|
26
|
+
version_properties_path: version_properties_path,
|
27
|
+
has_alpha_version: has_alpha_version
|
26
28
|
)
|
27
29
|
message = "Finalizing release: #{version}\n"
|
28
30
|
if params[:skip_confirm]
|
@@ -75,6 +77,7 @@ module Fastlane
|
|
75
77
|
project_root_folder]),
|
76
78
|
Fastlane::Helper::Deprecated.project_root_folder_config_item,
|
77
79
|
Fastlane::Helper::Deprecated.project_name_config_item,
|
80
|
+
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
|
78
81
|
]
|
79
82
|
end
|
80
83
|
|
@@ -4,6 +4,7 @@ module Fastlane
|
|
4
4
|
def self.run(params)
|
5
5
|
require_relative '../../helper/android/android_version_helper'
|
6
6
|
|
7
|
+
has_alpha_version = params[:has_alpha_version]
|
7
8
|
project_root_folder = params[:project_root_folder]
|
8
9
|
project_name = params[:project_name]
|
9
10
|
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
|
@@ -11,7 +12,8 @@ module Fastlane
|
|
11
12
|
|
12
13
|
Fastlane::Helper::Android::VersionHelper.get_alpha_version(
|
13
14
|
build_gradle_path: build_gradle_path,
|
14
|
-
version_properties_path: version_properties_path
|
15
|
+
version_properties_path: version_properties_path,
|
16
|
+
has_alpha_version: has_alpha_version
|
15
17
|
)
|
16
18
|
end
|
17
19
|
|
@@ -45,6 +47,7 @@ module Fastlane
|
|
45
47
|
project_root_folder]),
|
46
48
|
Fastlane::Helper::Deprecated.project_root_folder_config_item,
|
47
49
|
Fastlane::Helper::Deprecated.project_name_config_item,
|
50
|
+
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
|
48
51
|
]
|
49
52
|
end
|
50
53
|
|
@@ -4,6 +4,7 @@ module Fastlane
|
|
4
4
|
def self.run(params)
|
5
5
|
require_relative '../../helper/android/android_version_helper'
|
6
6
|
|
7
|
+
has_alpha_version = params[:has_alpha_version]
|
7
8
|
project_root_folder = params[:project_root_folder]
|
8
9
|
project_name = params[:project_name]
|
9
10
|
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
|
@@ -11,7 +12,8 @@ module Fastlane
|
|
11
12
|
|
12
13
|
Fastlane::Helper::Android::VersionHelper.get_public_version(
|
13
14
|
build_gradle_path: build_gradle_path,
|
14
|
-
version_properties_path: version_properties_path
|
15
|
+
version_properties_path: version_properties_path,
|
16
|
+
has_alpha_version: has_alpha_version
|
15
17
|
)
|
16
18
|
end
|
17
19
|
|
@@ -45,6 +47,7 @@ module Fastlane
|
|
45
47
|
project_root_folder]),
|
46
48
|
Fastlane::Helper::Deprecated.project_root_folder_config_item,
|
47
49
|
Fastlane::Helper::Deprecated.project_name_config_item,
|
50
|
+
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
|
48
51
|
]
|
49
52
|
end
|
50
53
|
|
@@ -4,6 +4,7 @@ module Fastlane
|
|
4
4
|
def self.run(params)
|
5
5
|
require_relative '../../helper/android/android_version_helper'
|
6
6
|
|
7
|
+
has_alpha_version = params[:has_alpha_version]
|
7
8
|
project_root_folder = params[:project_root_folder]
|
8
9
|
project_name = params[:project_name]
|
9
10
|
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
|
@@ -11,7 +12,8 @@ module Fastlane
|
|
11
12
|
|
12
13
|
Fastlane::Helper::Android::VersionHelper.get_release_version(
|
13
14
|
build_gradle_path: build_gradle_path,
|
14
|
-
version_properties_path: version_properties_path
|
15
|
+
version_properties_path: version_properties_path,
|
16
|
+
has_alpha_version: has_alpha_version
|
15
17
|
)
|
16
18
|
end
|
17
19
|
|
@@ -45,6 +47,7 @@ module Fastlane
|
|
45
47
|
project_root_folder]),
|
46
48
|
Fastlane::Helper::Deprecated.project_root_folder_config_item,
|
47
49
|
Fastlane::Helper::Deprecated.project_name_config_item,
|
50
|
+
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
|
48
51
|
]
|
49
52
|
end
|
50
53
|
|
@@ -5,6 +5,7 @@ module Fastlane
|
|
5
5
|
require_relative '../../helper/android/android_version_helper'
|
6
6
|
require_relative '../../helper/android/android_git_helper'
|
7
7
|
|
8
|
+
has_alpha_version = params[:has_alpha_version]
|
8
9
|
project_root_folder = params[:project_root_folder]
|
9
10
|
project_name = params[:project_name]
|
10
11
|
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
|
@@ -12,11 +13,13 @@ module Fastlane
|
|
12
13
|
|
13
14
|
release_ver = Fastlane::Helper::Android::VersionHelper.get_release_version(
|
14
15
|
build_gradle_path: build_gradle_path,
|
15
|
-
version_properties_path: version_properties_path
|
16
|
+
version_properties_path: version_properties_path,
|
17
|
+
has_alpha_version: has_alpha_version
|
16
18
|
)
|
17
19
|
alpha_ver = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
|
18
20
|
build_gradle_path: build_gradle_path,
|
19
|
-
version_properties_path: version_properties_path
|
21
|
+
version_properties_path: version_properties_path,
|
22
|
+
has_alpha_version: has_alpha_version
|
20
23
|
)
|
21
24
|
Fastlane::Helper::GitHelper.create_tag(release_ver[Fastlane::Helper::Android::VersionHelper::VERSION_NAME])
|
22
25
|
Fastlane::Helper::GitHelper.create_tag(alpha_ver[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]) unless alpha_ver.nil? || (params[:tag_alpha] == false)
|
@@ -57,6 +60,7 @@ module Fastlane
|
|
57
60
|
project_root_folder]),
|
58
61
|
Fastlane::Helper::Deprecated.project_root_folder_config_item,
|
59
62
|
Fastlane::Helper::Deprecated.project_name_config_item,
|
63
|
+
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
|
60
64
|
]
|
61
65
|
end
|
62
66
|
|
@@ -30,10 +30,11 @@ module Fastlane
|
|
30
30
|
# - If this version is a hotfix (more than 2 parts and 3rd part is non-zero), returns the "X.Y.Z" formatted string
|
31
31
|
# - Otherwise (not a hotfix / 3rd part of version is 0), returns "X.Y" formatted version number
|
32
32
|
#
|
33
|
-
def self.get_public_version(build_gradle_path:, version_properties_path:)
|
33
|
+
def self.get_public_version(build_gradle_path:, version_properties_path:, has_alpha_version:)
|
34
34
|
version = get_release_version(
|
35
35
|
build_gradle_path: build_gradle_path,
|
36
|
-
version_properties_path: version_properties_path
|
36
|
+
version_properties_path: version_properties_path,
|
37
|
+
has_alpha_version: has_alpha_version
|
37
38
|
)
|
38
39
|
vp = get_version_parts(version[VERSION_NAME])
|
39
40
|
return "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}" unless is_hotfix?(version)
|
@@ -45,10 +46,10 @@ module Fastlane
|
|
45
46
|
#
|
46
47
|
# @return [Hash] A hash with 2 keys "name" and "code" containing the extracted version name and code, respectively
|
47
48
|
#
|
48
|
-
def self.get_release_version(build_gradle_path:, version_properties_path:)
|
49
|
+
def self.get_release_version(build_gradle_path:, version_properties_path:, has_alpha_version:)
|
49
50
|
return get_version_from_properties(version_properties_path: version_properties_path) if File.exist?(version_properties_path)
|
50
51
|
|
51
|
-
section =
|
52
|
+
section = has_alpha_version.nil? ? 'defaultConfig' : 'vanilla {'
|
52
53
|
name = get_version_name_from_gradle_file(build_gradle_path, section)
|
53
54
|
code = get_version_build_from_gradle_file(build_gradle_path, section)
|
54
55
|
return { VERSION_NAME => name, VERSION_CODE => code }
|
@@ -78,10 +79,10 @@ module Fastlane
|
|
78
79
|
# @return [Hash] A hash with 2 keys `"name"` and `"code"` containing the extracted version name and code, respectively,
|
79
80
|
# or `nil` if `$HAS_ALPHA_VERSION` is not defined.
|
80
81
|
#
|
81
|
-
def self.get_alpha_version(build_gradle_path:, version_properties_path:)
|
82
|
+
def self.get_alpha_version(build_gradle_path:, version_properties_path:, has_alpha_version:)
|
82
83
|
return get_version_from_properties(version_properties_path: version_properties_path, is_alpha: true) if File.exist?(version_properties_path)
|
83
84
|
|
84
|
-
return nil if
|
85
|
+
return nil if has_alpha_version.nil?
|
85
86
|
|
86
87
|
section = 'defaultConfig'
|
87
88
|
name = get_version_name_from_gradle_file(build_gradle_path, section)
|
@@ -277,11 +278,12 @@ module Fastlane
|
|
277
278
|
#
|
278
279
|
# @return [String] The next release version name to use after bumping the currently used release version.
|
279
280
|
#
|
280
|
-
def self.bump_version_release(build_gradle_path:, version_properties_path:)
|
281
|
+
def self.bump_version_release(build_gradle_path:, version_properties_path:, has_alpha_version:)
|
281
282
|
# Bump release
|
282
283
|
current_version = self.get_release_version(
|
283
284
|
build_gradle_path: build_gradle_path,
|
284
|
-
version_properties_path: version_properties_path
|
285
|
+
version_properties_path: version_properties_path,
|
286
|
+
has_alpha_version: has_alpha_version
|
285
287
|
)
|
286
288
|
UI.message("Current version: #{current_version[VERSION_NAME]}")
|
287
289
|
new_version = calc_next_release_base_version(current_version)
|
@@ -296,7 +298,7 @@ module Fastlane
|
|
296
298
|
# @param [Hash] new_version_beta The version hash for the beta, containing values for keys "name" and "code"
|
297
299
|
# @param [Hash] new_version_alpha The version hash for the alpha , containing values for keys "name" and "code"
|
298
300
|
#
|
299
|
-
def self.update_versions(new_version_beta, new_version_alpha, version_properties_path:)
|
301
|
+
def self.update_versions(new_version_beta, new_version_alpha, version_properties_path:, has_alpha_version:)
|
300
302
|
if File.exist?(version_properties_path)
|
301
303
|
replacements = {
|
302
304
|
versionName: (new_version_beta || {})[VERSION_NAME],
|
@@ -312,7 +314,7 @@ module Fastlane
|
|
312
314
|
end
|
313
315
|
File.write(version_properties_path, content)
|
314
316
|
else
|
315
|
-
self.update_version(new_version_beta,
|
317
|
+
self.update_version(new_version_beta, has_alpha_version.nil? ? 'defaultConfig' : 'vanilla {')
|
316
318
|
self.update_version(new_version_alpha, 'defaultConfig') unless new_version_alpha.nil?
|
317
319
|
end
|
318
320
|
end
|
@@ -2,6 +2,26 @@ module Fastlane
|
|
2
2
|
module Helper
|
3
3
|
# A helper class to store deprecated methods and actions
|
4
4
|
class Deprecated
|
5
|
+
# Creates a has_alpha_version Fastlane ConfigItem
|
6
|
+
#
|
7
|
+
# @return [FastlaneCore::ConfigItem] The Fastlane ConfigItem for the `HAS_ALPHA_VERSION` environment variable
|
8
|
+
#
|
9
|
+
def self.has_alpha_version_config_item
|
10
|
+
verify_block = proc do
|
11
|
+
UI.deprecated('DEPRECATED: The HAS_ALPHA_VERSION environment variable and config item are deprecated and will be removed in a future version of the Release Toolkit.')
|
12
|
+
end
|
13
|
+
|
14
|
+
FastlaneCore::ConfigItem.new(
|
15
|
+
key: :has_alpha_version,
|
16
|
+
env_name: 'HAS_ALPHA_VERSION',
|
17
|
+
description: 'A boolean for whether there is an alpha version of the app or not',
|
18
|
+
deprecated: true,
|
19
|
+
optional: true,
|
20
|
+
verify_block: verify_block,
|
21
|
+
type: Boolean
|
22
|
+
)
|
23
|
+
end
|
24
|
+
|
5
25
|
# Creates a project_root_folder Fastlane ConfigItem
|
6
26
|
#
|
7
27
|
# @return [FastlaneCore::ConfigItem] The Fastlane ConfigItem for the `PROJECT_ROOT_FOLDER` environment variable
|
data/lib/fastlane/plugin/wpmreleasetoolkit/versioning/calculators/abstract_version_calculator.rb
CHANGED
@@ -79,6 +79,16 @@ module Fastlane
|
|
79
79
|
|
80
80
|
new_version
|
81
81
|
end
|
82
|
+
|
83
|
+
# Calculate whether a release is a hotfix release.
|
84
|
+
#
|
85
|
+
# @param [AppVersion] version The version to check.
|
86
|
+
#
|
87
|
+
# @return [Boolean] Whether the release is a hotfix release.
|
88
|
+
#
|
89
|
+
def release_is_hotfix?(version:)
|
90
|
+
version.patch.positive?
|
91
|
+
end
|
82
92
|
end
|
83
93
|
end
|
84
94
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fastlane-plugin-wpmreleasetoolkit
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 9.
|
4
|
+
version: 9.3.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Automattic
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2024-01-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -115,6 +115,9 @@ dependencies:
|
|
115
115
|
- - "~>"
|
116
116
|
- !ruby/object:Gem::Version
|
117
117
|
version: '1.11'
|
118
|
+
- - "<"
|
119
|
+
- !ruby/object:Gem::Version
|
120
|
+
version: '1.16'
|
118
121
|
type: :runtime
|
119
122
|
prerelease: false
|
120
123
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -122,6 +125,9 @@ dependencies:
|
|
122
125
|
- - "~>"
|
123
126
|
- !ruby/object:Gem::Version
|
124
127
|
version: '1.11'
|
128
|
+
- - "<"
|
129
|
+
- !ruby/object:Gem::Version
|
130
|
+
version: '1.16'
|
125
131
|
- !ruby/object:Gem::Dependency
|
126
132
|
name: octokit
|
127
133
|
requirement: !ruby/object:Gem::Requirement
|