Skip to content

Commit

Permalink
[Ruby] Ruby 2.6 is now the minimum (dropping Ruby 2.5) (#20413)
Browse files Browse the repository at this point in the history
* [Ruby] Ruby 2.6 is now the minimum (dropping Ruby 2.5)

* Update CircleCI to use Ruby 2.6 and drop Ruby 2.5 job

* Install python on validate_docs Ruby 2.6 image

* Maybe use fastlanetools docker image
  • Loading branch information
joshdholtz committed Jun 25, 2022
1 parent f761923 commit 6863892
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
10 changes: 3 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,6 @@ workflows:
version: 2
build:
jobs:
- tests_macos:
name: 'Execute tests on macOS (Xcode 11.7.0, Ruby 2.5)'
xcode_version: '11.7.0'
ruby_version: '2.5'
- tests_macos:
name: 'Execute tests on macOS (Xcode 11.7.0, Ruby 2.6)'
xcode_version: '11.7.0'
Expand Down Expand Up @@ -286,10 +282,10 @@ workflows:
ruby_version: '2.7'
- validate_documentation:
name: 'Validate Documentation'
ruby_version: 'circleci/ruby:2.5'
ruby_version: 'fastlanetools/ci:0.3.0'
- lint_source_code:
name: 'Lint source code'
ruby_version: 'circleci/ruby:2.5'
ruby_version: 'circleci/ruby:2.6'
- modules_load_up_tests:
name: 'Modules load up tests'
ruby_version: 'circleci/ruby:2.5'
ruby_version: 'circleci/ruby:2.6'
8 changes: 7 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require:
- ./rubocop/is_string_usage.rb

AllCops:
TargetRubyVersion: 2.5
TargetRubyVersion: 2.6
NewCops: enable
Include:
- '**/*.rb'
Expand All @@ -24,6 +24,12 @@ AllCops:
- '**/spec/fixtures/broken_files/broken_file.rb'
- '**/*.provisionprofile'

Lint/ErbNewArguments:
Enabled: false

Style/SlicingWithRange:
Enabled: false

Style/MultipleComparison:
Enabled: false

Expand Down
2 changes: 1 addition & 1 deletion fastlane.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Gem::Specification.new do |spec|
"source_code_uri" => "https://github.com/fastlane/fastlane"
}

spec.required_ruby_version = '>= 2.5'
spec.required_ruby_version = '>= 2.6'

spec.files = Dir.glob("*/lib/**/*", File::FNM_DOTMATCH) + Dir["fastlane/swift/**/*"] + Dir["bin/*"] + Dir["*/README.md"] + %w(README.md LICENSE .yardopts) - Dir["fastlane/lib/fastlane/actions/device_grid/assets/*"] - Dir["fastlane/lib/fastlane/actions/docs/assets/*"]
spec.bindir = "bin"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ['lib']

spec.required_ruby_version = '>= 2.5'
spec.required_ruby_version = '>= 2.6'

# Don't add a dependency to fastlane or fastlane_re
# since this would cause a circular dependency
Expand Down

0 comments on commit 6863892

Please sign in to comment.