Skip to content

Commit 5f2cc0e

Browse files
san650jonasschmidt
andauthored
Remove elixir v1.19 deprecation warnings (#96)
* Remove elixir v1.19 deprecation warnings * Add elixir v1.19 to CI * Update lib/ex_json_schema/schema/ref.ex Co-authored-by: Jonas Schmidt <jonas.schmidt@wooga.net> * Update lib/ex_json_schema/schema/ref.ex Co-authored-by: Jonas Schmidt <jonas.schmidt@wooga.net> * Apply suggestions from code review Co-authored-by: Jonas Schmidt <jonas.schmidt@wooga.net> --------- Co-authored-by: Jonas Schmidt <jonas.schmidt@wooga.net>
1 parent f9acd49 commit 5f2cc0e

4 files changed

Lines changed: 11 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
otp: 25.3.2.9
2020
- elixir: 1.18.1
2121
otp: 27.2
22+
- elixir: 1.19.4
23+
otp: 28.3
2224
env:
2325
MIX_ENV: test
2426
steps:

lib/ex_json_schema/schema.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ defmodule ExJsonSchema.Schema do
122122
end
123123

124124
root = %Root{root | version: schema_version}
125-
{root, schema} = resolve_with_root(root, root_schema, scope)
125+
{%Root{} = root, schema} = resolve_with_root(root, root_schema, scope)
126126

127127
%Root{root | schema: schema}
128128
|> resolve_refs(schema)
@@ -366,5 +366,5 @@ defmodule ExJsonSchema.Schema do
366366
do: raise(InvalidReferenceError, message: "invalid reference #{ref}")
367367

368368
def raise_invalid_reference_error(ref),
369-
do: ref |> to_string() |> raise_invalid_reference_error
369+
do: ref |> to_string() |> raise_invalid_reference_error()
370370
end

lib/ex_json_schema/schema/ref.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ defmodule ExJsonSchema.Schema.Ref do
2929
%__MODULE__{location: location} |> parse_fragment(fragment)
3030
end
3131

32-
defp parse_fragment(ref, fragment) when fragment in [nil, ""], do: %__MODULE__{ref | fragment: []}
32+
defp parse_fragment(%__MODULE__{} = ref, fragment) when fragment in [nil, ""], do: %__MODULE__{ref | fragment: []}
3333

34-
defp parse_fragment(ref, "/" <> _ = pointer) do
34+
defp parse_fragment(%__MODULE__{} = ref, "/" <> _ = pointer) do
3535
keys = unescaped_ref_segments(pointer)
3636

3737
pointer =
@@ -45,7 +45,7 @@ defmodule ExJsonSchema.Schema.Ref do
4545
%__MODULE__{ref | fragment: pointer, fragment_pointer?: true}
4646
end
4747

48-
defp parse_fragment(ref, id), do: %__MODULE__{ref | fragment: [id]}
48+
defp parse_fragment(%__MODULE__{} = ref, id), do: %__MODULE__{ref | fragment: [id]}
4949

5050
defp unescaped_ref_segments(ref) do
5151
ref

mix.exs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ defmodule ExJsonSchema.Mixfile do
1818
package: package(),
1919
elixirc_paths: elixirc_paths(Mix.env()),
2020
test_coverage: [tool: ExCoveralls],
21-
preferred_cli_env: [coveralls: :test, dialyzer: :test],
2221
dialyzer: [
2322
plt_add_apps: [:ex_unit]
2423
]
@@ -29,6 +28,10 @@ defmodule ExJsonSchema.Mixfile do
2928
[extra_applications: []]
3029
end
3130

31+
def cli do
32+
[preferred_envs: [coveralls: :test, dialyzer: :test]]
33+
end
34+
3235
defp deps do
3336
[
3437
{:decimal, "~> 2.0"},

0 commit comments

Comments
 (0)