Cleanup development dependencies (#2050)

* Update sentry-rails' development dependencies * Update sentry-sidekiq' development dependencies * Update sentry-ruby' development dependencies * Update sentry-resque's development dependencies * Update sentry-delayed_job's development dependencies * Remove ruby-lsp from top-level Gemfile Because the VS Code extension will not automatically upgrade its version if it's declared in the Gemfile. * Stop locking development rails' version unnecessarily
getsentry · Jun 21, 2023 · ec07eb7 · ec07eb7
1 parent 6196cec
commit ec07eb7
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 32 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,2 @@
 source "https://rubygems.org"
 git_source(:github) { |name| "https://github.com/#{name}.git" }
-
-gem "ruby-lsp", require: false
diff --git a/sentry-delayed_job/Gemfile b/sentry-delayed_job/Gemfile
@@ -3,9 +3,8 @@ git_source(:github) { |name| "https://github.com/#{name}.git" }
 
 # Specify your gem's dependencies in sentry-ruby.gemspec
 gemspec
-
-# TODO: Remove this if https://github.com/jruby/jruby/issues/6547 is addressed
-gem "i18n", "<= 1.8.7"
+gem "sentry-ruby", path: "../sentry-ruby"
+gem "sentry-rails", path: "../sentry-rails"
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
@@ -15,13 +14,18 @@ gem "rexml"
 
 gem "delayed_job"
 gem "delayed_job_active_record"
-gem "rails", "< 7.0"
-gem "activerecord-jdbcmysql-adapter", platform: :jruby
-gem "jdbc-sqlite3", platform: :jruby
+gem "rails"
+
+platform :jruby do
+  gem "activerecord-jdbcmysql-adapter"
+  gem "jdbc-sqlite3"
+end
+
 gem "sqlite3", platform: :ruby
 
-gem "sentry-ruby", path: "../sentry-ruby"
-gem "sentry-rails", path: "../sentry-rails"
+if RUBY_VERSION.to_f >= 2.6
+  gem "debug", github: "ruby/debug", platform: :ruby
+  gem "irb"
+end
 
 gem "pry"
-gem "debug", github: "ruby/debug", platform: :ruby if RUBY_VERSION.to_f >= 2.6
diff --git a/sentry-rails/Gemfile b/sentry-rails/Gemfile
@@ -5,13 +5,15 @@ git_source(:github) { |name| "https://github.com/#{name}.git" }
 gemspec
 gem "sentry-ruby", path: "../sentry-ruby"
 
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+  gem "jdbc-sqlite3"
+end
+
 rails_version = ENV["RAILS_VERSION"]
 rails_version = "7.0.0" if rails_version.nil?
 rails_version = Gem::Version.new(rails_version)
 
-gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-gem "jdbc-sqlite3", platform: :jruby
-
 if rails_version < Gem::Version.new("6.0.0")
   gem "sqlite3", "~> 1.3.0", platform: :ruby
 else
@@ -43,8 +45,11 @@ gem "loofah", "2.20.0" if RUBY_VERSION.to_f < 2.5
 
 gem "rake", "~> 12.0"
 
-gem "object_tracer"
-gem "debug", github: "ruby/debug", platform: :ruby if RUBY_VERSION.to_f >= 2.6
+if RUBY_VERSION.to_f >= 2.6
+  gem "debug", github: "ruby/debug", platform: :ruby
+  gem "irb"
+end
+
 gem "pry"
 
 gem "benchmark-ips"

diff --git a/sentry-resque/Gemfile b/sentry-resque/Gemfile
@@ -3,17 +3,20 @@ git_source(:github) { |name| "https://github.com/#{name}.git" }
 
 # Specify your gem's dependencies in sentry-ruby.gemspec
 gemspec
+gem "sentry-ruby", path: "../sentry-ruby"
+gem "sentry-rails", path: "../sentry-rails"
+
+gem "rails"
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
 gem 'simplecov'
 gem "simplecov-cobertura", "~> 1.4"
 gem "rexml"
 
-gem "rails", "< 7.0"
-
-gem "sentry-ruby", path: "../sentry-ruby"
-gem "sentry-rails", path: "../sentry-rails"
+if RUBY_VERSION.to_f >= 2.6
+  gem "debug", github: "ruby/debug", platform: :ruby
+  gem "irb"
+end
 
 gem "pry"
-gem "debug", github: "ruby/debug", platform: :ruby if RUBY_VERSION.to_f >= 2.6
diff --git a/sentry-ruby/Gemfile b/sentry-ruby/Gemfile
@@ -21,8 +21,11 @@ gem "simplecov-cobertura", "~> 1.4"
 gem "rexml"
 gem "stackprof" unless RUBY_PLATFORM == "java"
 
-gem "object_tracer"
-gem "debug", github: "ruby/debug", platform: :ruby if RUBY_VERSION.to_f >= 2.6
+if RUBY_VERSION.to_f >= 2.6
+  gem "debug", github: "ruby/debug", platform: :ruby
+  gem "irb"
+end
+
 gem "pry"
 
 gem "benchmark-ips"

diff --git a/sentry-sidekiq/Gemfile b/sentry-sidekiq/Gemfile
@@ -3,27 +3,28 @@ git_source(:github) { |name| "https://github.com/#{name}.git" }
 
 # Specify your gem's dependencies in sentry-ruby.gemspec
 gemspec
+gem "sentry-ruby", path: "../sentry-ruby"
+gem "sentry-rails", path: "../sentry-rails"
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
 gem 'simplecov'
 gem "simplecov-cobertura", "~> 1.4"
 gem "rexml"
+# https://github.com/flavorjones/loofah/pull/267
+# loofah changed the required ruby version in a patch so we need to explicitly pin it
+gem "loofah", "2.20.0" if RUBY_VERSION.to_f < 2.5
 
 sidekiq_version = ENV["SIDEKIQ_VERSION"]
 sidekiq_version = "6.0" if sidekiq_version.nil?
 
-gem "rails", "< 7.0"
 gem "sidekiq", "~> #{sidekiq_version}"
+gem "rails"
 
-# https://github.com/flavorjones/loofah/pull/267
-# loofah changed the required ruby version in a patch so we need to explicitly pin it
-gem "loofah", "2.20.0" if RUBY_VERSION.to_f < 2.5
-
-gem "sentry-ruby", path: "../sentry-ruby"
-gem "sentry-rails", path: "../sentry-rails"
+if RUBY_VERSION.to_f >= 2.6
+  gem "debug", github: "ruby/debug", platform: :ruby
+  gem "irb"
+end
 
-gem "object_tracer"
-gem "debug", github: "ruby/debug", platform: :ruby if RUBY_VERSION.to_f >= 2.6
 gem "pry"