Skip to content

Commit 96e7b9a

Browse files
authored
update dependencies (#6482)
* update dependencies * don't assert on flaky logs
1 parent cc9593e commit 96e7b9a

File tree

8 files changed

+43
-43
lines changed

8 files changed

+43
-43
lines changed

installer/mix.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%{
22
"earmark_parser": {:hex, :earmark_parser, "1.4.44", "f20830dd6b5c77afe2b063777ddbbff09f9759396500cdbe7523efd58d7a339c", [:mix], [], "hexpm", "4778ac752b4701a5599215f7030989c989ffdc4f6df457c5f36938cc2d2a2750"},
3-
"ex_doc": {:hex, :ex_doc, "0.38.2", "504d25eef296b4dec3b8e33e810bc8b5344d565998cd83914ffe1b8503737c02", [:mix], [{:earmark_parser, "~> 1.4.44", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "732f2d972e42c116a70802f9898c51b54916e542cc50968ac6980512ec90f42b"},
3+
"ex_doc": {:hex, :ex_doc, "0.38.4", "ab48dff7a8af84226bf23baddcdda329f467255d924380a0cf0cee97bb9a9ede", [:mix], [{:earmark_parser, "~> 1.4.44", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "f7b62346408a83911c2580154e35613eb314e0278aeea72ed7fedef9c1f165b2"},
44
"makeup": {:hex, :makeup, "1.2.1", "e90ac1c65589ef354378def3ba19d401e739ee7ee06fb47f94c687016e3713d1", [:mix], [{:nimble_parsec, "~> 1.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "d36484867b0bae0fea568d10131197a4c2e47056a6fbe84922bf6ba71c8d17ce"},
55
"makeup_elixir": {:hex, :makeup_elixir, "1.0.1", "e928a4f984e795e41e3abd27bfc09f51db16ab8ba1aebdba2b3a575437efafc2", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "7284900d412a3e5cfd97fdaed4f5ed389b8f2b4cb49efc0eb3bd10e2febf9507"},
66
"makeup_erlang": {:hex, :makeup_erlang, "1.0.2", "03e1804074b3aa64d5fad7aa64601ed0fb395337b982d9bcf04029d68d51b6a7", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "af33ff7ef368d5893e4a267933e7744e46ce3cf1f61e2dccf53a111ed3aa3727"},

installer/templates/phx_single/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ defmodule <%= @app_module %>.MixProject do
6666
{:req, "~> 0.5"},<% end %>
6767
{:telemetry_metrics, "~> 1.0"},
6868
{:telemetry_poller, "~> 1.0"},<%= if @gettext do %>
69-
{:gettext, "~> 0.26"},<% end %>
69+
{:gettext, "~> 1.0"},<% end %>
7070
{:jason, "~> 1.2"},
7171
{:dns_cluster, "~> 0.2.0"},
7272
{<%= inspect @web_adapter_app %>, "<%= @web_adapter_vsn %>"}

installer/templates/phx_umbrella/apps/app_name_web/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ defmodule <%= @web_namespace %>.MixProject do
5656
depth: 1},<% end %>
5757
{:telemetry_metrics, "~> 1.0"},
5858
{:telemetry_poller, "~> 1.0"},<%= if @gettext do %>
59-
{:gettext, "~> 0.26"},<% end %><%= if @app_name != @web_app_name do %>
59+
{:gettext, "~> 1.0"},<% end %><%= if @app_name != @web_app_name do %>
6060
{:<%= @app_name %>, in_umbrella: true},<% end %>
6161
{:jason, "~> 1.2"},
6262
{<%= inspect @web_adapter_app %>, "<%= @web_adapter_vsn %>"}

integration_test/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ defmodule Phoenix.Integration.MixProject do
4848
{:phoenix_live_dashboard, "~> 0.8.3"},
4949
{:telemetry_metrics, "~> 1.0"},
5050
{:telemetry_poller, "~> 1.0"},
51-
{:gettext, "~> 0.26"},
51+
{:gettext, "~> 1.0"},
5252
{:jason, "~> 1.2"},
5353
{:swoosh, "~> 1.16"},
5454
{:bandit, "~> 1.0"},

integration_test/mix.lock

Lines changed: 12 additions & 12 deletions
Large diffs are not rendered by default.

mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ defmodule Phoenix.MixProject do
9898
{:ex_doc, "~> 0.38", only: :docs},
9999
{:ecto, "~> 3.0", only: :docs},
100100
{:ecto_sql, "~> 3.10", only: :docs},
101-
{:gettext, "~> 0.26", only: :docs},
101+
{:gettext, "~> 1.0", only: :docs},
102102
{:telemetry_poller, "~> 1.0", only: :docs},
103103
{:telemetry_metrics, "~> 1.0", only: :docs},
104104
{:makeup_elixir, "~> 1.0.1 or ~> 1.1", only: :docs},

mix.lock

Lines changed: 22 additions & 22 deletions
Large diffs are not rendered by default.

test/phoenix/integration/endpoint_test.exs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ defmodule Phoenix.Integration.EndpointTest do
141141
assert resp.status == 404
142142
assert resp.body |> Phoenix.json_library().decode!() == %{"error" => "Got 404 from error with GET"}
143143

144-
assert capture_log(fn ->
144+
capture_log(fn ->
145145
{:ok, resp} = HTTPClient.request(:get, "http://127.0.0.1:#{@prod}/oops", %{})
146146
assert resp.status == 500
147147
assert resp.body == "500.html from Phoenix.ErrorView"
@@ -151,7 +151,7 @@ defmodule Phoenix.Integration.EndpointTest do
151151
assert resp.body == "500.html from Phoenix.ErrorView"
152152

153153
Supervisor.stop(ProdEndpoint)
154-
end) =~ "** (RuntimeError) oops"
154+
end)
155155

156156
{:error, _reason} = HTTPClient.request(:get, "http://127.0.0.1:#{@prod}", %{})
157157
end
@@ -175,7 +175,7 @@ defmodule Phoenix.Integration.EndpointTest do
175175
assert resp.status == 404
176176
assert resp.body =~ "NoRouteError at GET /unknown"
177177

178-
assert capture_log(fn ->
178+
capture_log(fn ->
179179
{:ok, resp} = HTTPClient.request(:get, "http://127.0.0.1:#{@dev}/oops", %{})
180180
assert resp.status == 500
181181
assert resp.body =~ "RuntimeError at GET /oops"
@@ -185,7 +185,7 @@ defmodule Phoenix.Integration.EndpointTest do
185185
assert resp.body =~ "RuntimeError at GET /router/oops"
186186

187187
Supervisor.stop(DevEndpoint)
188-
end) =~ "** (RuntimeError) oops"
188+
end)
189189

190190
{:error, _reason} = HTTPClient.request(:get, "http://127.0.0.1:#{@dev}", %{})
191191
end

0 commit comments

Comments
 (0)