Skip to content
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
database-password: 'root'
database-port: '3306'
docker-compose-file: 'docker-compose.ci.mysql.yml'
- ruby-version: 'jruby-9.4.15.0'
- ruby-version: 'jruby-10.0.6.0'
database-adapter: 'mysql2'
database-user: 'root'
database-password: 'root'
Expand All @@ -37,7 +37,7 @@ jobs:
database-password: 'postgres'
database-port: '5432'
docker-compose-file: 'docker-compose.ci.postgresql.yml'
- ruby-version: 'jruby-9.4.15.0'
- ruby-version: 'jruby-10.0.6.0'
database-adapter: 'postgresql'
database-user: 'postgres'
database-password: 'postgres'
Expand Down
12 changes: 8 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,21 @@ gem 'minitest', '~> 5.0'
# Lock i18n to 1.14.x for: https://github.com/ruby-i18n/i18n/issues/735
gem 'i18n', '~> 1.14.0'

# json 3.0 dropped the quirks_mode keyword that ActiveSupport::JSON.encode
# still passes to JSON.generate, raising ArgumentError (breaks any code path
# that calls #to_json, e.g. killbill-client's NodesInfo#trigger_node_command).
# Was incidentally protected by rubocop's own `json ~> 2.3` dependency, but
# rubocop 1.90.0 loosened that to `json >= 2.3` (no upper bound), so an
# unpinned `gem 'json'` here can float to 3.x on any fresh bundle install.
gem 'json', '~> 2.21'
Comment thread
tungleduyxyz marked this conversation as resolved.
Resolved
Comment thread
tungleduyxyz marked this conversation as resolved.
Resolved

# Declare any dependencies that are still in development here instead of in
# your gemspec. These might include edge Rails or gems from your path or
# Git. Remember to move these dependencies to your gemspec before releasing
# your gem to rubygems.org.

group :development do
gem 'gem-release'
gem 'json'
gem 'killbill-client'
gem 'listen'
gem 'puma'
Expand All @@ -34,9 +41,6 @@ group :development do
gem 'sprockets-rails'
end

# Temporary fix for JRuby 9.4.10.0 here: https://github.com/jruby/jruby/issues/7262
gem 'jar-dependencies', '~> 0.4.1' if defined?(JRUBY_VERSION)

# gem 'killbill-assets-ui', github: 'killbill/killbill-assets-ui', ref: 'main'
# gem 'killbill-assets-ui', path: '../killbill-assets-ui'
gem 'killbill-assets-ui'
Loading