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.

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

feat: bump mini Ruby version to 3.1 by following core #1051

Merged
merged 3 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion .github/workflows/functional-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2
ruby-version: 3.3
- run: |
bundle install
rake ios
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [3.0, 3.1, 3.2, 3.3]
ruby: [3.1, 3.2, 3.3]

runs-on: ubuntu-latest

Expand Down
80 changes: 79 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AllCops:
TargetRubyVersion: 3.0
TargetRubyVersion: 3.1
Metrics/LineLength:
Max: 128
Metrics/MethodLength:
Expand Down Expand Up @@ -219,3 +219,81 @@ Style/OpenStructUse: # new in 1.23
Enabled: false
Lint/RedundantStringCoercion:
Enabled: false
Gemspec/AddRuntimeDependency: # new in 1.65
Enabled: true
Lint/ConstantReassignment: # new in 1.70
Enabled: true
Lint/DuplicateMatchPattern: # new in 1.50
Enabled: true
Lint/DuplicateSetElement: # new in 1.67
Enabled: true
Lint/HashNewWithKeywordArgumentsAsDefault: # new in 1.69
Enabled: true
Lint/ItWithoutArgumentsInBlock: # new in 1.59
Enabled: true
Lint/LiteralAssignmentInCondition: # new in 1.58
Enabled: true
Lint/MixedCaseRange: # new in 1.53
Enabled: true
Lint/NumericOperationWithConstantResult: # new in 1.69
Enabled: true
Lint/RedundantRegexpQuantifiers: # new in 1.53
Enabled: true
Lint/SharedMutableDefault: # new in 1.70
Enabled: true
Lint/UnescapedBracketInRegexp: # new in 1.68
Enabled: true
Lint/UselessDefined: # new in 1.69
Enabled: true
Lint/UselessNumericOperation: # new in 1.66
Enabled: true
Style/AmbiguousEndlessMethodDefinition: # new in 1.68
Enabled: true
Style/BitwisePredicate: # new in 1.68
Enabled: true
Style/CombinableDefined: # new in 1.68
Enabled: true
Style/DataInheritance: # new in 1.49
Enabled: true
Style/DigChain: # new in 1.69
Enabled: true
Style/ExactRegexpMatch: # new in 1.51
Enabled: true
Style/FileNull: # new in 1.69
Enabled: true
Style/FileTouch: # new in 1.69
Enabled: true
Style/ItAssignment: # new in 1.70
Enabled: true
Style/KeywordArgumentsMerging: # new in 1.68
Enabled: true
Style/MapIntoArray: # new in 1.63
Enabled: true
Style/RedundantArrayConstructor: # new in 1.52
Enabled: true
Style/RedundantCurrentDirectoryInPath: # new in 1.53
Enabled: true
Style/RedundantFilterChain: # new in 1.52
Enabled: true
Style/RedundantInterpolationUnfreeze: # new in 1.66
Enabled: true
Style/RedundantLineContinuation: # new in 1.49
Enabled: true
Style/RedundantRegexpArgument: # new in 1.53
Enabled: true
Style/RedundantRegexpConstructor: # new in 1.52
Enabled: true
Style/ReturnNilInPredicateMethodDefinition: # new in 1.53
Enabled: true
Style/SafeNavigationChainLength: # new in 1.68
Enabled: false
Style/SendWithLiteralMethodName: # new in 1.64
Enabled: true
Style/SingleLineDoEndBlock: # new in 1.57
Enabled: true
Style/SuperArguments: # new in 1.64
Enabled: true
Style/SuperWithArgsParentheses: # new in 1.58
Enabled: true
Style/YAMLFileRead: # new in 1.53
Enabled: true
10 changes: 10 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,13 @@

source 'https://rubygems.org'
gemspec

gem 'appium_thor', '~> 2.0'
gem 'fakefs', '~> 2.8.0'
gem 'hashdiff', '~> 1.1.0'
gem 'minitest', '~> 5.0'
gem 'minitest-reporters', '~> 1.1'
gem 'pry'
gem 'rake', '~> 13.0'
gem 'rubocop', '1.70.0'
gem 'yard', '~> 0.9.11'
3 changes: 2 additions & 1 deletion android_tests/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
# limitations under the License.

source 'https://rubygems.org'
gemspec path: File.expand_path('..', __dir__) # __dir__ fails on 1.9
gemspec path: File.expand_path('..', __dir__)
eval_gemfile File.join(File.expand_path('..', __dir__), 'Gemfile')
18 changes: 4 additions & 14 deletions appium_lib.gemspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require_relative 'lib/appium_lib/version'

Gem::Specification.new do |s|
s.required_ruby_version = '>= 3.0'
s.required_ruby_version = '>= 3.1'

s.name = 'appium_lib'
s.version = Appium::VERSION
Expand All @@ -13,19 +13,9 @@ Gem::Specification.new do |s|
s.homepage = 'https://github.com/appium/ruby_lib' # published as appium_lib
s.require_paths = ['lib']

s.add_runtime_dependency 'appium_lib_core', '~> 9.2', '>= 9.2.1'
s.add_runtime_dependency 'nokogiri', '~> 1.8', '>= 1.8.1'
s.add_runtime_dependency 'tomlrb', '>= 1.1', '< 3.0'

s.add_development_dependency 'appium_thor', '~> 2.0'
s.add_development_dependency 'fakefs', '~> 2.8.0'
s.add_development_dependency 'hashdiff', '~> 1.1.0'
s.add_development_dependency 'minitest', '~> 5.0'
s.add_development_dependency 'minitest-reporters', '~> 1.1'
s.add_development_dependency 'pry'
s.add_development_dependency 'rake', '~> 13.0'
s.add_development_dependency 'rubocop', '1.70.0'
s.add_development_dependency 'yard', '~> 0.9.11'
s.add_dependency 'appium_lib_core', '~> 9.2', '>= 9.2.1'
s.add_dependency 'nokogiri', '~> 1.8', '>= 1.8.1'
s.add_dependency 'tomlrb', '>= 1.1', '< 3.0'

s.files = `git ls-files`.split("\n").reject { |v| v.match(/\A^(ios_tests|android_tests|grid|test_apps)\/.+/) }
s.metadata['rubygems_mfa_required'] = 'true'
Expand Down
1 change: 1 addition & 0 deletions ios_tests/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

source 'https://rubygems.org'
gemspec path: File.expand_path('..', __dir__)
eval_gemfile File.join(File.expand_path('..', __dir__), 'Gemfile')

gem 'appium_console'
gem 'parallel_tests'
2 changes: 1 addition & 1 deletion ios_tests/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ task :run_parallel_t do
require_relative 'parallel/test'

threads = []
[Device.one, Device.two].each do |capability|
[Device.one, Device.two].map do |capability|
threads << Thread.new do
TestParallelRunThread.new(capability).test_run
end
Expand Down
Loading