solidus_core 3.4.6 → 4.0.0

data/db/migrate/20230325132905_remove_unused_columns_from_promotion_rules.rb

@@ -0,0 +1,6 @@
+class RemoveUnusedColumnsFromPromotionRules < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :spree_promotion_rules, :code, :string
+    remove_column :spree_promotion_rules, :product_group_id, :integer
+  end
+end

data/db/migrate/20230325161633_drop_unused_promo_action_line_items.rb

@@ -0,0 +1,13 @@
+class DropUnusedPromoActionLineItems < ActiveRecord::Migration[5.2]
+  def change
+    drop_table :spree_promotion_action_line_items, force: :cascade do |t|
+      t.integer "promotion_action_id"
+      t.integer "variant_id"
+      t.integer "quantity", default: 1
+      t.datetime "created_at", precision: 6
+      t.datetime "updated_at", precision: 6
+      t.index ["promotion_action_id"], name: "index_spree_promotion_action_line_items_on_promotion_action_id"
+      t.index ["variant_id"], name: "index_spree_promotion_action_line_items_on_variant_id"
+    end
+  end
+end

data/db/migrate/20230425103509_remove_taxon_position.rb

@@ -0,0 +1,5 @@
+class RemoveTaxonPosition < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :spree_taxons, :position, :integer, default: 0
+  end
+end

data/db/migrate/20230427095534_drop_deprecated_address_id_from_shipments.rb

@@ -0,0 +1,11 @@
+class DropDeprecatedAddressIdFromShipments < ActiveRecord::Migration[5.2]
+  def up
+    remove_index :spree_shipments, column: [:deprecated_address_id], name: :index_spree_shipments_on_deprecated_address_id
+    remove_column :spree_shipments, :deprecated_address_id
+  end
+
+  def down
+    add_column :spree_shipments, :deprecated_address_id
+    add_index :spree_shipments, :deprecated_address_id, name: :index_spree_shipments_on_deprecated_address_id
+  end
+end

data/lib/generators/solidus/install/app_templates/frontend/none.rb

@@ -1,2 +1 @@
-apply "#{__dir__}/break_down_solidus_gem.rb"
-run_bundle
+# noop

data/lib/generators/solidus/install/app_templates/frontend/starter.rb

@@ -1,3 +1 @@
-apply "#{__dir__}/break_down_solidus_gem.rb"
-run_bundle
-apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v3.4/template.rb'
+apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v4.0/template.rb'

data/lib/generators/solidus/install/app_templates/payment_method/paypal.rb

@@ -1,17 +1,5 @@
-unless Bundler.locked_gems.dependencies['solidus_frontend']
-  say_status :warning, "Support for frontends other than `solidus_frontend` by `solidus_paypal_commerce_platform` is still in progress.", :yellow
-end
-
-if @selected_frontend == 'classic'
-  version = '< 1'
-  migrations_flag = options[:migrate] ? '--auto-run-migrations' : '--skip-migrations'
-else
-  version = '~> 1.0'
-  migrations_flag = "--migrate=#{options[:migrate]}"
-end
-
 unless Bundler.locked_gems.dependencies['solidus_paypal_commerce_platform']
-  bundle_command "add solidus_paypal_commerce_platform --version='#{version}'"
+  bundle_command "add solidus_paypal_commerce_platform --version='~> 1.0'"
 end
 
-generate "solidus_paypal_commerce_platform:install #{migrations_flag}"
+generate "solidus_paypal_commerce_platform:install --migrate=#{options[:migrate]}"

data/lib/generators/solidus/install/app_templates/payment_method/stripe.rb

@@ -0,0 +1,5 @@
+unless Bundler.locked_gems.dependencies['solidus_stripe']
+  bundle_command "add solidus_stripe --version '~> 5.a'"
+end
+
+generate 'solidus_stripe:install'

data/lib/generators/solidus/install/install_generator.rb

@@ -11,70 +11,37 @@ module Solidus
 
     CORE_MOUNT_ROUTE = "mount Spree::Core::Engine"
 
-    FRONTENDS = %w[
-      none
-      classic
-      starter
+    FRONTENDS = [
+      { name: 'starter', description: 'Generate all necessary controllers and views directly in your Rails app', default: true },
+      { name: 'none', description: 'Skip installing a frontend' }
     ]
 
-    LEGACY_FRONTENDS = %w[
-      solidus_starter_frontend
-      solidus_frontend
-    ]
-
-    AUTHENTICATIONS = %w[
-      devise
-      existing
-      custom
-      none
+    AUTHENTICATIONS = [
+      { name: 'devise', description: 'Install and configure the standard `devise` integration', default: true },
+      { name: 'existing', description: 'Integrate and configure an existing `devise` setup' },
+      { name: 'custom', description: 'A starter configuration for rolling your own authentication system' },
+      { name: 'none', description: 'Don\'t add any configuration for authentication' }
     ]
 
     PAYMENT_METHODS = [
-      {
-        name: 'paypal',
-        frontends: %w[none classic starter],
-        description: 'Install `solidus_paypal_commerce_platform`',
-        default: true,
-      },
-      {
-        name: 'bolt',
-        frontends: %w[classic],
-        description: 'Install `solidus_bolt`',
-        default: false,
-      },
-      {
-        name: 'braintree',
-        frontends: %w[none starter],
-        description: 'Install `solidus_braintree`',
-        default: false,
-      },
-      {
-        name: 'none',
-        frontends: %w[none classic starter],
-        description: 'Skip installing a payment method',
-        default: false,
-      },
+      { name: 'paypal', description: 'Install `solidus_paypal_commerce_platform`', default: true },
+      { name: 'stripe', description: 'Install `solidus_stripe`', default: false },
+      { name: 'braintree', description: 'Install `solidus_braintree`', default: false },
+      { name: 'none', description: 'Skip installing a payment method', default: false }
     ]
 
     class_option :migrate, type: :boolean, default: true, banner: 'Run Solidus migrations'
     class_option :seed, type: :boolean, default: true, banner: 'Load seed data (migrations must be run)'
     class_option :sample, type: :boolean, default: true, banner: 'Load sample data (migrations and seeds must be run)'
-    class_option :active_storage, type: :boolean, default: (
-      Rails.gem_version >= Gem::Version.new("6.1.0")
-    ), banner: 'Install ActiveStorage as image attachments handler for products and taxons'
+    class_option :active_storage, type: :boolean, default: true, banner: 'Install ActiveStorage as image attachments handler for products and taxons'
     class_option :auto_accept, type: :boolean
     class_option :user_class, type: :string
     class_option :admin_email, type: :string
     class_option :admin_password, type: :string
 
-    class_option :frontend, type: :string, enum: FRONTENDS + LEGACY_FRONTENDS, default: nil, desc: "Indicates which frontend to install."
-    class_option :authentication, type: :string, enum: AUTHENTICATIONS, default: nil, desc: "Indicates which authentication system to install."
-    class_option :payment_method, type: :string, enum: PAYMENT_METHODS.map { |payment_method| payment_method[:name] }, default: nil, desc: "Indicates which payment method to install."
-
-    # DEPRECATED
-    class_option :with_authentication, type: :boolean, hide: true, default: nil
-    class_option :enforce_available_locales, type: :boolean, hide: true, default: nil
-    class_option :lib_name, type: :string, hide: true, default: nil
+    class_option :frontend, type: :string, enum: FRONTENDS.map { _1[:name] }, default: nil, desc: "Indicates which frontend to install."
+    class_option :authentication, type: :string, enum: AUTHENTICATIONS.map { _1[:name] }, default: nil, desc: "Indicates which authentication system to install."
+    class_option :payment_method, type: :string, enum: PAYMENT_METHODS.map { _1[:name] }, default: nil, desc: "Indicates which payment method to install."
 
     source_root "#{__dir__}/templates"
 
@@ -86,27 +53,37 @@ module Solidus
       @run_migrations = options[:migrate]
       @load_seed_data = options[:seed] && @run_migrations
       @load_sample_data = options[:sample] && @run_migrations && @load_seed_data
-      @selected_frontend = detect_frontend_to_install
-      @selected_authentication = detect_authentication_to_install
-      @selected_payment_method = detect_payment_method_to_install
+
+      @selected_frontend = selected_option_for(
+        'frontend',
+        selected: ENV['FRONTEND'] || options[:frontend],
+        available_options: FRONTENDS,
+      )
+
+      @selected_authentication = selected_option_for(
+        'authentication',
+        selected:
+          ('devise' if @selected_frontend == 'starter') ||
+          ('devise' if has_gem?('solidus_auth_devise')) ||
+          ENV['AUTHENTICATION'] || options[:authentication],
+        available_options: AUTHENTICATIONS,
+      )
+
+      @selected_payment_method = selected_option_for(
+        'payment method',
+        selected:
+          ('paypal' if has_gem?('solidus_paypal_commerce_platform')) ||
+          ('stripe' if has_gem?('solidus_stripe')) ||
+          ('bolt' if has_gem?('solidus_bolt')) ||
+          ENV['PAYMENT_METHOD'] || options[:payment_method],
+        available_options: PAYMENT_METHODS,
+      )
 
       # Silence verbose output (e.g. Rails migrations will rely on this environment variable)
       ENV['VERBOSE'] = 'false'
 
       # No reason to check for their presence if we're about to install them
       ENV['SOLIDUS_SKIP_MIGRATIONS_CHECK'] = 'true'
-
-      if options[:enforce_available_locales] != nil
-        warn \
-          "DEPRECATION WARNING: using `solidus:install --enforce-available-locales` is now deprecated and has no effect. " \
-          "Since Rails 4.1 the default is `true` so we no longer need to explicitly set a value."
-      end
-
-      if options[:lib_name] != nil
-        warn \
-          "DEPRECATION WARNING: using `solidus:install --lib-name` is now deprecated and has no effect. " \
-          "The option is legacy and should be removed from scripts still using it."
-      end
     end
 
     def add_files
@@ -119,7 +96,7 @@ module Solidus
         rake 'active_storage:install'
       else
         say_status :assets, "Paperclip", :green
-        gsub_file 'config/initializers/spree.rb', "::ActiveStorageAttachment", "::PaperclipAttachment"
+        gsub_file 'config/initializers/spree.rb', "ActiveStorageAttachment", "PaperclipAttachment"
       end
     end
 
@@ -181,15 +158,9 @@ module Solidus
       end
     end
 
-    def install_authentication
+    def install_subcomponents
       apply_template_for :authentication, @selected_authentication
-    end
-
-    def install_frontend
       apply_template_for :frontend, @selected_frontend
-    end
-
-    def install_payment_method
       apply_template_for :payment_method, @selected_payment_method
     end
 
@@ -271,93 +242,28 @@ module Solidus
       end
     end
 
-    def detect_frontend_to_install
-      # We need to support names that were available in v3.2
-      selected_frontend = 'starter' if options[:frontend] == 'solidus_starter_frontend'
-      selected_frontend = 'classic' if options[:frontend] == 'solidus_frontend'
-      selected_frontend ||= options[:frontend]
-
-      ENV['FRONTEND'] ||
-        selected_frontend ||
-        (Bundler.locked_gems.dependencies['solidus_frontend'] && 'classic') ||
-        (options[:auto_accept] && 'starter') ||
-        ask_with_description(
-          default: 'starter',
-          limited_to: FRONTENDS,
-          desc: <<~TEXT
-            Which frontend would you like to use?
-
-            - [#{set_color 'starter', :bold}] Generate all necessary controllers and views directly in your Rails app (#{set_color :default, :bold}).
-            - [#{set_color 'classic', :bold}] Install `solidus_frontend`, was the default in previous solidus versions (#{set_color :deprecated, :bold}).
-            - [#{set_color 'none', :bold}] Skip installing a frontend.
-
-            Selecting `starter` is recommended, however, some extensions are still only compatible with `classic`.
-          TEXT
-        )
+    def has_gem?(name)
+      Bundler.locked_gems.dependencies[name]
     end
 
-    def detect_authentication_to_install
-      return 'devise' if @selected_frontend == 'starter'
-
-      if options[:with_authentication] != nil
-        say_status :warning, \
-          "Using `solidus:install --with-authentication` is now deprecated. " \
-          "Please use `--authentication` instead (see --help for the full list of options).",
-          :red
-
-        if options[:with_authentication] == 'false'
-          # Don't use the default authentication if the user explicitly
-          # requested no authentication system.
-          return 'none'
-        else
-          return 'devise'
-        end
-      end
-
-      ENV['AUTHENTICATION'] ||
-        options[:authentication] ||
-        (Bundler.locked_gems.dependencies['solidus_auth_devise'] && 'devise') ||
-        (options[:auto_accept] && 'devise') ||
-        ask_with_description(
-          default: 'devise',
-          limited_to: AUTHENTICATIONS,
-          desc: <<~TEXT
-            Which authentication would you like to use?
-
-            - [#{set_color 'devise', :bold}] Install and configure the standard `devise` integration. (#{set_color :default, :bold}).
-            - [#{set_color 'existing', :bold}] Integrate and configure an existing `devise` setup.
-            - [#{set_color 'custom', :bold}] A starter configuration for rolling your own authentication system.
-            - [#{set_color 'none', :bold}] Don't add any configuration for authentication.
-
-            Selecting `devise` is recommended.
-          TEXT
-        )
-    end
+    def selected_option_for(name, selected:, available_options:)
+      return selected if selected
 
-    def detect_payment_method_to_install
-      return 'paypal' if Bundler.locked_gems.dependencies['solidus_paypal_commerce_platform']
-      return 'bolt' if Bundler.locked_gems.dependencies['solidus_bolt']
+      option_description = ->(name:, description:, default: false, **) do
+        default_label = " (#{set_color :default, :bold})" if default
 
-      selected_frontend_payment_methods = PAYMENT_METHODS.select do |payment_method|
-        payment_method[:frontends].include?(@selected_frontend)
+        "- [#{set_color name, :bold}] #{description}#{default_label}."
       end
 
-      selected = options[:payment_method] || (options[:auto_accept] && 'paypal') ||
-        ask_with_description(
-          default: 'paypal',
-          limited_to: selected_frontend_payment_methods.map { |payment_method| payment_method[:name] },
-          desc: <<~TEXT
-            Which payment method would you like to use?
-
-            #{selected_frontend_payment_methods.map { |payment_method| formatted_payment_method_description(payment_method) }.join("\n")}
-          TEXT
-        )
-    end
-
-    def formatted_payment_method_description(payment_method)
-      default_label = " (#{set_color :default, :bold})" if payment_method[:default]
-
-      "- [#{set_color payment_method[:name], :bold}] #{payment_method[:description]}#{default_label}."
+      default = available_options.find { _1[:default] }
+      (options[:auto_accept] && default[:name]) || ask_with_description(
+        default: default[:name],
+        limited_to: available_options.map { _1[:name] },
+        desc: <<~TEXT
+          Which #{name} would you like to use?
+          #{available_options.map { option_description[**_1] }.join("\n")}
+        TEXT
+      )
     end
   end
 end

data/lib/spree/app_configuration.rb

@@ -21,7 +21,6 @@ require "spree/core/search/base"
 require "spree/core/search/variant"
 require 'spree/preferences/configuration'
 require 'spree/core/environment'
-require 'spree/rails_compatibility'
 
 module Spree
   class AppConfiguration < Preferences::Configuration
@@ -61,27 +60,6 @@ module Spree
     #   @return [Boolean] When false, customers must create an account to complete an order (default: +true+)
     preference :allow_guest_checkout, :boolean, default: true
 
-    # @!attribute [rw] allow_promotions_any_match_policy
-    #   @return [Boolean] When false, admins cannot create promotions with an "any" match policy (default: +false+)
-    #                     Create individual, separate promotions for each of your rules instead.
-    preference :allow_promotions_any_match_policy, :boolean, default: false
-    def allow_promotions_any_match_policy=(value)
-      if value == true
-        Spree::Deprecation.warn <<~MSG
-          Solidus 4.0 will remove support for combining promotion rules with the "any" match policy.
-
-          Instead, it's suggested to create individual, separate promotions for each of your current
-          rules combined with the "any" policy. To automate this task, you can use the provided
-          task:
-
-                  bin/rake solidus:split_promotions_with_any_match_policy
-        MSG
-      end
-
-      preferences[:allow_promotions_any_match_policy] = value
-    end
-
-
     # @!attribute [rw] guest_token_cookie_options
     #   @return [Hash] Add additional guest_token cookie options here (ie. domain or path)
     preference :guest_token_cookie_options, :hash, default: {}
@@ -171,38 +149,6 @@ module Spree
     #   @return [Regexp] Regex to be used in email validations, for example in Spree::EmailValidator
     preference :default_email_regexp, :regexp, default: URI::MailTo::EMAIL_REGEXP
 
-    # @!attribute [rw] extra_taxon_validations
-    #   Use extra validations on Taxons in 3.4.0, but default to false so stores can
-    #   upgrade and then fix any now invalid Taxons before enabling.
-    #   @return [Boolean]
-    versioned_preference :extra_taxon_validations, :boolean, initial_value: false, boundaries: { "3.4.0.dev" => true }
-    def extra_taxon_validations=(value)
-      Spree::Deprecation.warn <<~MSG
-        Solidus will remove `Spree::Config.extra_taxon_validations` preference
-        in the next major release and will always use the extra Taxon validations.
-        Before upgrading to the next major, please fix any now invalid Taxons
-        and then remove the preference definition in `config/initializers/spree.rb`.
-      MSG
-
-      preferences[:extra_taxon_validations] = value
-    end
-
-    # @!attribute [rw] extra_taxonomy_validations
-    #   Use extra validations on Taxonomies in 3.4.0, but default to false so stores can
-    #   upgrade and then fix any now invalid Taxonomies before enabling.
-    #   @return [Boolean]
-    versioned_preference :extra_taxonomy_validations, :boolean, initial_value: false, boundaries: { "3.4.0.dev" => true }
-    def extra_taxonomy_validations=(value)
-      Spree::Deprecation.warn <<~MSG
-        Solidus will remove `Spree::Config.extra_taxonomy_validations` preference
-        in the next major release and will always use the extra Taxonomy validations.
-        Before upgrading to the next major, please fix any now invalid Taxons
-        and then remove the preference definition in `config/initializers/spree.rb`.
-      MSG
-
-      preferences[:extra_taxonomy_validations] = value
-    end
-
     # @!attribute [rw] generate_api_key_for_all_roles
     #   @return [Boolean] Allow generating api key automatically for user
     #   at role_user creation for all roles. (default: +false+)
@@ -239,20 +185,6 @@ module Spree
     #     entity expansion attacks.
     preference :log_entry_allow_aliases, :boolean, default: true
 
-    # @!attribute [rw] mails_from
-    #   @return [String] Email address used as +From:+ field in transactional emails.
-    #   @deprecated Spree::Store#mail_from_address is used instead
-    preference :mails_from, :string, default: 'solidus@example.com'
-    def mails_from=(value)
-      Spree::Deprecation.warn(<<~MSG) && preferences[:mail_from] = value
-        Solidus doesn't use `Spree::Config.mails_from` preference and it'll
-        removed on the next major release. Please, remove its definition in
-        `config/initializers/spree.rb`. Use the `Spree::Store#mail_from_address`
-        attribute for the default email address used as the 'From:' field in
-        transactional emails.
-      MSG
-    end
-
     # @!attribute [rw] max_level_in_taxons_menu
     #   @return [Integer] maximum nesting level in taxons menu (default: +1+)
     preference :max_level_in_taxons_menu, :integer, default: 1
@@ -347,14 +279,6 @@ module Spree
     #   @return [] Track on_hand values for variants / products. (default: true)
     preference :track_inventory_levels, :boolean, default: true
 
-    # @!attribute [rw] use_legacy_events
-    #   Before v3.2, Solidus used a custom pub/sub implementation based on
-    #   ActiveSupport::Notifications. Now, we internally use and recommend
-    #   [Omnes](https://github.com/nebulab/omnes). This preference allows falling
-    #   back to the old system.
-    #   @return [Boolean]
-    versioned_preference :use_legacy_events, :boolean, initial_value: true, boundaries: { "3.2.0.alpha" => false }
-
     # Other configurations
 
     # Allows restricting what currencies will be available.
@@ -566,7 +490,7 @@ module Spree
     # @!attribute [rw] image_attachment_module
     # @return [Module] a module that can be included into Spree::Image to allow attachments
     # Enumerable of images adhering to the present_image_class interface
-    class_name_attribute :image_attachment_module, default: Spree::RailsCompatibility.default_image_attachment_module
+    class_name_attribute :image_attachment_module, default: "Spree::Image::ActiveStorageAttachment"
 
     # @!attribute [rw] allowed_image_mime_types
     #
@@ -633,7 +557,7 @@ module Spree
     # @!attribute [rw] taxon_attachment_module
     # @return [Module] a module that can be included into Spree::Taxon to allow attachments
     # Enumerable of taxons adhering to the present_taxon_class interface
-    class_name_attribute :taxon_attachment_module, default: Spree::RailsCompatibility.default_taxon_attachment_module
+    class_name_attribute :taxon_attachment_module, default: "Spree::Taxon::ActiveStorageAttachment"
 
     # Configures the absolute path that contains the Solidus engine
     # migrations. This will be checked at app boot to confirm that all Solidus
@@ -676,10 +600,6 @@ module Spree
       end
     end
 
-    def events
-      @events_configuration ||= Spree::Event::Configuration.new
-    end
-
     def user_last_url_storer_rules
       @user_last_url_storer_rules ||= ::Spree::Core::ClassConstantizer::Set.new.tap do |set|
         set << 'Spree::UserLastUrlStorer::Rules::AuthenticationRule'

data/lib/spree/bus.rb

@@ -5,16 +5,5 @@ module Spree
   #
   # This is used for internal events, while host applications are also able to
   # use it.
-  #
-  # It has some modifications to support internal usage of the legacy event
-  # system {see Spree::AppConfiguration#use_legacy_events}.
   Bus = Omnes::Bus.new
-  def Bus.publish(event, **kwargs)
-    if Spree::Config.use_legacy_events
-      Spree::Event.fire(event, **kwargs)
-    else
-      # Override caller_location to point to the actual event publisher
-      super(event, **kwargs, caller_location: caller_locations(1)[0])
-    end
-  end
 end

data/lib/spree/core/controller_helpers/auth.rb

@@ -17,7 +17,6 @@ module Spree
 
         included do
           before_action :set_guest_token
-          helper_method :try_spree_current_user
           helper_method :spree_current_user
 
           class_attribute :unauthorized_redirect
@@ -58,21 +57,6 @@ module Spree
         def spree_current_user
           defined?(super) ? super : nil
         end
-
-        # proxy method to *possible* spree_current_user method
-        # Authentication extensions (such as spree_auth_devise) are meant to provide spree_current_user
-        def try_spree_current_user
-          # This one will be defined by apps looking to hook into Spree
-          # As per authentication_helpers.rb
-          if respond_to?(:spree_current_user, true)
-            spree_current_user
-          # This one will be defined by Devise
-          elsif respond_to?(:current_spree_user, true)
-            current_spree_user
-          end
-        end
-
-        deprecate try_spree_current_user: :spree_current_user, deprecator: Spree::Deprecation
       end
     end
   end

data/lib/spree/core/engine.rb

@@ -52,27 +52,17 @@ module Spree
 
       # Setup pub/sub
       initializer 'spree.core.pub_sub' do |app|
-        if Spree::Config.use_legacy_events
-          app.reloader.to_prepare do
-            Spree::Event.activate_autoloadable_subscribers
-          end
-
-          app.reloader.before_class_unload do
-            Spree::Event.deactivate_all_subscribers
-          end
-        else
-          app.reloader.to_prepare do
-            Spree::Bus.clear
-
-            %i[
-              order_finalized
-              order_recalculated
-              reimbursement_reimbursed
-              reimbursement_errored
-            ].each { |event_name| Spree::Bus.register(event_name) }
-
-            Spree::OrderMailerSubscriber.new.subscribe_to(Spree::Bus)
-          end
+        app.reloader.to_prepare do
+          Spree::Bus.clear
+
+          %i[
+            order_finalized
+            order_recalculated
+            reimbursement_reimbursed
+            reimbursement_errored
+          ].each { |event_name| Spree::Bus.register(event_name) }
+
+          Spree::OrderMailerSubscriber.new.subscribe_to(Spree::Bus)
         end
       end
 
@@ -97,16 +87,6 @@ module Spree
           Spree::UsersController.protect_from_forgery with: :exception
         end
       end
-
-      config.after_initialize do
-        if Spree::Config.use_legacy_events && !ENV['CI']
-          Spree::Deprecation.warn <<~MSG
-            Your Solidus store is using the legacy event system. You're
-            encouraged to switch to the new event bus. After you're done, you
-            can remove the `use_legacy_events` setting from `spree.rb`.
-          MSG
-        end
-      end
     end
   end
 end

data/lib/spree/core/validators/email.rb

@@ -12,10 +12,6 @@ module Spree
   #     end
   #
   class EmailValidator < ActiveModel::EachValidator
-    EMAIL_REGEXP = URI::MailTo::EMAIL_REGEXP
-    # Use Spree::Config.default_email_regexp instead
-    deprecate_constant :EMAIL_REGEXP
-
     def validate_each(record, attribute, value)
       unless Spree::Config.default_email_regexp.match? value
         record.errors.add(attribute, :invalid, **{ value: value }.merge!(options))

data/lib/spree/core/version.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "3.4.6"
+  VERSION = "4.0.0"
 
   def self.solidus_version
     VERSION
   end
 
   def self.previous_solidus_minor_version
-    '3.3'
+    '3.4'
   end
 
   def self.solidus_gem_version

data/lib/spree/core.rb

@@ -20,7 +20,6 @@ require 'ransack'
 require 'state_machines-activerecord'
 
 require 'spree/deprecation'
-require 'spree/rails_compatibility'
 
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.
@@ -94,7 +93,6 @@ require 'spree/core/environment/promotions'
 require 'spree/core/environment'
 require 'spree/migrations'
 require 'spree/migration_helpers'
-require 'spree/event'
 require 'spree/bus'
 require 'spree/core/engine'
 

data/lib/spree/migration_helpers.rb

@@ -6,9 +6,9 @@ module Spree
       remove_index(table, column) if index_exists?(table, column)
     end
 
-    def safe_add_index(table, column, **options)
-      if columns_exist?(table, column) && !index_exists?(table, column, **options)
-        add_index(table, column, **options)
+    def safe_add_index(table, column, options = {})
+      if columns_exist?(table, column) && !index_exists?(table, column, options)
+        add_index(table, column, options)
       end
     end