diff options
| author | tusooa <tusooa@kazv.moe> | 2022-09-05 15:19:34 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2022-09-05 15:19:34 +0000 |
| commit | f7c20731034f7aa3c72a6dcc312850db27787f7e (patch) | |
| tree | 58c7727f73a0a7184865e45c18b6af5e91c51be5 /lib/mix | |
| parent | f8afba95b20670b5d6e93896ccd27bb3fca003a2 (diff) | |
| parent | 80a2528fd10ca2d07b8d96258a19bd9a8ea747ec (diff) | |
| download | pleroma-f7c20731034f7aa3c72a6dcc312850db27787f7e.tar.gz pleroma-f7c20731034f7aa3c72a6dcc312850db27787f7e.zip | |
Merge branch 'bump/min-elixir-1.10' into 'develop'
Bump minimum Elixir version to 1.10
See merge request pleroma/pleroma!3741
Diffstat (limited to 'lib/mix')
| -rw-r--r-- | lib/mix/tasks/pleroma/config.ex | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex index 33d147d36..3a2ea44f8 100644 --- a/lib/mix/tasks/pleroma/config.ex +++ b/lib/mix/tasks/pleroma/config.ex @@ -304,13 +304,8 @@ defmodule Mix.Tasks.Pleroma.Config do System.cmd("mix", ["format", path]) end - if Code.ensure_loaded?(Config.Reader) do - defp config_header, do: "import Config\r\n\r\n" - defp read_file(config_file), do: Config.Reader.read_imports!(config_file) - else - defp config_header, do: "use Mix.Config\r\n\r\n" - defp read_file(config_file), do: Mix.Config.eval!(config_file) - end + defp config_header, do: "import Config\r\n\r\n" + defp read_file(config_file), do: Config.Reader.read_imports!(config_file) defp write_and_delete(config, file, delete?) do config |