From 9a7912a3291ce4073097a432e59e45f11349d101 Mon Sep 17 00:00:00 2001 From: Peter Solnica Date: Fri, 4 Nov 2022 17:53:47 +0100 Subject: [PATCH 1/6] Use dry-struct from main --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 768ae29..ac1caa3 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ end group :test do gem "dry-monads", require: false, github: "dry-rb/dry-monads", branch: "main" - gem "dry-struct" + gem "dry-struct", require: false, github: "dry-rb/dry-struct", branch: "main" gem "i18n", "1.8.2", require: false gem "json-schema" gem "transproc" From e90203843ae386b5502afeae42e3828e87f4d61d Mon Sep 17 00:00:00 2001 From: Peter Solnica Date: Fri, 4 Nov 2022 17:40:15 +0100 Subject: [PATCH 2/6] Update to dry-core 1.0.0 --- Gemfile | 4 +++- dry-schema.gemspec | 10 +++++----- lib/dry/schema/type_container.rb | 4 ++-- project.yml | 8 ++++---- spec/integration/schema/custom_types_spec.rb | 4 ++-- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index ac1caa3..15d83ce 100644 --- a/Gemfile +++ b/Gemfile @@ -11,9 +11,11 @@ if ENV["DRY_CONFIGURABLE_FROM_MAIN"].eql?("true") end if ENV["DRY_LOGIC_FROM_MAIN"].eql?("true") - gem "dry-logic", github: "dry-rb/dry-logic", branch: "main" + gem "dry-logic", github: "dry-rb/dry-logic", branch: "release-1.4" end +gem "dry-types", github: "dry-rb/dry-types", branch: "main" + group :test do gem "dry-monads", require: false, github: "dry-rb/dry-monads", branch: "main" gem "dry-struct", require: false, github: "dry-rb/dry-struct", branch: "main" diff --git a/dry-schema.gemspec b/dry-schema.gemspec index bd2d0b3..6ec9541 100644 --- a/dry-schema.gemspec +++ b/dry-schema.gemspec @@ -35,12 +35,12 @@ Gem::Specification.new do |spec| # to update dependencies edit project.yml spec.add_runtime_dependency "concurrent-ruby", "~> 1.0" - spec.add_runtime_dependency "dry-configurable", "~> 0.16", ">= 0.16" - spec.add_runtime_dependency "dry-core", "~> 0.9", ">= 0.9" - spec.add_runtime_dependency "dry-initializer", "~> 3.0" - spec.add_runtime_dependency "dry-logic", "~> 1.3" - spec.add_runtime_dependency "dry-types", "~> 1.6" spec.add_runtime_dependency "zeitwerk", "~> 2.6" + spec.add_runtime_dependency "dry-configurable", "~> 1.0", "< 2" + spec.add_runtime_dependency "dry-core", "~> 1.0", "< 2" + spec.add_runtime_dependency "dry-initializer", "~> 3.0" + spec.add_runtime_dependency "dry-logic", ">= 1.4", "< 2" + spec.add_runtime_dependency "dry-types", ">= 1.7", "< 2" spec.add_development_dependency "bundler" spec.add_development_dependency "rake" diff --git a/lib/dry/schema/type_container.rb b/lib/dry/schema/type_container.rb index 98af232..5bb2aec 100644 --- a/lib/dry/schema/type_container.rb +++ b/lib/dry/schema/type_container.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "dry/container" +require "dry/core/container" require "dry/types" module Dry @@ -13,7 +13,7 @@ module Dry # # @api public class TypeContainer - include Dry::Container::Mixin + include Dry::Core::Container::Mixin def initialize(types_container = Dry::Types.container) super() diff --git a/project.yml b/project.yml index fb50351..94969e2 100644 --- a/project.yml +++ b/project.yml @@ -16,8 +16,8 @@ gemspec: runtime_dependencies: - [concurrent-ruby, "~> 1.0"] - [zeitwerk, "~> 2.6"] - - [dry-configurable, "~> 0.16", ">= 0.16"] - - [dry-core, "~> 0.9", ">= 0.9"] + - [dry-core, "~> 1.0", "< 2"] + - [dry-configurable, "~> 1.0", "< 2"] - [dry-initializer, "~> 3.0"] - - [dry-logic, "~> 1.3"] - - [dry-types, "~> 1.6"] + - [dry-logic, ">= 1.4", "< 2"] + - [dry-types, ">= 1.7", "< 2"] diff --git a/spec/integration/schema/custom_types_spec.rb b/spec/integration/schema/custom_types_spec.rb index 172b31e..5e5c36a 100644 --- a/spec/integration/schema/custom_types_spec.rb +++ b/spec/integration/schema/custom_types_spec.rb @@ -46,7 +46,7 @@ RSpec.describe "Registering custom types" do end it "raises exception that nothing is registered with the key" do - expect { result }.to raise_exception(Dry::Container::KeyError) + expect { result }.to raise_exception(Dry::Core::Container::KeyError) end end @@ -123,7 +123,7 @@ RSpec.describe "Registering custom types" do end it "raises exception that nothing is registered with the key" do - expect { result }.to raise_exception(Dry::Container::KeyError) + expect { result }.to raise_exception(Dry::Core::Container::KeyError) end end From 4e7f7007bbe016ea6d725098f0eb7c87d7f24d76 Mon Sep 17 00:00:00 2001 From: Peter Solnica Date: Fri, 4 Nov 2022 18:04:24 +0100 Subject: [PATCH 3/6] Use released dry-types 1.7 --- Gemfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gemfile b/Gemfile index 15d83ce..e80dd64 100644 --- a/Gemfile +++ b/Gemfile @@ -14,8 +14,6 @@ if ENV["DRY_LOGIC_FROM_MAIN"].eql?("true") gem "dry-logic", github: "dry-rb/dry-logic", branch: "release-1.4" end -gem "dry-types", github: "dry-rb/dry-types", branch: "main" - group :test do gem "dry-monads", require: false, github: "dry-rb/dry-monads", branch: "main" gem "dry-struct", require: false, github: "dry-rb/dry-struct", branch: "main" From 5aaed1b0236efd28d2563c81613b9aa2844c8be5 Mon Sep 17 00:00:00 2001 From: Peter Solnica Date: Fri, 4 Nov 2022 18:06:12 +0100 Subject: [PATCH 4/6] Update changelog.yml --- changelog.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.yml b/changelog.yml index 90df372..da69615 100644 --- a/changelog.yml +++ b/changelog.yml @@ -1,4 +1,8 @@ --- +- version: 1.12.0 + date: 2022-11-04 + changed: + - 'This version depends on dry-core 1.0 and dry-configurable 1.0 (@flash-gordon)' - version: 1.11.3 summary: date: 2022-10-21 From bc36e145892a3f8b6af4c2079c15ea7bc63be213 Mon Sep 17 00:00:00 2001 From: dry-bot Date: Fri, 4 Nov 2022 17:06:38 +0000 Subject: [PATCH 5/6] [devtools] sync --- CHANGELOG.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a895bcc..cd7b75d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ +## 1.12.0 2022-11-04 + + +### Changed + +- This version depends on dry-core 1.0 and dry-configurable 1.0 (@flash-gordon) + +[Compare v1.11.3...v1.12.0](https://github.com/dry-rb/dry-schema/compare/v1.11.3...v1.12.0) + ## 1.11.3 2022-10-21 @@ -283,7 +292,7 @@ This release ships with a bunch of internal refactorings that should improve per [Compare v1.5.4...v1.5.5](https://github.com/dry-rb/dry-schema/compare/v1.5.4...v1.5.5) -## 1.5.4 +## 1.5.4 2020-09-03 From d39a8b39e02a0a7f9330a2d58a147e11a032660c Mon Sep 17 00:00:00 2001 From: Peter Solnica Date: Fri, 4 Nov 2022 18:08:30 +0100 Subject: [PATCH 6/6] Bump dry-schema to 1.12.0 --- lib/dry/schema/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dry/schema/version.rb b/lib/dry/schema/version.rb index 42df209..e65ac94 100644 --- a/lib/dry/schema/version.rb +++ b/lib/dry/schema/version.rb @@ -2,6 +2,6 @@ module Dry module Schema - VERSION = "1.11.3" + VERSION = "1.12.0" end end