diff --git a/.circleci/config.yml b/.circleci/config.yml index 9c26048b..5351364e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: build: docker: # specify the version you desire here - - image: cimg/ruby:3.2.2 + - image: cimg/ruby:3.3.0 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images diff --git a/.ruby-version b/.ruby-version index be94e6f5..15a27998 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.3.0 diff --git a/Gemfile b/Gemfile index fcc072f0..973d2ffb 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '3.2.2' +ruby '3.3.0' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 6.1.7.6' diff --git a/Gemfile.lock b/Gemfile.lock index 96601172..6374b4fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,15 +62,15 @@ GEM zeitwerk (~> 2.3) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - airbrussh (1.4.2) + airbrussh (1.5.1) sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) - autoprefixer-rails (10.4.15.0) + autoprefixer-rails (10.4.16.0) execjs (~> 2) base64 (0.2.0) bcrypt_pbkdf (1.1.0) bindex (0.8.1) - bootsnap (1.18.1) + bootsnap (1.18.3) msgpack (~> 1.2) bootstrap (5.3.2) autoprefixer-rails (>= 9.1.0) @@ -124,8 +124,8 @@ GEM thor (~> 1.2) tins (~> 1.32) crass (1.0.6) - date (3.3.3) - diff-lcs (1.5.0) + date (3.3.4) + diff-lcs (1.5.1) docile (1.4.0) dotenv (2.8.1) dotenv-rails (2.8.1) @@ -134,7 +134,7 @@ GEM ed25519 (1.3.0) erubi (1.12.0) execjs (2.9.1) - factory_bot (6.4.5) + factory_bot (6.4.6) activesupport (>= 5.0.0) factory_bot_rails (6.4.3) factory_bot (~> 6.4) @@ -173,8 +173,9 @@ GEM mini_mime (1.1.5) minitest (5.21.2) msgpack (1.7.2) + mutex_m (0.2.0) mysql2 (0.5.5) - net-imap (0.3.7) + net-imap (0.4.9.1) date net-protocol net-pop (0.1.2) @@ -183,12 +184,22 @@ GEM timeout net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) net-smtp (0.4.0.1) net-protocol - net-ssh (7.2.0) + net-ssh (7.2.1) nio4r (2.7.0) + nokogiri (1.16.0-aarch64-linux) + racc (~> 1.4) + nokogiri (1.16.0-arm-linux) + racc (~> 1.4) nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) + nokogiri (1.16.0-x86-linux) + racc (~> 1.4) + nokogiri (1.16.0-x86_64-darwin) + racc (~> 1.4) nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) pagy (6.4.3) @@ -310,10 +321,16 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.7.1-arm64-darwin) - sqlite3 (1.7.1-x86_64-linux) - sshkit (1.21.5) + sqlite3 (1.7.2-aarch64-linux) + sqlite3 (1.7.2-arm-linux) + sqlite3 (1.7.2-arm64-darwin) + sqlite3 (1.7.2-x86-linux) + sqlite3 (1.7.2-x86_64-darwin) + sqlite3 (1.7.2-x86_64-linux) + sshkit (1.22.0) + mutex_m net-scp (>= 1.1.2) + net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) sync (0.5.0) term-ansicolor (1.7.1) @@ -348,7 +365,11 @@ GEM zeitwerk (2.6.12) PLATFORMS - arm64-darwin-22 + aarch64-linux + arm-linux + arm64-darwin + x86-linux + x86_64-darwin x86_64-linux DEPENDENCIES @@ -397,7 +418,7 @@ DEPENDENCIES web-console (>= 3.3.0) RUBY VERSION - ruby 3.2.2p53 + ruby 3.3.0p0 BUNDLED WITH - 2.4.10 + 2.5.3 diff --git a/README.md b/README.md index 0ea7c9f1..3480116e 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ These instructions will get you a copy of the project up and running on your loc ## Prerequisites ``` -Ruby Version 3.2.2 +Ruby Version 3.3.0 SQLite 3 ``` diff --git a/config/deploy.rb b/config/deploy.rb index 789df1c8..e2c8970c 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -7,7 +7,7 @@ set :repo_url, 'https://github.com/uclibs/aaec.git' set :rbenv_type, :user -set :rbenv_ruby, '3.2.2' +set :rbenv_ruby, '3.3.0' # set :rbenv_ruby, File.read('.ruby-version').strip set :rbenv_map_bins, %w[rake gem bundle ruby rails] set :rbenv_roles, :all # default value