Skip to content

Commit ffe1aab

Browse files
authored
Require Elixir 1.11+ (#430)
1 parent c5f3ed6 commit ffe1aab

File tree

4 files changed

+5
-21
lines changed

4 files changed

+5
-21
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
include:
17-
- erlang: "26.0.2"
18-
elixir: "1.15"
17+
- erlang: "26.2"
18+
elixir: "1.16"
1919
lint: true
2020
coverage: true
2121
dialyzer: true
@@ -25,7 +25,7 @@ jobs:
2525
elixir: "1.11"
2626
dialyzer: true
2727
- erlang: "21.3"
28-
elixir: "1.10"
28+
elixir: "1.11.4-otp-21"
2929
env:
3030
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3131
MIX_ENV: test

lib/mint/http.ex

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,6 @@ defmodule Mint.HTTP do
128128

129129
@opaque t() :: Mint.HTTP1.t() | Mint.HTTP2.t()
130130

131-
# TODO: Remove once we depend on Elixir 1.11+, which defines is_struct/2
132-
if not macro_exported?(Kernel, :is_struct, 2) do
133-
defguardp is_struct(struct, module)
134-
when is_map(struct) and is_atom(module) and is_map_key(struct, :__struct__) and
135-
:erlang.map_get(:__struct__, struct) == module
136-
end
137-
138131
defguardp is_data_message(message)
139132
when elem(message, 0) in [:ssl, :tcp] and tuple_size(message) == 3
140133

lib/mint/http2.ex

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -232,22 +232,13 @@ defmodule Mint.HTTP2 do
232232
conn = unquote(conn)
233233

234234
if conn.log do
235-
Logger.log(normalize_logger_level(unquote(level)), unquote(message))
235+
Logger.log(unquote(level), unquote(message))
236236
else
237237
:ok
238238
end
239239
end
240240
end
241241

242-
# TODO: remove this once we depend on Elixir 1.11+.
243-
if macro_exported?(Logger, :warning, 2) do
244-
defp normalize_logger_level(:warning), do: :warning
245-
else
246-
defp normalize_logger_level(:warning), do: :warn
247-
end
248-
249-
defp normalize_logger_level(level), do: level
250-
251242
## Types
252243

253244
@typedoc """

mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ defmodule Mint.MixProject do
88
[
99
app: :mint,
1010
version: @version,
11-
elixir: "~> 1.10",
11+
elixir: "~> 1.11",
1212
start_permanent: Mix.env() == :prod,
1313
elixirc_paths: elixirc_paths(Mix.env()),
1414
deps: deps(),

0 commit comments

Comments
 (0)