Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/oauth2/client.ex
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ defmodule OAuth2.Client do
@spec put_serializer(t, binary, atom) :: t
def put_serializer(%Client{serializers: serializers} = client, mime, module)
when is_binary(mime) and is_atom(module) do
%Client{client | serializers: Map.put(serializers, mime, module)}
%{client | serializers: Map.put(serializers, mime, module)}
end

@doc """
Expand All @@ -238,7 +238,7 @@ defmodule OAuth2.Client do
"""
@spec delete_serializer(t, binary) :: t
def delete_serializer(%Client{serializers: serializers} = client, mime) do
%Client{client | serializers: Map.delete(serializers, mime)}
%{client | serializers: Map.delete(serializers, mime)}
end

@doc false
Expand Down
35 changes: 28 additions & 7 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ defmodule OAuth2.Mixfile do
@version "2.1.0"

def project do
maybe_cli =
if Version.compare(System.version(), "1.14.5") == :gt do
[]
else
[
preferred_cli_env: [
coveralls: :test,
"coveralls.detail": :test,
"coveralls.html": :test,
docs: :dev
]
]
end

[
app: :oauth2,
name: "OAuth2",
Expand All @@ -16,14 +30,8 @@ defmodule OAuth2.Mixfile do
docs: docs(),
elixirc_paths: elixirc_paths(Mix.env()),
test_coverage: [tool: ExCoveralls],
preferred_cli_env: [
coveralls: :test,
"coveralls.detail": :test,
"coveralls.html": :test,
docs: :dev
],
dialyzer: dialyzer()
]
] ++ maybe_cli
end

def application do
Expand Down Expand Up @@ -81,6 +89,19 @@ defmodule OAuth2.Mixfile do
]
end

if Version.compare(System.version(), "1.14.5") == :gt do
def cli do
[
preferred_envs: [
coveralls: :test,
"coveralls.detail": :test,
"coveralls.html": :test,
docs: :dev
]
]
end
end

defp elixirc_paths(:test), do: ["lib", "test/support"]
defp elixirc_paths(_), do: ["lib"]
end