From f72b97f7d52354170cbb7a254d8d25b34ae7d0a7 Mon Sep 17 00:00:00 2001 From: Kyle Plump Date: Tue, 31 Dec 2024 09:57:36 -0500 Subject: [PATCH 1/2] rack3 upgrade --- Gemfile | 10 +++++----- hanami-cli.gemspec | 1 + lib/hanami/cli/server.rb | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index d695fadb..32f3f703 100644 --- a/Gemfile +++ b/Gemfile @@ -11,20 +11,20 @@ end gem "hanami", github: "hanami/hanami", branch: "main" gem "hanami-assets", github: "hanami/assets", branch: "main" -gem "hanami-controller", github: "hanami/controller", branch: "main" +gem "hanami-controller", github: "kyleplump/controller", branch: "rack3" gem "hanami-db", github: "hanami/db", branch: "main" -gem "hanami-router", github: "hanami/router", branch: "main" -gem "hanami-utils", github: "hanami/utils", branch: "main" +gem "hanami-router", github: "kyleplump/router", branch: "rack3" +gem "hanami-utils" gem "dry-system", github: "dry-rb/dry-system", branch: "main" -gem "rack" +gem "rack", "~> 3.1" gem "mysql2" gem "pg" gem "sqlite3" -gem "hanami-devtools", github: "hanami/devtools", branch: "main" +gem "hanami-devtools", github: "kyleplump/devtools", branch: "rack3" group :test do gem "pry" diff --git a/hanami-cli.gemspec b/hanami-cli.gemspec index f5859834..563413c6 100644 --- a/hanami-cli.gemspec +++ b/hanami-cli.gemspec @@ -36,6 +36,7 @@ Gem::Specification.new do |spec| spec.add_dependency "dry-inflector", "~> 1.0", "< 2" spec.add_dependency "rake", "~> 13.0" spec.add_dependency "zeitwerk", "~> 2.6" + spec.add_dependency "rackup" spec.add_development_dependency "rspec", "~> 3.9" spec.add_development_dependency "rubocop", "~> 1.0" diff --git a/lib/hanami/cli/server.rb b/lib/hanami/cli/server.rb index df75dc42..99b7baca 100644 --- a/lib/hanami/cli/server.rb +++ b/lib/hanami/cli/server.rb @@ -26,7 +26,7 @@ class Server # @since 2.0.0 # @api private - def initialize(rack_server: Rack::Server) + def initialize(rack_server: Rackup::Server) @rack_server = rack_server end From 079162cdbfc476162c3da282ac5c0ab815ec4c1e Mon Sep 17 00:00:00 2001 From: Kyle Plump Date: Tue, 31 Dec 2024 10:11:10 -0500 Subject: [PATCH 2/2] gemfile fix --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 32f3f703..db8da8bd 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem "hanami-assets", github: "hanami/assets", branch: "main" gem "hanami-controller", github: "kyleplump/controller", branch: "rack3" gem "hanami-db", github: "hanami/db", branch: "main" gem "hanami-router", github: "kyleplump/router", branch: "rack3" -gem "hanami-utils" +gem "hanami-utils", github: "hanami/utils", branch: "main" gem "dry-system", github: "dry-rb/dry-system", branch: "main"