Merge pull request #28 from boomer196/changes-for-solidus-v4.4.1

.circleci/config.yml

@@ -14,28 +14,28 @@ jobs:
   run-specs-with-sqlite:
     executor:
       name: solidusio_extensions/sqlite
-      ruby_version: "3.0"
+      ruby_version: "3.2"
     steps:
       - browser-tools/install-chrome
       - solidusio_extensions/run-tests
   run-specs-with-postgres:
     executor:
       name: solidusio_extensions/postgres
-      ruby_version: "3.0"
+      ruby_version: "3.2"
     steps:
       - browser-tools/install-chrome
       - solidusio_extensions/run-tests
   run-specs-with-mysql:
     executor:
       name: solidusio_extensions/mysql
-      ruby_version: "3.0"
+      ruby_version: "3.2"
     steps:
       - browser-tools/install-chrome
       - solidusio_extensions/run-tests
   lint-code:
     executor:
       name: solidusio_extensions/sqlite-memory
-      ruby_version: "3.0"
+      ruby_version: "3.2"
     steps:
       - solidusio_extensions/lint-code
 

Gemfile

@@ -7,8 +7,13 @@ branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
 gem 'solidus', github: 'solidusio/solidus', branch: branch
 
 # The solidus_frontend gem has been pulled out since v3.2
-gem 'solidus_frontend', github: 'solidusio/solidus_frontend' if branch == 'main'
-gem 'solidus_frontend' if branch >= 'v3.2' # rubocop:disable Bundler/DuplicatedGem
+if branch >= 'v3.2'
+  gem 'solidus_frontend'
+elsif branch == 'main'
+  gem 'solidus_frontend', github: 'solidusio/solidus_frontend'
+else
+  gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch
+end
 
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.
@@ -24,7 +29,7 @@ when 'mysql'
 when 'postgresql'
   gem 'pg'
 else
-  gem 'sqlite3'
+  gem 'sqlite3', '~> 1.4'
 end
 
 gem 'rails-controller-testing'

app/models/spree/stock/splitter/digital_splitter.rb

@@ -24,7 +24,7 @@ def split_by_digital(package)
 
         def hash_to_packages(digitals)
           packages = []
-          digitals.each do |_id, contents|
+          digitals.each_value do |contents|
             packages << build_package(contents)
           end
           packages

lib/solidus_digital/engine.rb

@@ -11,6 +11,10 @@ class Engine < Rails::Engine
 
     engine_name 'solidus_digital'
 
+    initializer "solidus_digital.zeitwerk_ignore_deface_overrides", before: :eager_load! do |app|
+      app.autoloaders.main.ignore(root.join('app/overrides'))
+    end
+
     initializer "spree.register.digital_shipping" do |app|
       Rails.application.config.after_initialize do
         ::Spree::DigitalConfiguration = ::Spree::SpreeDigitalConfiguration.new

solidus_digital.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'solidus', ['>= 2.0.0']
+  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 5']
   spec.add_dependency 'solidus_support', '~> 0.5'
 
   spec.add_development_dependency 'rspec-activemodel-mocks'