From d74e440d739ce844d7eaf188d5e8840e04176195 Mon Sep 17 00:00:00 2001 From: Renan Martins <58703271+heynan0@users.noreply.github.com> Date: Tue, 6 Oct 2020 14:18:52 -0700 Subject: [PATCH] Update puma to 4.3.6 to avoid compilation problem in 4.3.5 with Xcode 12 (Reference https://github.com/puma/puma/pull/2314) --- Gemfile | 2 +- Gemfile.lock | 4 ++-- demo/Gemfile | 2 +- demo/Gemfile.lock | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 2014eb6283..f66c3ca53e 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem "rake", "~> 12.0" # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem "rails", rails_version == "master" ? { github: "rails/rails" } : rails_version # Use Puma as the app server -gem "puma", "~> 4.1" +gem "puma", "~> 4.3.6" # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker gem "webpacker", "~> 5.0" diff --git a/Gemfile.lock b/Gemfile.lock index 72990964b4..2586579faa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -123,7 +123,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.5) - puma (4.3.5) + puma (4.3.6) nio4r (~> 2.0) rack (2.2.3) rack-proxy (0.6.5) @@ -230,7 +230,7 @@ DEPENDENCIES primer_view_components! pry pry-rails - puma (~> 4.1) + puma (~> 4.3.6) rails (= 6.0.3.3) rake (~> 12.0) rubocop (= 0.74) diff --git a/demo/Gemfile b/demo/Gemfile index ec130deea8..b74922da2f 100644 --- a/demo/Gemfile +++ b/demo/Gemfile @@ -8,7 +8,7 @@ gem "rake", "~> 12.0" # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem "rails", rails_version == "master" ? { github: "rails/rails" } : rails_version # Use Puma as the app server -gem "puma", "~> 4.1" +gem "puma", "~> 4.3.6" # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker gem "webpacker", "~> 5.0" diff --git a/demo/Gemfile.lock b/demo/Gemfile.lock index d3de791dff..4a79d85908 100644 --- a/demo/Gemfile.lock +++ b/demo/Gemfile.lock @@ -116,7 +116,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.5) - puma (4.3.5) + puma (4.3.6) nio4r (~> 2.0) rack (2.2.3) rack-proxy (0.6.5) @@ -195,7 +195,7 @@ DEPENDENCIES minitest (~> 5.0) primer_view_components! pry-rails - puma (~> 4.1) + puma (~> 4.3.6) rails (= 6.0.3.3) rake (~> 12.0) spring