diff --git a/Gemfile b/Gemfile index 92904b9d..138a4cfc 100644 --- a/Gemfile +++ b/Gemfile @@ -2,24 +2,25 @@ source 'https://rubygems.org' ruby '3.2.2' +gem 'sidekiq' gem 'sidekiq-pro', source: 'https://gems.contribsys.com' -gem 'sidekiq', '~> 7.2.0' gem 'travis-exceptions', git: 'https://github.com/travis-ci/travis-exceptions' gem 'travis-logger', git: 'https://github.com/travis-ci/travis-logger' gem 'travis-metrics', git: 'https://github.com/travis-ci/travis-metrics' -gem 'travis-config', git: 'https://github.com/travis-ci/travis-config' -gem 'travis-encrypt', git: 'https://github.com/travis-ci/travis-encrypt' -gem 'travis-lock', git: 'https://github.com/travis-ci/travis-lock' +gem 'metriks', git: 'https://github.com/travis-ci/metriks' +gem 'metriks-librato_metrics', git: 'https://github.com/travis-ci/metriks-librato_metrics' +gem 'travis-config', git: 'https://github.com/travis-ci/travis-config' +gem 'travis-encrypt', git: 'https://github.com/travis-ci/travis-encrypt' +gem 'travis-lock', git: 'https://github.com/travis-ci/travis-lock' gem 'travis-rollout', git: 'https://github.com/travis-ci/travis-rollout' gem 'travis-support', git: 'https://github.com/travis-ci/travis-support' -gem 'metriks', git: 'https://github.com/travis-ci/metriks' -gem 'metriks-librato_metrics', git: 'https://github.com/travis-ci/metriks-librato_metrics' gem 'marginalia', git: 'https://github.com/travis-ci/marginalia' gem 'activerecord', '~> 7' +gem 'addressable', '~> 2.8.6' gem 'bunny' gem 'dalli' gem 'faraday' @@ -27,7 +28,6 @@ gem 'pg', '~> 1' gem 'rake' gem 'redis' gem 'rollout', git: 'https://github.com/travis-ci/rollout' -gem 'addressable', '~> 2.8.6' gem 'coder' gem 'gh', git: 'https://github.com/travis-ci/gh', branch: 'master' @@ -39,9 +39,11 @@ gem 'simple_states', git: 'https://github.com/travis-ci/simple_states', branch: gem 'jwt' gem 'libhoney' -gem 'puma', '~> 6' +gem 'puma', '~> 6.4', '>= 6.4.3' +gem 'rack', '~> 2.2', '>= 2.2.20' gem 'rack-ssl' -gem 'sinatra', '~> 3' +gem 'rexml', '>= 3.3.9' +gem 'sinatra', '~> 3.2' group :test do gem 'database_cleaner' diff --git a/Gemfile.lock b/Gemfile.lock index 5b705dbf..f43ee3be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -219,10 +219,10 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (5.0.4) - puma (6.4.2) + puma (6.6.1) nio4r (~> 2.0) racc (1.7.3) - rack (2.2.8.1) + rack (2.2.21) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) @@ -240,7 +240,7 @@ GEM redlock (2.0.6) redis-client (>= 0.14.1, < 1.0.0) regexp_parser (2.9.0) - rexml (3.2.6) + rexml (3.4.4) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -284,7 +284,7 @@ GEM bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) set (1.1.0) - sidekiq (7.2.2) + sidekiq (7.2.4) concurrent-ruby (< 2) connection_pool (>= 2.3.0) rack (>= 2.2.4) @@ -321,13 +321,14 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) - uri (0.13.0) + uri (1.1.1) webmock (3.23.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) PLATFORMS + arm64-darwin-21 arm64-darwin-23 x86_64-linux @@ -351,24 +352,26 @@ DEPENDENCIES multi_json pg (~> 1) pry - puma (~> 6) + puma (~> 6.4, >= 6.4.3) + rack (~> 2.2, >= 2.2.20) rack-ssl rack-test rake redis redlock + rexml (>= 3.3.9) rollout! rspec (~> 3.12) rubocop rubocop-performance rubocop-rspec sentry-ruby - sidekiq (~> 7.2.0) + sidekiq sidekiq-pro! simple_states! simplecov simplecov-console - sinatra (~> 3) + sinatra (~> 3.2) sinatra-contrib travis-config! travis-encrypt!