From d363fbd0f728b3ea614d8f68626445646633af49 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Sun, 8 Sep 2024 14:10:21 +0200 Subject: [PATCH] Allow Rails 8.0 --- .github/workflows/build_test.yml | 1 + Gemfile | 4 ++-- alchemy_cms.gemspec | 2 +- spec/dummy/config/application.rb | 2 +- spec/dummy/db/schema.rb | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 0c5c5605d6..9286f1252f 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -66,6 +66,7 @@ jobs: - "7.0" - "7.1" - "7.2" + - "8.0" ruby: - "3.1" - "3.2" diff --git a/Gemfile b/Gemfile index d7ead989b0..32602ffed9 100644 --- a/Gemfile +++ b/Gemfile @@ -4,11 +4,11 @@ source "https://rubygems.org" gemspec -rails_version = ENV.fetch("RAILS_VERSION", "7.2") +rails_version = ENV.fetch("RAILS_VERSION", "8.0") gem "rails", "~> #{rails_version}.0" if ENV["DB"].nil? || ENV["DB"] == "sqlite" - gem "sqlite3", (rails_version == "7.0") ? "~> 1.7.0" : "~> 2.0.0" + gem "sqlite3", (rails_version == "7.0") ? "~> 1.7" : "~> 2.0" end if ENV["DB"] == "mysql" || ENV["DB"] == "mariadb" gem "mysql2", "~> 0.5.1" diff --git a/alchemy_cms.gemspec b/alchemy_cms.gemspec index a8273c018f..90034ea3e5 100644 --- a/alchemy_cms.gemspec +++ b/alchemy_cms.gemspec @@ -33,7 +33,7 @@ Gem::Specification.new do |gem| activesupport railties ].each do |rails_gem| - gem.add_runtime_dependency rails_gem, [">= 7.0", "< 7.3"] + gem.add_runtime_dependency rails_gem, [">= 7.0", "< 8.1"] end gem.add_runtime_dependency "active_model_serializers", ["~> 0.10.14"] diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index c7b10e8b29..2ad5b83e81 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -22,7 +22,7 @@ module Dummy class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. if config.respond_to?(:load_defaults) - config.load_defaults ENV["RAILS_VERSION"] || 7.2 + config.load_defaults ENV["RAILS_VERSION"] || 8.0 end # Settings in config/environments/* take precedence over those specified here. diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb index 676ff4a484..e76e531dbf 100644 --- a/spec/dummy/db/schema.rb +++ b/spec/dummy/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.2].define(version: 2024_04_11_155901) do +ActiveRecord::Schema[8.0].define(version: 2024_04_11_155901) do create_table "alchemy_attachments", force: :cascade do |t| t.string "name" t.string "file_name"