diff --git a/.dialyzer_ignore.exs b/.dialyzer_ignore.exs index 70f67515..fe51488c 100644 --- a/.dialyzer_ignore.exs +++ b/.dialyzer_ignore.exs @@ -1,11 +1 @@ -[ - ~r/lib\/flop\/schema\.ex.*no_return Function default_limit\/1 has no local return\./, - ~r/lib\/flop\/schema\.ex.*no_return Function default_order\/1 has no local return\./, - ~r/lib\/flop\/schema\.ex.*no_return Function field_info\/2 has no local return\./, - ~r/lib\/flop\/schema\.ex.*no_return Function field_type\/2 has no local return\./, - ~r/lib\/flop\/schema\.ex.*no_return Function filterable\/1 has no local return\./, - ~r/lib\/flop\/schema\.ex.*no_return Function max_limit\/1 has no local return\./, - ~r/lib\/flop\/schema\.ex.*no_return Function pagination_types\/1 has no local return\./, - ~r/lib\/flop\/schema\.ex.*no_return Function default_pagination_type\/1 has no local return\./, - ~r/lib\/flop\/schema\.ex.*no_return Function sortable\/1 has no local return\./ -] +[] diff --git a/lib/flop/adapter.ex b/lib/flop/adapter.ex index 1b45af6f..cc2e2e51 100644 --- a/lib/flop/adapter.ex +++ b/lib/flop/adapter.ex @@ -67,5 +67,5 @@ defmodule Flop.Adapter do This callback will be removed as soon as a better solution is found or made possible. """ - @callback custom_func_builder(opts) :: any when opts: keyword + @callback custom_func_builder(opts) :: Macro.t() when opts: keyword end diff --git a/lib/flop/schema.ex b/lib/flop/schema.ex index 89f1f472..117d5695 100644 --- a/lib/flop/schema.ex +++ b/lib/flop/schema.ex @@ -846,7 +846,7 @@ defprotocol Flop.Schema do def max_limit(data) @doc false - @spec custom(any, any) :: Macro.t() + @spec custom(any, any) :: any def custom(data, arg) end diff --git a/mix.exs b/mix.exs index f9b33020..565bb6f9 100644 --- a/mix.exs +++ b/mix.exs @@ -14,16 +14,17 @@ defmodule Flop.MixProject do deps: deps(), test_coverage: [tool: ExCoveralls], preferred_cli_env: [ - coveralls: :test, "coveralls.detail": :test, - "coveralls.post": :test, - "coveralls.html": :test, "coveralls.github": :test, + "coveralls.html": :test, "coveralls.json": :test, + "coveralls.post": :test, "ecto.create": :test, "ecto.drop": :test, "ecto.migrate": :test, - "ecto.reset": :test + "ecto.reset": :test, + coveralls: :test, + dialyzer: :test ], dialyzer: [ ignore_warnings: ".dialyzer_ignore.exs", @@ -55,7 +56,7 @@ defmodule Flop.MixProject do defp deps do [ {:credo, "~> 1.7.0", only: [:dev, :test], runtime: false}, - {:dialyxir, "~> 1.3.0", only: [:dev], runtime: false}, + {:dialyxir, "~> 1.3.0", only: [:dev, :test], runtime: false}, {:ecto, "~> 3.9"}, {:ecto_sql, "~> 3.9", only: :test}, {:ex_doc, "~> 0.21", only: :dev, runtime: false},