Merge branch 'release-1.12'

CHANGELOG.md

@@ -292,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
 

Gemfile

@@ -10,12 +10,13 @@ if ENV["DRY_CONFIGURABLE_FROM_MAIN"].eql?("true")
   gem "dry-configurable", github: "dry-rb/dry-configurable", branch: "main"
 end
 
-gem "dry-logic", github: "dry-rb/dry-logic", branch: "main"
-gem "dry-types", github: "dry-rb/dry-types", branch: "main"
+if ENV["DRY_LOGIC_FROM_MAIN"].eql?("true")
+  gem "dry-logic", github: "dry-rb/dry-logic", branch: "main"
+end
 
 group :test do
   gem "dry-monads", require: false, github: "dry-rb/dry-monads", branch: "main"
-  gem "dry-struct", github: "dry-rb/dry-struct", branch: "main"
+  gem "dry-struct", require: false, github: "dry-rb/dry-struct", branch: "main"
   gem "i18n", "1.8.2", require: false
   gem "json-schema"
   gem "transproc"

dry-schema.gemspec

@@ -34,13 +34,12 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
-  spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
+  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_runtime_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

lib/dry/schema/type_container.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "dry/core/container"
+require "dry/types"
+
 module Dry
   module Schema
     # A class to build containers for custom types, which can be used in schemas
@@ -10,7 +13,7 @@ module Dry
     #
     # @api public
     class TypeContainer
-      include Core::Container::Mixin
+      include Dry::Core::Container::Mixin
 
       def initialize(types_container = ::Dry::Types.container)
         super()

project.yml

@@ -19,5 +19,5 @@ gemspec:
     - [dry-core, "~> 1.0", "< 2"]
     - [dry-configurable, "~> 1.0", "< 2"]
     - [dry-initializer, "~> 3.0"]
-    - [dry-logic, "~> 1.4"]
-    - [dry-types, "~> 1.7"]
+    - [dry-logic, ">= 1.4", "< 2"]
+    - [dry-types, ">= 1.7", "< 2"]