diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f8e60e1ac1..55c97a40e2 100644 --- a/.github/workflows/main.yml +++ b/.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: @@ -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 diff --git a/.github/workflows/rspec-package-specs.yml b/.github/workflows/rspec-package-specs.yml index 1e5bc05927..66672651d2 100644 --- a/.github/workflows/rspec-package-specs.yml +++ b/.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: diff --git a/.rubocop.yml b/.rubocop.yml index 7678ea02b7..25ef515fe1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,7 +7,7 @@ require: AllCops: NewCops: enable DisplayCopNames: true - TargetRubyVersion: 2.5 + TargetRubyVersion: 3.0.0 Include: - '**/Rakefile' diff --git a/Gemfile.development_dependencies b/Gemfile.development_dependencies index 653586666c..c9f370b5d0 100644 --- a/Gemfile.development_dependencies +++ b/Gemfile.development_dependencies @@ -4,13 +4,12 @@ gem "shakapacker", "7.2.1" gem "bootsnap", require: false 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? diff --git a/README.md b/README.md index dd0c946f9f..236abeba65 100644 --- a/README.md +++ b/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 diff --git a/react_on_rails.gemspec b/react_on_rails.gemspec index d2c4f79a6b..de36face5f 100644 --- a/react_on_rails.gemspec +++ b/react_on_rails.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |s| s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) } s.require_paths = ["lib"] - s.required_ruby_version = ">= 2.7.0" + s.required_ruby_version = ">= 3.0.0" s.add_dependency "addressable" s.add_dependency "connection_pool" @@ -31,7 +31,6 @@ Gem::Specification.new do |s| s.add_dependency "rails", ">= 5.2" s.add_dependency "rainbow", "~> 3.0" - s.add_development_dependency "bundler", "~> 2" s.add_development_dependency "gem-release" s.post_install_message = ' -------------------------------------------------------------------------------- diff --git a/spec/dummy/Gemfile.lock b/spec/dummy/Gemfile.lock index 80f8b9dd40..4131a506f5 100644 --- a/spec/dummy/Gemfile.lock +++ b/spec/dummy/Gemfile.lock @@ -387,7 +387,7 @@ PLATFORMS DEPENDENCIES amazing_print bootsnap - bundler (= 2.4.17) + bundler (= 2.5.3) capybara capybara-screenshot coveralls @@ -418,10 +418,10 @@ DEPENDENCIES shakapacker (= 7.2.1) spring (~> 4.0) sprockets (~> 4.0) - sqlite3 (~> 1.0, < 1.7.0) + sqlite3 turbolinks uglifier webdrivers (= 5.3.0) BUNDLED WITH - 2.4.17 + 2.5.3 diff --git a/spec/dummy/bin/bundle b/spec/dummy/bin/bundle index a71368e323..86cfde04f4 100755 --- a/spec/dummy/bin/bundle +++ b/spec/dummy/bin/bundle @@ -73,7 +73,7 @@ m = Module.new do requirement = bundler_gem_version.approximate_recommendation - return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("3.0.0") requirement += ".a" if bundler_gem_version.prerelease?