Skip to content

Commit

Permalink
Merge pull request #36 from feld/upstream/elixir-1.11-compat
Browse files Browse the repository at this point in the history
Elixir 1.11 compatibility
  • Loading branch information
deadtrickster authored Nov 5, 2020
2 parents e66532e + bccee47 commit 2231819
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
8 changes: 1 addition & 7 deletions lib/prometheus/error.ex
Original file line number Diff line number Diff line change
Expand Up @@ -216,13 +216,7 @@ defmodule Prometheus.Error do
e in ErlangError ->
reraise(
Prometheus.Error.normalize(e),
unquote(
if macro_exported?(Kernel.SpecialForms, :__STACKTRACE__, 0) do
quote(do: __STACKTRACE__)
else
quote(do: System.stacktrace())
end
)
unquote(quote(do: __STACKTRACE__))
)
end
end
Expand Down
4 changes: 2 additions & 2 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defmodule PrometheusEx.Mixfile do
[
app: :prometheus_ex,
version: @version,
elixir: "~> 1.6",
elixir: "~> 1.7",
build_embedded: Mix.env() == :prod,
start_permanent: Mix.env() == :prod,
description: description(),
Expand All @@ -32,7 +32,7 @@ defmodule PrometheusEx.Mixfile do
end

def application do
[applications: [:logger, :prometheus]]
[applications: [:logger, :mnesia, :prometheus]]
end

defp description do
Expand Down

0 comments on commit 2231819

Please sign in to comment.