Skip to content

Commit 81553f0

Browse files
authored
Merge pull request #1372 from absinthe-graphql/cschiewek/elixir-1.19
Updates for Elixir 1.19
2 parents a555ed7 + 259d25e commit 81553f0

File tree

4 files changed

+14
-18
lines changed

4 files changed

+14
-18
lines changed

.github/workflows/elixir.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,16 @@ jobs:
1818
- "1.16"
1919
- "1.17"
2020
- "1.18"
21+
- "1.19"
2122
otp:
2223
- "25"
2324
- "26"
2425
- "27"
2526
- "28"
2627
# see https://hexdocs.pm/elixir/compatibility-and-deprecations.html#between-elixir-and-erlang-otp
2728
exclude:
29+
- elixir: 1.19
30+
otp: 25
2831
- elixir: 1.17
2932
otp: 28
3033
- elixir: 1.16

lib/absinthe/language/render.ex

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -416,10 +416,6 @@ defmodule Absinthe.Language.Render do
416416
do_block(docs)
417417
end
418418

419-
defp block(:doc_nil, docs) do
420-
do_block(docs)
421-
end
422-
423419
defp block(name, docs) do
424420
glue(
425421
name,

mix.exs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@ defmodule Absinthe.Mixfile do
88
[
99
app: :absinthe,
1010
version: @version,
11-
elixir: "~> 1.11",
11+
elixir: "~> 1.15",
1212
elixirc_paths: elixirc_paths(Mix.env()),
1313
build_embedded: Mix.env() == :prod,
1414
start_permanent: Mix.env() == :prod,
1515
package: package(),
1616
source_url: @source_url,
17-
preferred_cli_env: [
18-
dialyzer: :test
19-
],
2017
docs: [
2118
source_ref: "v#{@version}",
2219
main: "overview",
@@ -39,6 +36,10 @@ defmodule Absinthe.Mixfile do
3936
]
4037
end
4138

39+
def cli do
40+
[preferred_envs: [dialyzer: :test]]
41+
end
42+
4243
defp package do
4344
[
4445
description: "GraphQL for Elixir",
@@ -82,7 +83,6 @@ defmodule Absinthe.Mixfile do
8283
{:ex_doc, "~> 0.22", only: :dev},
8384
{:benchee, ">= 1.0.0", only: :dev},
8485
{:dialyxir, "~> 1.1", only: [:dev, :test], runtime: false},
85-
{:mix_test_watch, "~> 1.0", only: :dev, runtime: false},
8686
{:makeup_graphql, "~> 0.1.0", only: :dev}
8787
]
8888
end

test/absinthe/subscription/pipeline_serializer_test.exs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,12 @@ defmodule Absinthe.Subscription.PipelineSerializerTest do
2828
{Phase4, [option1: :value1]}
2929
]
3030

31-
assert {:packed,
32-
[
33-
{Phase1, [:pack | 0]},
34-
Phase2,
35-
{Phase3, [:pack | 1]},
36-
{Phase4, [:pack | 0]}
37-
],
38-
%{0 => [option1: :value1], 1 => [option2: :value2]}} =
39-
PipelineSerializer.pack(pipeline)
31+
assert {:packed, config, options} = PipelineSerializer.pack(pipeline)
32+
33+
assert [{Phase1, [:pack | 0]}, Phase2, {Phase3, [:pack | 1]}, {Phase4, [:pack | 0]}] =
34+
config
35+
36+
assert %{0 => [option1: :value1], 1 => [option2: :value2]} = options
4037
end
4138

4239
test "packs variables and contexts in options" do

0 commit comments

Comments
 (0)