diff --git a/.rubocop.yml b/.rubocop.yml index 381cf7813..7cf5f3c07 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,7 +4,7 @@ AllCops: - 'tmp/**/*' - 'tools/**/*' - 'doc/**/*' - TargetRubyVersion: 3.0 + TargetRubyVersion: <%= File.read(".ruby-version").strip[/^(\d+\.\d+)/, 1] || raise("Ruby version not found") %> NewCops: enable Layout/LineLength: diff --git a/.ruby-version b/.ruby-version index acf9bf09d..2aa513199 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 \ No newline at end of file +3.4.7 diff --git a/Dockerfile b/Dockerfile index 75ffa8387..7647faf6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ########################################################################################################### # ---------------------------- Start of Builder 0 - Gemset Build ------------------------------------------ -FROM ruby:3.2.1-slim-bullseye AS builder +FROM ruby:3.4.7-slim-bullseye AS builder COPY . /beef @@ -44,7 +44,7 @@ RUN echo "gem: --no-ri --no-rdoc" > /etc/gemrc \ # ---------------------------- Start of Builder 1 - Final Build ------------------------------------------ -FROM ruby:3.2.1-slim-bullseye +FROM ruby:3.4.7-slim-bullseye LABEL maintainer="Beef Project" \ source_url="github.com/beefproject/beef" \ homepage="https://beefproject.com/" diff --git a/Gemfile b/Gemfile index d3cc88b85..99b799261 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem 'term-ansicolor', :require => 'term/ansicolor' gem 'rubyzip', '~> 3.2' gem 'espeak-ruby', '~> 1.1.0' # Text-to-Voice gem 'rake', '~> 13.3' -gem 'activerecord', '~> 8.1' +gem 'activerecord', '~> 8.1' gem 'otr-activerecord', '~> 2.6.0' gem 'sqlite3', '~> 2.8' gem 'rubocop', '~> 1.81.7', require: false @@ -61,30 +61,30 @@ end # For running unit tests group :test do - gem 'test-unit-full', '~> 0.0.5' - gem 'rspec', '~> 3.13' - gem 'rdoc', '~> 6.15' - gem 'browserstack-local', '~> 1.4' + gem 'test-unit-full', '~> 0.0.5' + gem 'rspec', '~> 3.13' + gem 'rdoc', '~> 6.15' + gem 'browserstack-local', '~> 1.4' - gem 'irb', '~> 1.15' - gem 'pry-byebug', '~> 3.11' + gem 'irb', '~> 1.15' + gem 'pry-byebug', '~> 3.11' - gem 'rest-client', '~> 2.1.0' - gem 'websocket-client-simple', '~> 0.6.1' + gem 'rest-client', '~> 2.1.0' + gem 'websocket-client-simple', '~> 0.6.1' - # Note: curb gem requires curl libraries - # sudo apt-get install libcurl4-openssl-dev - gem 'curb', '~> 1.2' + # Note: curb gem requires curl libraries + # sudo apt-get install libcurl4-openssl-dev + gem 'curb', '~> 1.2' - # Note: selenium-webdriver 3.x is incompatible with Firefox version 48 and prior - # gem 'selenium' # Requires old version of selenium which is no longer available - gem 'geckodriver-helper', '~> 0.24.0' - gem 'selenium-webdriver', '~> 4.38' + # Note: selenium-webdriver 3.x is incompatible with Firefox version 48 and prior + # gem 'selenium' # Requires old version of selenium which is no longer available + gem 'geckodriver-helper', '~> 0.24.0' + gem 'selenium-webdriver', '~> 4.38' - # Note: nokogiri is needed by capybara which may require one of the below commands - # sudo apt-get install libxslt-dev libxml2-dev - # sudo port install libxml2 libxslt - gem 'capybara', '~> 3.40' + # Note: nokogiri is needed by capybara which may require one of the below commands + # sudo apt-get install libxslt-dev libxml2-dev + # sudo port install libxml2 libxslt + gem 'capybara', '~> 3.40' end source 'https://rubygems.org' diff --git a/Gemfile.lock b/Gemfile.lock index 11a099124..2cf923179 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -343,4 +343,4 @@ DEPENDENCIES xmlrpc (~> 0.3.3) BUNDLED WITH - 2.5.18 + 2.7.2