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

Cleanup appraisal groups #3160

Merged
merged 7 commits into from
Sep 27, 2023
Merged

Cleanup appraisal groups #3160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
227093a
Remove obsolete defintion from contrib
TonyCTHsu Sep 26, 2023
ea6cda0
Cleanup qless conditions
TonyCTHsu Sep 26, 2023
5ddc87a
Add rack-test for contrib
TonyCTHsu Sep 26, 2023
c0927c0
Update rack in contrib
TonyCTHsu Sep 26, 2023
42e0cb4
Upgrade activerecord for relational_db group
TonyCTHsu Sep 26, 2023
398d80b
Cleanup comments
TonyCTHsu Sep 26, 2023
c15be8a
Add platform to lockfile
TonyCTHsu Sep 26, 2023
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
18 changes: 6 additions & 12 deletions appraisal/jruby-9.2.21.0.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
appraise 'hanami-1' do
gem 'rack'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'hanami', '~> 1'
end

Expand Down Expand Up @@ -222,9 +222,7 @@
gem 'graphql', '>= 2.0'
gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
gem 'rack'
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'resque'
gem 'roda', '>= 2.0.0'
Expand All @@ -240,14 +238,14 @@
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end

appraise 'opentracing' do
Expand All @@ -267,12 +265,8 @@
gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x
gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0

if RUBY_PLATFORM == 'java'
gem 'qless', '0.10.0' # Newer releases require `rusage`, which is not available for JRuby
gem 'redis', '< 4' # Missing redis version cap for `qless`
else
gem 'qless', '0.12.0'
end
gem 'qless', '0.10.0' # Newer releases require `rusage`, which is not available for JRuby
gem 'redis', '< 4' # Missing redis version cap for `qless`
end

appraise 'core-old' do
Expand Down
26 changes: 10 additions & 16 deletions appraisal/jruby-9.3.9.0.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
appraise 'hanami-1' do
gem 'rack'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'hanami', '~> 1'
end

Expand Down Expand Up @@ -28,7 +28,7 @@
appraise 'rails5-postgres-redis' do
gem 'rails', '~> 5.2.1'
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'redis', '~> 4' # TODO: Support redis 5.x
gem 'redis', '~> 4'
gem 'sprockets', '< 4'
gem 'lograge', '~> 0.11'
end
Expand Down Expand Up @@ -76,7 +76,7 @@
appraise 'rails6-postgres-redis' do
gem 'rails', '~> 6.0.0'
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'redis', '~> 4' # TODO: Support redis 5.x
gem 'redis', '~> 4'
gem 'sprockets', '< 4'
gem 'lograge', '~> 0.11'
end
Expand Down Expand Up @@ -117,7 +117,7 @@
appraise 'rails61-postgres-redis' do
gem 'rails', '~> 6.1.0'
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'redis', '~> 4' # TODO: Support redis 5.x
gem 'redis', '~> 4'
gem 'sprockets', '< 4'
gem 'lograge', '~> 0.11'
end
Expand Down Expand Up @@ -193,11 +193,9 @@
gem 'dalli', '>= 3.0.0'
gem 'graphql', '>= 2.0'
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
gem 'rack'
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'redis', '~> 4' # TODO: Support redis 5.x
gem 'redis', '~> 4'
gem 'resque'
gem 'roda', '>= 2.0.0'
gem 'semantic_logger', '~> 4.0'
Expand All @@ -211,14 +209,14 @@
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end

appraise 'sinatra' do
gem 'sinatra', '>= 3'
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end

appraise 'opentracing' do
Expand All @@ -238,12 +236,8 @@
gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x
gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0

if RUBY_PLATFORM == 'java'
gem 'qless', '0.10.0' # Newer releases require `rusage`, which is not available for JRuby
gem 'redis', '< 4' # Missing redis version cap for `qless`
else
gem 'qless', '0.12.0'
end
gem 'qless', '0.10.0' # Newer releases require `rusage`, which is not available for JRuby
gem 'redis', '< 4' # Missing redis version cap for `qless`
end

appraise 'core-old' do
Expand Down
19 changes: 6 additions & 13 deletions appraisal/jruby-9.4.0.0.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
appraise 'rails61-postgres-redis' do
gem 'rails', '~> 6.1.0'
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'redis', '~> 4' # TODO: Support redis 5.x
gem 'redis', '~> 4'
gem 'sprockets', '< 4'
gem 'lograge', '~> 0.11'
gem 'net-smtp'
Expand Down Expand Up @@ -99,9 +99,7 @@
gem 'dalli', '>= 3.0.0'
gem 'graphql', '>= 2.0'
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
gem 'rack'
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'resque'
gem 'roda', '>= 2.0.0'
Expand All @@ -110,7 +108,6 @@
gem 'sneakers', '>= 2.12.0'
gem 'sucker_punch'
gem 'que', '>= 1.0.0'
gem 'net-smtp'
end

[3, 4, 5].each do |n|
Expand All @@ -123,14 +120,14 @@
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end

appraise 'sinatra' do
gem 'sinatra', '>= 3'
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end

appraise 'opentracing' do
Expand All @@ -143,12 +140,8 @@
gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x
gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0

if RUBY_PLATFORM == 'java'
gem 'qless', '0.10.0' # Newer releases require `rusage`, which is not available for JRuby
gem 'redis', '< 4' # Missing redis version cap for `qless`
else
gem 'qless', '0.12.0'
end
gem 'qless', '0.10.0' # Newer releases require `rusage`, which is not available for JRuby
gem 'redis', '< 4' # Missing redis version cap for `qless`
end

appraise 'core-old' do
Expand Down
9 changes: 3 additions & 6 deletions appraisal/ruby-2.1.10.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,7 @@
gem 'dalli', '< 3.0.0' # Dalli 3.0 dropped support for Ruby < 2.5
gem 'presto-client', '>= 0.5.14'
gem 'mongo', '< 2.5'
gem 'rack', '1.4.7'
gem 'rack-contrib'
gem 'rack-cache', '1.7.1'
gem 'rack-test', '0.7.0'
gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '< 12.3'
gem 'resque', '< 2.0'
gem 'roda', '>= 2.0.0'
Expand All @@ -118,14 +115,14 @@
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end

appraise 'opentracing' do
Expand Down
10 changes: 4 additions & 6 deletions appraisal/ruby-2.2.10.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
end

appraise 'relational_db' do
gem 'activerecord', '< 5.1.5'
gem 'activerecord', '~> 5'
gem 'delayed_job'
gem 'delayed_job_active_record'
gem 'makara', '< 0.5.0' # >= 0.5.0 contain Ruby 2.3+ syntax
Expand Down Expand Up @@ -174,9 +174,7 @@
gem 'grpc', '~> 1.19.0' # Last version to support Ruby < 2.3 & google-protobuf < 3.7
gem 'mongo', '>= 2.8.0'
gem 'presto-client', '>= 0.5.14'
gem 'rack', '< 2.1.0' # Locked due to grape incompatibility: https://github.com/ruby-grape/grape/issues/1980
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'redis', '~> 3'
gem 'resque', '< 2.0'
Expand All @@ -192,14 +190,14 @@
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end

appraise 'opentracing' do
Expand Down
12 changes: 5 additions & 7 deletions appraisal/ruby-2.3.8.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
appraise 'hanami-1' do
gem 'rack'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'hanami', '~> 1'
end

Expand Down Expand Up @@ -151,7 +151,7 @@
end

appraise 'relational_db' do
gem 'activerecord', '< 5.1.5'
gem 'activerecord', '~> 5'
gem 'delayed_job'
gem 'delayed_job_active_record'
gem 'makara'
Expand Down Expand Up @@ -183,9 +183,7 @@
gem 'grpc'
gem 'google-protobuf', '~> 3.11.0' # Last version to support Ruby < 2.5
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
gem 'rack', '< 2.1.0' # Locked due to grape incompatibility: https://github.com/ruby-grape/grape/issues/1980
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'resque'
gem 'roda', '>= 2.0.0'
Expand All @@ -200,15 +198,15 @@
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end

appraise 'sinatra' do
gem 'sinatra', '< 3.0'
gem 'mustermann', '< 3.0'
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end

appraise 'opentracing' do
Expand Down
12 changes: 5 additions & 7 deletions appraisal/ruby-2.4.10.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
appraise 'hanami-1' do
gem 'rack'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'hanami', '~> 1'
end

Expand Down Expand Up @@ -79,7 +79,7 @@
end

appraise 'relational_db' do
gem 'activerecord', '< 5.1.5'
gem 'activerecord', '~> 5'
gem 'delayed_job'
gem 'delayed_job_active_record'
gem 'makara'
Expand Down Expand Up @@ -110,9 +110,7 @@
gem 'grpc'
gem 'google-protobuf', '~> 3.11.0' # Last version to support Ruby < 2.5
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
gem 'rack'
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'resque'
gem 'roda', '>= 2.0.0'
Expand All @@ -134,14 +132,14 @@
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end

appraise 'opentracing' do
Expand Down
18 changes: 5 additions & 13 deletions appraisal/ruby-2.5.9.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
appraise 'hanami-1' do
gem 'rack'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'hanami', '~> 1'
end

Expand Down Expand Up @@ -197,9 +197,7 @@
gem 'graphql', '>= 2.0'
gem 'grpc', platform: :ruby
gem 'mongo', '>= 2.8.0', '< 2.15.0' # TODO: FIX TEST BREAKAGES ON >= 2.15 https://github.com/DataDog/dd-trace-rb/issues/1596
gem 'rack'
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
gem 'rake', '>= 12.3'
gem 'resque'
gem 'roda', '>= 2.0.0'
Expand All @@ -215,14 +213,14 @@
appraise "rack-#{n}" do
gem 'rack', "~> #{n}"
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-contrib'
gem 'rack-test'
gem 'rack-test' # Dev dependencies for testing rack-based code
end

appraise 'opentracing' do
Expand All @@ -241,13 +239,7 @@
gem 'faraday', '0.17'
gem 'graphql', '~> 1.12.0', '< 2.0' # TODO: Support graphql 1.13.x
gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0

if RUBY_PLATFORM == 'java'
gem 'qless', '0.10.0' # Newer releases require `rusage`, which is not available for JRuby
gem 'redis', '< 4' # Missing redis version cap for `qless`
else
gem 'qless', '0.12.0'
end
gem 'qless', '0.12.0'
end

appraise 'core-old' do
Expand Down
Loading
Loading