From f13a664457eb713ccfbb6bbf6e75a02884c81a74 Mon Sep 17 00:00:00 2001 From: Peter Solnica Date: Thu, 20 Oct 2022 17:33:57 +0200 Subject: [PATCH] Upgrade to zeitwerkified dry-rb deps Fixes #55 --- dry-rails.gemspec | 6 +++--- lib/dry/rails/auto_registrars/app.rb | 2 +- lib/dry/rails/container.rb | 4 +--- lib/dry/rails/features/application_contract.rb | 2 +- lib/dry/rails/features/safe_params.rb | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dry-rails.gemspec b/dry-rails.gemspec index 5856c99..1f51eef 100644 --- a/dry-rails.gemspec +++ b/dry-rails.gemspec @@ -29,9 +29,9 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.7.0" # to update dependencies edit project.yml - spec.add_runtime_dependency "dry-schema", "~> 1.7" - spec.add_runtime_dependency "dry-system", "~> 0.23", ">= 0.23" - spec.add_runtime_dependency "dry-validation", "~> 1.5" + spec.add_runtime_dependency "dry-schema", "~> 1.11", ">= 1.11.2" + spec.add_runtime_dependency "dry-system", "~> 0.27", ">= 0.27.2" + spec.add_runtime_dependency "dry-validation", "~> 1.9", ">= 1.9.0" spec.add_development_dependency "bundler" spec.add_development_dependency "rake" diff --git a/lib/dry/rails/auto_registrars/app.rb b/lib/dry/rails/auto_registrars/app.rb index e7c400d..fdaf3d5 100644 --- a/lib/dry/rails/auto_registrars/app.rb +++ b/lib/dry/rails/auto_registrars/app.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "dry/system/auto_registrar" +require "dry/system" module Dry module Rails diff --git a/lib/dry/rails/container.rb b/lib/dry/rails/container.rb index 8f4775b..8c4b5be 100644 --- a/lib/dry/rails/container.rb +++ b/lib/dry/rails/container.rb @@ -2,9 +2,7 @@ require "rails/version" -require "dry/system/container" -require "dry/system/provider_sources" - +require "dry/system" require "dry/rails/auto_registrars/app" module Dry diff --git a/lib/dry/rails/features/application_contract.rb b/lib/dry/rails/features/application_contract.rb index c461420..b3cbb90 100644 --- a/lib/dry/rails/features/application_contract.rb +++ b/lib/dry/rails/features/application_contract.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "dry/validation/contract" +require "dry/validation" module Dry module Rails diff --git a/lib/dry/rails/features/safe_params.rb b/lib/dry/rails/features/safe_params.rb index 00af6e1..bc095f0 100644 --- a/lib/dry/rails/features/safe_params.rb +++ b/lib/dry/rails/features/safe_params.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "dry/schema/params" +require "dry/schema" module Dry module Rails