diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a05cb37..83a5c150 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ and this project adheres to [Break Versioning](https://www.taoensso.com/break-ve ### Changed +- `hanami new` puts `dry-validation` in the app's `Gemfile` instead of `hanami-validations`. Hanami Validations will no longer be used; Hanami Action now checks for Dry Validation directly. (@timriley) + ### Deprecated ### Removed diff --git a/lib/hanami/cli/generators/gem/app/gemfile.erb b/lib/hanami/cli/generators/gem/app/gemfile.erb index d799b0fd..73575e46 100644 --- a/lib/hanami/cli/generators/gem/app/gemfile.erb +++ b/lib/hanami/cli/generators/gem/app/gemfile.erb @@ -15,13 +15,13 @@ source "<%= gem_source %>" <%= hanami_gem("db") %> <%- end -%> <%= hanami_gem("router") %> -<%= hanami_gem("validations") %> <%- if generate_view? -%> <%= hanami_gem("view") %> <%- end -%> gem "dry-types", "~> 1.7" gem "dry-operation", ">= 1.0.1" +gem "dry-validation", "~> 1.11" gem "puma", ">= 7.1" gem "rake" <%- if generate_sqlite? -%> diff --git a/spec/unit/hanami/cli/commands/gem/new_spec.rb b/spec/unit/hanami/cli/commands/gem/new_spec.rb index 782b1199..c986c151 100644 --- a/spec/unit/hanami/cli/commands/gem/new_spec.rb +++ b/spec/unit/hanami/cli/commands/gem/new_spec.rb @@ -163,11 +163,11 @@ gem "hanami-controller", "#{hanami_version}" gem "hanami-db", "#{hanami_version}" gem "hanami-router", "#{hanami_version}" - gem "hanami-validations", "#{hanami_version}" gem "hanami-view", "#{hanami_version}" gem "dry-types", "~> 1.7" gem "dry-operation", ">= 1.0.1" + gem "dry-validation", "~> 1.11" gem "puma", ">= 7.1" gem "rake" gem "sqlite3" @@ -567,11 +567,11 @@ class Operation < Dry::Operation gem "hanami-controller", github: "hanami/hanami-controller", branch: "main" gem "hanami-db", github: "hanami/hanami-db", branch: "main" gem "hanami-router", github: "hanami/hanami-router", branch: "main" - gem "hanami-validations", github: "hanami/hanami-validations", branch: "main" gem "hanami-view", github: "hanami/hanami-view", branch: "main" gem "dry-types", "~> 1.7" gem "dry-operation", ">= 1.0.1" + gem "dry-validation", "~> 1.11" gem "puma", ">= 7.1" gem "rake" gem "sqlite3" @@ -728,11 +728,11 @@ class Operation < Dry::Operation gem "hanami-controller", "#{hanami_version}" gem "hanami-db", "#{hanami_version}" gem "hanami-router", "#{hanami_version}" - gem "hanami-validations", "#{hanami_version}" gem "hanami-view", "#{hanami_version}" gem "dry-types", "~> 1.7" gem "dry-operation", ">= 1.0.1" + gem "dry-validation", "~> 1.11" gem "puma", ">= 7.1" gem "rake" gem "sqlite3"