Update Ruby Dependencies (#1595)

* Remove unused sqlite3 gem

* Move sqlite3 gem into dummy gemfile

* Revert "Move sqlite3 gem into dummy gemfile"

This reverts commit 270507e.

* Revert "Remove unused sqlite3 gem"

This reverts commit 55629c9.

* Bump rails to 7.1

* Bump Shakapacker to 7.2.1

* Bump rubocop related gems

* Fix Rubocop issues

* Bump to use Ruby 3.0.0

* Fix Rubocop issues

* Update CircleCI config for Ruby 3

* Remove outdated comment for Ruby 2.2

* Update changelog

Author: ahangarha

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 
 aliases:
   - &docker-image
-    - image: circleci/ruby:2.7-node-browsers
+    - image: circleci/ruby:3.0-node-browsers
 
   # Print critical data and executables versions.
   - &print-system-info
@@ -54,15 +54,15 @@ aliases:
   - &install-dummy-app-ruby-gems
     name: Install Ruby Gems for dummy app
     command: |
-      gem install bundler:2.4.17
+      gem install bundler:2.5.3
       echo "Bundler version: "; bundle --version
       cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
 
   # Install ruby gems unless existing set of gems is satisfying bundler.
   - &install-package-ruby-gems
     name: Install Ruby Gems for package
     command: |
-      gem install bundler:2.4.17
+      gem install bundler:2.5.3
       echo "Bundler version: "; bundle --version
       bundle lock --add-platform 'x86_64-linux'
       bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3

.github/workflows/lint-js-and-ruby.yml

@@ -22,7 +22,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 2.4.17
+        bundler: 2.5.3
     - name: Setup Node
       uses: actions/setup-node@v3
       with:
@@ -52,7 +52,7 @@ jobs:
         yarn run eslint -v
         sudo yarn global add yalc
     - name: Install Ruby Gems for package
-      run: bundle check --path=vendor/bundle || bundle _2.4.17_ install --path=vendor/bundle --jobs=4 --retry=3
+      run: bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3
     - name: Linting of Ruby
       run: bundle exec rubocop
     - name: Linting of JS

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
   build-dummy-app-webpack-test-bundles:
     strategy:
       matrix:
-        ruby: [2.7, 3.2]
+        ruby: [3.0, 3.3]
         node: [14, 20]
     runs-on: ubuntu-22.04
     steps:
@@ -21,7 +21,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 2.4.17
+        bundler: 2.5.3
     # libyaml-dev is needed for psych v5
     # this gem depends on sdoc which depends on rdoc which depends on psych
     - name: Fix dependency for libyaml-dev
@@ -66,7 +66,7 @@ jobs:
         path: spec/dummy/vendor/bundle
         key: v5-dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}
     - name: Install Ruby Gems for dummy app
-      run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.4.17_ install --path=vendor/bundle --jobs=4 --retry=3
+      run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3
     - name: generate file system-based packs
       run: cd spec/dummy && RAILS_ENV=test bundle exec rake react_on_rails:generate_packs
     - name: Build test bundles for dummy app
@@ -83,7 +83,7 @@ jobs:
     needs: build-dummy-app-webpack-test-bundles
     strategy:
       matrix:
-        ruby: [2.7, 3.2]
+        ruby: [3.0, 3.3]
         node: [14, 20]
         rake_task: ['run_rspec:all_but_examples', 'run_rspec:examples']
     runs-on: ubuntu-22.04
@@ -95,7 +95,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 2.4.17
+        bundler: 2.5.3
     - name: Setup Node
       uses: actions/setup-node@v3
       with:
@@ -148,7 +148,7 @@ jobs:
     - name: Install Ruby Gems for package
       run:  bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
     - name: Install Ruby Gems for dummy app
-      run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.4.17_ install --path=vendor/bundle --jobs=4 --retry=3
+      run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3
     - name: Ensure minimum required Chrome version
       run: |
         echo -e "Already installed $(google-chrome --version)\n"

.github/workflows/rspec-package-specs.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        ruby: [2.7, 3.2]
+        ruby: [3.0, 3.3]
         node: [14, 20]
     runs-on: ubuntu-22.04
     steps:
@@ -21,7 +21,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 2.4.17
+        bundler: 2.5.3
     - name: Print system information
       run: |
         echo "Linux release: "; cat /etc/issue

.rubocop.yml

@@ -7,7 +7,7 @@ require:
 AllCops:
   NewCops: enable
   DisplayCopNames: true
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0.0
 
   Include:
     - '**/Rakefile'

CHANGELOG.md

@@ -15,6 +15,9 @@ Please follow the recommendations outlined at [keepachangelog.com](http://keepac
 ### [Unreleased]
 Changes since the last non-beta release.
 
+#### Removed
+- Dropped Ruby 2.7 support [PR 1595](https://github.com/shakacode/react_on_rails/pull/1595) by [ahangarha](https://github.com/ahangarha).
+
 ### [13.4.1]
 #### Fixed
 - Fixed Typescript types for ServerRenderResult, ReactComponent, RenderFunction, and RailsContext interfaces. [PR 1582](https://github.com/shakacode/react_on_rails/pull/1582) & [PR 1585](https://github.com/shakacode/react_on_rails/pull/1585) by [kotarella1110](https://github.com/kotarella1110)

Gemfile.development_dependencies

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
-gem "shakapacker", "7.0.1"
+gem "shakapacker", "7.2.1"
 gem "bootsnap", require: false
-gem "rails", "~> 7.0", ">= 7.0.1"
+gem "rails", "~> 7.1"
 
-# sqlite3 1.7.0 ends native gem support for Ruby 2.7
-gem "sqlite3", "~> 1.0", "< 1.7.0"
+gem "sqlite3"
 gem "sass-rails", "~> 6.0"
 gem "uglifier"
 gem "jquery-rails"
 gem "puma", "~> 6.0"
-gem "bundler", "2.4.17"
+gem "bundler", "2.5.3"
 
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem "turbolinks" if ENV["DISABLE_TURBOLINKS"].nil? || ENV["DISABLE_TURBOLINKS"].strip.empty?
@@ -31,9 +30,9 @@ group :development, :test do
   gem "pry-doc"
   gem "pry-rails"
   gem "pry-rescue"
-  gem "rubocop", "~>1.56", require: false
-  gem "rubocop-performance", "~>1.18.0", require: false
-  gem "rubocop-rspec", "~>2.23.2", require: false
+  gem "rubocop", "~>1.59", require: false
+  gem "rubocop-performance", "~>1.20.0", require: false
+  gem "rubocop-rspec", "~>2.26", require: false
   gem "scss_lint", require: false
   gem "spring", "~> 4.0"
 end

README.md

@@ -73,7 +73,7 @@ _Requires creating a free account._
 
 ## Prerequisites
 
-Ruby on Rails >=5, rails/webpacker >= 4.2 or shakapacker > 6, Ruby >= 2.7
+Ruby on Rails >=5, rails/webpacker >= 4.2 or shakapacker > 6, Ruby >= 3.0.0
 
 # Support
 

lib/generators/react_on_rails/base_generator.rb

@@ -77,7 +77,7 @@ def add_base_gems_to_gemfile
       end
 
       def add_yarn_dependencies
-        major_minor_patch_only = /\A\d+\.\d+\.\d+\z/.freeze
+        major_minor_patch_only = /\A\d+\.\d+\.\d+\z/
         if ReactOnRails::VERSION.match?(major_minor_patch_only)
           run "yarn add react-on-rails@#{ReactOnRails::VERSION} --exact"
         else

lib/generators/react_on_rails/templates/dev_tests/spec/rails_helper.rb

@@ -40,7 +40,7 @@
 # ActiveRecord::Migration.maintain_test_schema!
 
 RSpec.configure do |config|
-  config.before(:each, js: true, type: :system) do
+  config.before(:each, :js, type: :system) do
     driven_by :selenium_chrome
   end