diff --git a/.ruby-version b/.ruby-version index a4dd9dba4..2451c27ca 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.4 +3.0.7 diff --git a/Gemfile b/Gemfile index dc10ed774..971b00b73 100644 --- a/Gemfile +++ b/Gemfile @@ -172,7 +172,7 @@ gem 'intl-tel-input-rails', git: 'https://github.com/openstax/intl-tel-input-rai gem 'http_accept_language' # Fast JSON parsing -gem 'oj', '~> 3.7.12' +gem 'oj' # Replace JSON with Oj gem 'oj_mimic_json' @@ -197,9 +197,9 @@ group :development, :test do # # Call 'debugger' anywhere in the code to stop execution and get a debugger console gem 'byebug', require: false - # Debug in VS Code - gem 'ruby-debug-ide', require: false - gem 'debase', require: false + # Debug in VS Code - these do not install properly on the latest OS X + # gem 'ruby-debug-ide', require: false + # gem 'debase', require: false # Use RSpec for tests gem 'rspec-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 50cce7470..af3b1458e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,6 +127,7 @@ GEM aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) bcrypt (3.1.18) + bigdecimal (3.1.8) bindata (2.5.0) bindex (0.8.1) blazer (2.6.4) @@ -195,9 +196,6 @@ GEM database_cleaner (1.8.5) date (3.3.4) db-query-matchers (0.6.0) - debase (0.2.4.1) - debase-ruby_core_source (>= 0.10.2) - debase-ruby_core_source (0.10.11) declarative (0.0.20) declarative-option (0.1.0) delayed_job (4.1.10) @@ -297,6 +295,8 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) ffi (1.17.0) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) fine_print (6.0.1) action_interceptor jquery-rails @@ -330,24 +330,26 @@ GEM rspec (>= 2.99.0, < 4.0) hashdiff (1.0.1) hashie (5.0.0) - highline (2.0.2) + highline (3.1.1) + reline htmlentities (4.3.4) http_accept_language (2.1.1) http_parser.rb (0.6.0) httpclient (2.8.3) i18n (1.7.1) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.29) + i18n-tasks (1.0.14) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi highline (>= 2.0.0) i18n - parser (>= 2.2.3.0) + parser (>= 3.2.2.1) rails-i18n rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) - jaro_winkler (1.5.3) + io-console (0.7.2) + jaro_winkler (1.5.6) jbuilder (2.9.1) activesupport (>= 4.2.0) jmespath (1.6.2) @@ -379,9 +381,9 @@ GEM hashie transaction_isolation transaction_retry - libv8-node (16.19.0.1) - libv8-node (16.19.0.1-x86_64-darwin) - libv8-node (16.19.0.1-x86_64-linux) + libv8-node (21.7.2.0) + libv8-node (21.7.2.0-x86_64-darwin) + libv8-node (21.7.2.0-x86_64-linux) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -407,8 +409,8 @@ GEM method_source (0.8.2) mini_mime (1.1.5) mini_portile2 (2.8.7) - mini_racer (0.6.4) - libv8-node (~> 16.19.0.0) + mini_racer (0.12.0) + libv8-node (~> 21.7.2.0) minitest (5.25.1) msgpack (1.5.2) multi_json (1.15.0) @@ -425,12 +427,12 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) - nokogiri (1.15.6) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.15.6-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.15.6-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) notiffany (0.1.0) nenv (~> 0.1) @@ -442,7 +444,9 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - oj (3.7.12) + oj (3.16.6) + bigdecimal (>= 3.0) + ostruct (>= 0.2) oj_mimic_json (1.0.1) omniauth (1.9.2) hashie (>= 3.4.6) @@ -496,14 +500,16 @@ GEM lev rails (>= 5.0, < 8.0) request_store + ostruct (0.6.0) p3p (1.2.0) rack parallel (1.19.2) parallel_tests (3.1.0) parallel - parser (3.0.2.0) + parser (3.3.5.0) ast (~> 2.4.1) - pg (0.19.0) + racc + pg (1.5.8) premailer (1.8.7) css_parser (>= 1.4.5) htmlentities (>= 4.0.0) @@ -573,7 +579,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) @@ -598,6 +604,8 @@ GEM redis-store (1.4.1) redis (>= 2.2, < 5) regexp_parser (2.1.0) + reline (0.5.10) + io-console (~> 0.5) render_anywhere (0.0.12) rails (>= 3.0.7) representable (3.0.4) @@ -659,8 +667,6 @@ GEM unicode-display_width (>= 1.4.0, < 1.7) rubocop-rspec (1.36.0) rubocop (>= 0.68.1) - ruby-debug-ide (0.7.2) - rake (>= 0.8.1) ruby-graphviz (1.2.3) ruby-progressbar (1.10.1) ruby2_keywords (0.0.5) @@ -715,8 +721,8 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) strscan (3.1.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) test_xml (0.1.8) diffy (~> 3.0) nokogiri (>= 1.3.2) @@ -735,7 +741,7 @@ GEM uber (0.1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.6.0) + unicode-display_width (1.6.1) vcr (3.0.3) web-console (3.7.0) actionview (>= 5.0) @@ -791,7 +797,6 @@ DEPENDENCIES compass-rails (~> 3.1.0) database_cleaner db-query-matchers - debase delayed_job_active_record delayed_job_heartbeat_plugin delayed_job_worker_pool @@ -824,7 +829,7 @@ DEPENDENCIES maruku meta_request mini_racer - oj (~> 3.7.12) + oj oj_mimic_json omniauth (~> 1.9) omniauth-facebook @@ -858,7 +863,6 @@ DEPENDENCIES rspec-rails rubocop (~> 0.76.0) rubocop-rspec - ruby-debug-ide sass-rails (~> 5.0) sd_notify selenium-webdriver