Allows Rails 8, updates sqlite in Gemfile to match what CI runs

solidusio · Jan 28, 2025 · e6427fe · e6427fe
1 parent b1b8567
commit e6427fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -224,7 +224,7 @@ commands:
             mkdir -p /tmp/dummy_extension
             cd /tmp/dummy_extension
             bundle init
-            bundle add rails -v "< 8.0" --skip-install
+            bundle add rails -v "< 8.1" --skip-install
             bundle add sqlite3 -v "~> 2.0" --skip-install
             test -n "<<parameters.extra_gems>>" && bundle add <<parameters.extra_gems>> --skip-install
             bundle add solidus --path "$(ruby -e"puts File.expand_path ENV['CIRCLE_WORKING_DIRECTORY']")"
@@ -352,7 +352,7 @@ workflows:
             {
               parameters:
                 {
-                  rails: ["7.0", "7.1", "7.2"],
+                  rails: ["7.0", "7.1", "7.2", "8.0"],
                   ruby: ["3.1"],
                   database: ["mysql"],
                   paperclip: [true],
@@ -364,7 +364,7 @@ workflows:
             {
               parameters:
                 {
-                  rails: ["7.0", "7.1", "7.2"],
+                  rails: ["7.0", "7.1", "7.2", "8.0"],
                   ruby: ["3.1"],
                   database: ["postgres"],
                   paperclip: [false],
@@ -388,7 +388,7 @@ workflows:
             {
               parameters:
                 {
-                  rails: ["7.2", "main"],
+                  rails: ["7.2", "8.0"],
                   ruby: ["3.3.5"],
                   database: ["sqlite"],
                   paperclip: [false],

diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,7 @@ gemspec require: false
 if /(stable|main)/.match? ENV['RAILS_VERSION']
   gem 'rails', github: 'rails', require: false, branch: ENV['RAILS_VERSION']
 else
-  gem 'rails', ENV['RAILS_VERSION'] || ['> 7.0', '< 8.0.0.beta1'], require: false
+  gem 'rails', ENV['RAILS_VERSION'] || ['> 7.0', '< 8.1.0.beta1'], require: false
 end
 # rubocop:enable Bundler/DuplicatedGem
 
@@ -19,7 +19,7 @@ dbs = ENV['DB_ALL'] ? 'all' : ENV.fetch('DB', 'sqlite')
 gem 'mysql2', '~> 0.5.0', require: false if dbs.match?(/all|mysql/)
 gem 'pg', '~> 1.0', require: false if dbs.match?(/all|postgres/)
 gem 'fast_sqlite', require: false if dbs.match?(/all|sqlite/)
-gem 'sqlite3', '~> 1.4', require: false if dbs.match?(/all|sqlite/)
+gem 'sqlite3', '~> 2.0', require: false if dbs.match?(/all|sqlite/)
 
 
 gem 'database_cleaner', '~> 2.0', require: false

diff --git a/core/solidus_core.gemspec b/core/solidus_core.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     actionmailer actionpack actionview activejob activemodel activerecord
     activestorage activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 7.0', '< 8.0.0.beta1']
+    s.add_dependency rails_dep, ['>= 7.0', '< 8.1.0.beta1']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'