Skip to content

Commit

Permalink
Merge pull request #1679 from DataDog/ivoanjo/pin-sorbet-version
Browse files Browse the repository at this point in the history
  • Loading branch information
marcotc committed Sep 13, 2021
2 parents a1c5812 + 4f0210a commit 9d86b38
Show file tree
Hide file tree
Showing 423 changed files with 12,439 additions and 13,938 deletions.
12 changes: 6 additions & 6 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ elsif ruby_version?('2.3')
gem 'httpclient'
gem 'lograge', '~> 0.11'
gem 'makara'
gem 'mongo', '>= 2.8.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 'mysql2', '< 0.5'
gem 'pg'
gem 'presto-client', '>= 0.5.14'
Expand Down Expand Up @@ -621,7 +621,7 @@ elsif ruby_version?('2.4')
gem 'httpclient'
gem 'lograge', '~> 0.11'
gem 'makara'
gem 'mongo', '>= 2.8.0', '!= 2.15.0' # TODO: FIX TEST BREAKAGES ON 2.15.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 'mysql2', '< 0.5'
gem 'pg'
gem 'presto-client', '>= 0.5.14'
Expand Down Expand Up @@ -857,7 +857,7 @@ elsif ruby_version?('2.5')
gem 'lograge', '~> 0.11'
gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
gem 'makara'
gem 'mongo', '>= 2.8.0', '!= 2.15.0' # TODO: FIX TEST BREAKAGES ON 2.15.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 'mysql2', '< 1', platform: :ruby
gem 'activerecord-jdbcmysql-adapter', '>= 60.2', platform: :jruby
gem 'pg', platform: :ruby
Expand Down Expand Up @@ -1062,7 +1062,7 @@ elsif ruby_version?('2.6')
gem 'httpclient'
gem 'lograge', '~> 0.11'
gem 'makara'
gem 'mongo', '>= 2.8.0', '!= 2.15.0' # TODO: FIX TEST BREAKAGES ON 2.15.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 'mysql2', '< 1', platform: :ruby
gem 'pg', platform: :ruby
gem 'presto-client', '>= 0.5.14'
Expand Down Expand Up @@ -1264,7 +1264,7 @@ elsif ruby_version?('2.7')
gem 'httpclient'
gem 'lograge', '~> 0.11'
gem 'makara'
gem 'mongo', '>= 2.8.0', '!= 2.15.0' # TODO: FIX TEST BREAKAGES ON 2.15.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 'mysql2', '< 1', platform: :ruby
gem 'pg', platform: :ruby
gem 'presto-client', '>= 0.5.14'
Expand Down Expand Up @@ -1372,7 +1372,7 @@ elsif ruby_version?('3.0')
gem 'httpclient'
# gem 'lograge', '~> 0.11' # creates conflict with qless dependancy on thor ~0.19.1
gem 'makara', '>= 0.6.0.pre' # Ruby 3 requires >= 0.6.0, which is currently in pre-release: https://rubygems.org/gems/makara/versions
gem 'mongo', '>= 2.8.0', '!= 2.15.0' # TODO: FIX TEST BREAKAGES ON 2.15.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 'mysql2', '>= 0.5.3', platform: :ruby
gem 'pg', '>= 1.1', platform: :ruby
gem 'presto-client', '>= 0.5.14'
Expand Down
5 changes: 4 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,8 @@ gem 'opentracing', '>= 0.4.1'
gem 'google-protobuf', ['~> 3.0', '!= 3.7.0', '!= 3.7.1'] if RUBY_PLATFORM != 'java'

# For type checking
gem 'sorbet', '>= 0.5.6513', '< 0.6' if RUBY_VERSION >= '2.3.0'
# Sorbet releases almost daily, with new checks introduced that can make a
# previously-passing codebase start failing. Thus, we need to lock to a specific
# version and bump it from time to time.
gem 'sorbet', '= 0.5.9120' if RUBY_VERSION >= '2.3.0'
gem 'spoom', '~> 1.1' if RUBY_VERSION >= '2.4.0'
1 change: 1 addition & 0 deletions benchmarks/dogstatsd_reporter.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# typed: false
require 'ddtrace'
require 'datadog/statsd'
require 'benchmark/ips'
Expand Down
7 changes: 2 additions & 5 deletions gemfiles/jruby_9.2.0.0_contrib.gemfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9d86b38

Please sign in to comment.