Skip to content
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.

Sign up for GitHub

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

Remove deprecated options #550

Merged
merged 5 commits into from
Feb 28, 2024
Merged

Remove deprecated options #550

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
52ff87c
Remove `has_alpha_version`
spencertransier Feb 28, 2024
3204eb4
Remove `project_name` and `project_root_folder` options
spencertransier Feb 28, 2024
1b5fee7
Update CHANGELOG.md and MIGRATION.md for `project_name` and `project_…
spencertransier Feb 28, 2024
8004cae
Merge branch 'trunk' into remove/deprecated-code
spencertransier Feb 28, 2024
a829be5
Apply suggestions from code review
AliSoftware Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
- Removed the old `setbranchprotection` and `removebranchprotection` backwards-compatiblity stubs for the now-renamed `set_branch_protection` and `remove_branch_protection` actions. [#549]
- Renamed `setfrozentag` action to `set_milestone_frozen_marker`. [#548]
- Removed the `ios_clear_intermediate_tags` action, which has been deprecated for a while. [#549]
- Removed the `has_alpha_version` option from several actions and helper methods. It has already been deprecated for many versions. [#550]
- Removed the `project_name` and `project_root_folder` options from several actions. [#550]
- Renamed `update_pull_requests_milestone` to `update_assigned_milestone` and make it handle GitHub issues as well as PRs. [#547]

### New Features
Expand Down
2 changes: 2 additions & 0 deletions MIGRATION.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
- Action `removebranchprotection` has been renamed `remove_branch_protection`.
- Action `setfrozentag` has been renamed `set_milestone_frozen_marker`.
- Actions `ios_clear_intermediate_tags` and `ios_final_tag` have been removed, as they have been deprecated for a while.
- Option `has_alpha_version` has been removed after being deprecated for a while.
- Options `project_name` and `project_root_folder` have been removed from several actions. Explicit paths should be passed instead.
- Action `update_pull_requests_milestone` has been renamed `update_assigned_milestone` and its `pr_numbers` and `pr_comment` parameters renamed to just `numbers` and `comment`; the action now acts on Issues and not just PRs anymore.

## From `8.0.0` to `9.0.0`
Expand Down
33 changes: 9 additions & 24 deletions lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_betabuild_prechecks.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ def self.run(params)
require_relative '../../helper/android/android_version_helper'
require_relative '../../helper/android/android_git_helper'

has_alpha_version = params[:has_alpha_version]
project_root_folder = params[:project_root_folder]
project_name = params[:project_name]
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
build_gradle_path = params[:build_gradle_path]
version_properties_path = params[:version_properties_path]

# Checkout default branch and update
default_branch = params[:default_branch]
Expand All @@ -21,22 +18,19 @@ def self.run(params)
# Check versions
release_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
build_gradle_path: build_gradle_path,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
message = "The following current version has been detected: #{release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n"
alpha_release_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
build_gradle_path: build_gradle_path,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
message << "The following Alpha version has been detected: #{alpha_release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n" unless alpha_release_version.nil?

# Check branch
app_version = Fastlane::Helper::Android::VersionHelper.get_public_version(
build_gradle_path: build_gradle_path,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
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)

Expand Down Expand Up @@ -70,14 +64,12 @@ def self.get_user_build_version(version:, message:)
UI.user_error!("Release branch for version #{version} doesn't exist. Abort.") unless Fastlane::Helper::GitHelper.checkout_and_pull(release: version)
release_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
build_gradle_path: build_gradle_path,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
message << "Looking at branch release/#{version} as requested by user. Detected version: #{release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}.\n"
alpha_release_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
build_gradle_path: build_gradle_path,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
message << "and Alpha Version: #{alpha_release_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]}\n" unless alpha_release_version.nil?
[release_version, alpha_release_version]
Expand Down Expand Up @@ -116,19 +108,12 @@ def self.available_options
description: 'Path to the build.gradle file',
type: String,
optional: true,
conflicting_options: %i[project_name
project_root_folder
version_properties_path]),
conflicting_options: [:version_properties_path]),
FastlaneCore::ConfigItem.new(key: :version_properties_path,
description: 'Path to the version.properties file',
type: String,
optional: true,
conflicting_options: %i[build_gradle_path
project_name
project_root_folder]),
Fastlane::Helper::Deprecated.project_root_folder_config_item,
Fastlane::Helper::Deprecated.project_name_config_item,
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
conflicting_options: [:build_gradle_path]),
]
end

Expand Down
24 changes: 6 additions & 18 deletions lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_build_prechecks.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,20 @@ def self.run(params)
# Verify that the current branch is a release branch. Notice that `ensure_git_branch` expects a RegEx parameter
ensure_git_branch(branch: '^release/') unless other_action.is_ci

has_alpha_version = params[:has_alpha_version]
project_root_folder = params[:project_root_folder]
project_name = params[:project_name]
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
build_gradle_path = params[:build_gradle_path]
version_properties_path = params[:version_properties_path]

message = ''
unless !params[:beta] && !params[:final]
beta_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
build_gradle_path: build_gradle_path,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
end
if params[:alpha]
alpha_version = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
build_gradle_path: build_gradle_path,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
end

Expand Down Expand Up @@ -86,19 +81,12 @@ def self.available_options
description: 'Path to the build.gradle file',
type: String,
optional: true,
conflicting_options: %i[project_name
project_root_folder
version_properties_path]),
conflicting_options: [:version_properties_path]),
FastlaneCore::ConfigItem.new(key: :version_properties_path,
description: 'Path to the version.properties file',
type: String,
optional: true,
conflicting_options: %i[build_gradle_path
project_name
project_root_folder]),
Fastlane::Helper::Deprecated.project_root_folder_config_item,
Fastlane::Helper::Deprecated.project_name_config_item,
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
conflicting_options: [:build_gradle_path]),
]
end

Expand Down
27 changes: 7 additions & 20 deletions lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_beta.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,16 @@ def self.run(params)
# Verify that the current branch is a release branch. Notice that `ensure_git_branch` expects a RegEx parameter
ensure_git_branch(branch: '^release/')

has_alpha_version = params[:has_alpha_version]
project_root_folder = params[:project_root_folder]
project_name = params[:project_name]
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
build_gradle_path = params[:build_gradle_path]
version_properties_path = params[:version_properties_path]

current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
build_gradle_path: build_gradle_path,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
build_gradle_path: build_gradle_path,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
new_version_beta = Fastlane::Helper::Android::VersionHelper.calc_next_beta_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)
Expand All @@ -40,8 +35,7 @@ def self.run(params)
Fastlane::Helper::Android::VersionHelper.update_versions(
new_version_beta,
new_version_alpha,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
UI.message 'Done!'

Expand Down Expand Up @@ -69,19 +63,12 @@ def self.available_options
description: 'Path to the build.gradle file',
type: String,
optional: true,
conflicting_options: %i[project_name
project_root_folder
version_properties_path]),
conflicting_options: [:version_properties_path]),
FastlaneCore::ConfigItem.new(key: :version_properties_path,
description: 'Path to the version.properties file',
type: String,
optional: true,
conflicting_options: %i[build_gradle_path
project_name
project_root_folder]),
Fastlane::Helper::Deprecated.project_root_folder_config_item,
Fastlane::Helper::Deprecated.project_name_config_item,
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
conflicting_options: [:build_gradle_path]),
]
end

Expand Down
27 changes: 7 additions & 20 deletions lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_final_release.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,16 @@ def self.run(params)
# Verify that the current branch is a release branch. Notice that `ensure_git_branch` expects a RegEx parameter
ensure_git_branch(branch: '^release/')

has_alpha_version = params[:has_alpha_version]
project_root_folder = params[:project_root_folder]
project_name = params[:project_name]
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
build_gradle_path = params[:build_gradle_path]
version_properties_path = params[:version_properties_path]

current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
build_gradle_path: build_gradle_path,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
current_version_alpha = Fastlane::Helper::Android::VersionHelper.get_alpha_version(
build_gradle_path: build_gradle_path,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
final_version = Fastlane::Helper::Android::VersionHelper.calc_final_release_version(current_version, current_version_alpha)

Expand All @@ -38,8 +33,7 @@ def self.run(params)
Fastlane::Helper::Android::VersionHelper.update_versions(
final_version,
current_version_alpha,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
UI.message 'Done!'

Expand Down Expand Up @@ -67,19 +61,12 @@ def self.available_options
description: 'Path to the build.gradle file',
type: String,
optional: true,
conflicting_options: %i[project_name
project_root_folder
version_properties_path]),
conflicting_options: [:version_properties_path]),
FastlaneCore::ConfigItem.new(key: :version_properties_path,
description: 'Path to the version.properties file',
type: String,
optional: true,
conflicting_options: %i[build_gradle_path
project_name
project_root_folder]),
Fastlane::Helper::Deprecated.project_root_folder_config_item,
Fastlane::Helper::Deprecated.project_name_config_item,
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
conflicting_options: [:build_gradle_path]),
]
end

Expand Down
24 changes: 6 additions & 18 deletions lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_hotfix.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,14 @@ def self.run(params)

require_relative '../../helper/android/android_git_helper'

has_alpha_version = params[:has_alpha_version]
project_root_folder = params[:project_root_folder]
project_name = params[:project_name]
build_gradle_path = params[:build_gradle_path] || (File.join(project_root_folder || '.', project_name, 'build.gradle') unless project_name.nil?)
version_properties_path = params[:version_properties_path] || File.join(project_root_folder || '.', 'version.properties')
build_gradle_path = params[:build_gradle_path]
version_properties_path = params[:version_properties_path]

Fastlane::Helper::GitHelper.create_branch("release/#{params[:version_name]}", from: params[:previous_version_name])

current_version = Fastlane::Helper::Android::VersionHelper.get_release_version(
build_gradle_path: build_gradle_path,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
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)
new_release_branch = "release/#{params[:version_name]}"
Expand All @@ -32,8 +28,7 @@ def self.run(params)
Fastlane::Helper::Android::VersionHelper.update_versions(
new_version,
nil,
version_properties_path: version_properties_path,
has_alpha_version: has_alpha_version
version_properties_path: version_properties_path
)
UI.message 'Done!'

Expand Down Expand Up @@ -75,19 +70,12 @@ def self.available_options
description: 'Path to the build.gradle file',
type: String,
optional: true,
conflicting_options: %i[project_name
project_root_folder
version_properties_path]),
conflicting_options: [:version_properties_path]),
FastlaneCore::ConfigItem.new(key: :version_properties_path,
description: 'Path to the version.properties file',
type: String,
optional: true,
conflicting_options: %i[build_gradle_path
project_name
project_root_folder]),
Fastlane::Helper::Deprecated.project_root_folder_config_item,
Fastlane::Helper::Deprecated.project_name_config_item,
Fastlane::Helper::Deprecated.has_alpha_version_config_item,
conflicting_options: [:build_gradle_path]),
]
end

Expand Down
Loading