summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2022-09-02 22:35:08 +0200
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2022-09-03 03:58:22 +0200
commitec80a1e405c7b1d893c08ea99e824f2c13719c3a (patch)
tree53ca9e2aa7fa0957d9d498d9bab85f3bf2308fb5 /lib
parent24af2e1c5811e5e85ede1f75f7845e09a477fb58 (diff)
downloadpleroma-ec80a1e405c7b1d893c08ea99e824f2c13719c3a.tar.gz
pleroma-ec80a1e405c7b1d893c08ea99e824f2c13719c3a.zip
Bump minimum Elixir version to 1.10
1.9 being end-of-life
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/config/loader.ex15
1 files changed, 2 insertions, 13 deletions
diff --git a/lib/pleroma/config/loader.ex b/lib/pleroma/config/loader.ex
index 015be3d8e..bd85eccab 100644
--- a/lib/pleroma/config/loader.ex
+++ b/lib/pleroma/config/loader.ex
@@ -19,21 +19,10 @@ defmodule Pleroma.Config.Loader do
:tesla
]
- if Code.ensure_loaded?(Config.Reader) do
- @reader Config.Reader
-
- def read(path), do: @reader.read!(path)
- else
- # support for Elixir less than 1.9
- @reader Mix.Config
- def read(path) do
- path
- |> @reader.eval!()
- |> elem(0)
- end
- end
+ @reader Config.Reader
@spec read(Path.t()) :: keyword()
+ def read(path), do: @reader.read!(path)
@spec merge(keyword(), keyword()) :: keyword()
def merge(c1, c2), do: @reader.merge(c1, c2)