-
Notifications
You must be signed in to change notification settings - Fork 9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Jetpack App: Update release toolkit to support Jetpack #258
Changes from 44 commits
0a111bc
5fceded
15dd87e
c88cc24
1cc4399
31d91fb
697bcf6
679b33b
9f991bb
67e007b
fb99670
89194c3
4135aa9
b95e5e2
e587c66
17788b0
508ee83
3129d01
fd19dca
d1e095e
6f1da0f
13a61ad
ba2adf6
3c13d35
b58fb59
47988cd
973ddae
795210a
842dec0
458f202
04c674b
d10336d
a6856be
f638e5f
4b2bd1b
f67123c
3550353
5c3c6d8
74e0bc9
66c6a7b
b5465bf
97b8b03
b93165f
10c27c6
b1f5d1e
cb939d6
72efa63
e2edf26
c10f33f
3987111
fb76ece
2e3a8e2
bf14099
1e7c77a
841e8da
3496330
354de4e
b58fc23
b695e16
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -8,11 +8,20 @@ def self.run(params) | |||||
require_relative '../../helper/android/android_version_helper' | ||||||
|
||||||
Fastlane::Helper::GitHelper.ensure_on_branch!('release') | ||||||
create_config() | ||||||
show_config() | ||||||
app = ENV['PROJECT_NAME'].nil? ? params[:app] : ENV['PROJECT_NAME'] | ||||||
|
||||||
UI.message 'Updating gradle.properties...' | ||||||
Fastlane::Helper::Android::VersionHelper.update_versions(@final_version, @current_version_alpha) | ||||||
current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(app) | ||||||
current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(app) | ||||||
final_version = Fastlane::Helper::Android::VersionHelper.calc_final_release_version(current_version, current_version_alpha) | ||||||
|
||||||
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 release version[#{app}]: #{final_version[vname]}(#{final_version[vcode]})") | ||||||
|
||||||
UI.message 'Updating version.properties...' | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To be fair it only updates There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 😅 |
||||||
Fastlane::Helper::Android::VersionHelper.update_versions(app, final_version, current_version_alpha) | ||||||
UI.message 'Done!' | ||||||
|
||||||
Fastlane::Helper::Android::GitHelper.commit_version_bump() | ||||||
|
@@ -30,29 +39,23 @@ def self.details | |||||
'Bumps the version of the app for a new beta' | ||||||
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 | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: This is legacy api of
Suggested change
This is not a blocker and can be fixed in a subsequent PR; but could be nice to take the occasion to fix while you're at it; this suggestion applies in every places and actions where you added this of course. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ahhh I think I'd rather tackle it in another PR, opened #278 to track it. |
||||||
] | ||||||
end | ||||||
|
||||||
def self.authors | ||||||
['loremattei'] | ||||||
end | ||||||
|
||||||
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() | ||||||
@final_version = Fastlane::Helper::Android::VersionHelper.calc_final_release_version(@current_version, @current_version_alpha) | ||||||
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 release version: #{@final_version[vname]}(#{@final_version[vcode]})") | ||||||
end | ||||||
end | ||||||
end | ||||||
end |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,11 +6,21 @@ def self.run(params) | |
|
||
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 = ENV['PROJECT_NAME'].nil? ? params[:app] : ENV['PROJECT_NAME'] | ||
|
||
current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(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 version.properties...' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ditto |
||
Fastlane::Helper::Android::VersionHelper.update_versions(app, new_version, current_version_alpha) | ||
UI.message 'Done!' | ||
|
||
Fastlane::Helper::Android::GitHelper.commit_version_bump() | ||
|
@@ -46,6 +56,10 @@ def self.available_options | |
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 @@ def self.authors | |
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💄 small nitpick: