diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml index b07763ecb..de0ba7a17 100644 --- a/.github/workflows/github_actions.yml +++ b/.github/workflows/github_actions.yml @@ -42,7 +42,7 @@ jobs: - name: 'Setting up Ruby' uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7.4 # Not needed with a .ruby-version file + ruby-version: 3.0.3 # Not needed with a .ruby-version file - name: 'Build and run tests' run: | diff --git a/.rubocop.yml b/.rubocop.yml index fb2d47b8a..381cf7813 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,7 +4,7 @@ AllCops: - 'tmp/**/*' - 'tools/**/*' - 'doc/**/*' - TargetRubyVersion: 2.7 + TargetRubyVersion: 3.0 NewCops: enable Layout/LineLength: diff --git a/.ruby-version b/.ruby-version index a4dd9dba4..75a22a26a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.4 +3.0.3 diff --git a/Gemfile b/Gemfile index 7984a1e1b..f4d4db498 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,9 @@ # See the file 'doc/COPYING' for copying permission # #gem 'simplecov', require: false, group: :test + +gem 'net-smtp', require: false + gem 'eventmachine' gem 'thin' gem 'sinatra', '>= 2.2.0' diff --git a/Gemfile.lock b/Gemfile.lock index d833e5cda..73af05b2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,6 +45,7 @@ GEM curb (1.0.1) daemons (1.4.1) diff-lcs (1.5.0) + digest (3.1.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) em-websocket (0.5.3) @@ -103,6 +104,12 @@ GEM mustermann (2.0.2) ruby2_keywords (~> 0.0.1) naught (1.1.0) + net-protocol (0.1.3) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout netrc (0.11.0) nio4r (2.5.8) nokogiri (1.13.8-x86_64-linux) @@ -219,6 +226,7 @@ GEM rack (>= 1, < 3) thread_safe (0.3.6) tilt (2.0.11) + timeout (0.3.0) timers (4.3.3) tins (1.31.1) sync @@ -272,13 +280,14 @@ DEPENDENCIES maxmind-db mime-types msfrpc-client + net-smtp otr-activerecord (>= 1.4.2) parseconfig pry-byebug qr4r - rack (>= 2.2.3.1) - rack-protection (>= 2.0.0) - rake (>= 12.3.3) + rack (>= 2.2.4) + rack-protection (>= 2.2.0) + rake (>= 13.0) rdoc rest-client (>= 2.1.0) rspec @@ -286,7 +295,7 @@ DEPENDENCIES rubyzip (>= 1.2.2) rushover selenium-webdriver - sinatra (>= 2.0.2) + sinatra (>= 2.2.0) slack-notifier sqlite3 term-ansicolor @@ -294,7 +303,7 @@ DEPENDENCIES test-unit-full thin twitter (>= 7.0.0) - uglifier (>= 2.7.2) + uglifier (>= 4.2.0) unf websocket-client-simple (~> 0.5.1) xmlrpc