hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'bump/min-elixir-1.10' into 'develop'

Browse source 
Bump minimum Elixir version to 1.10

See merge request pleroma/pleroma!3741
This commit is contained in:
tusooa 2022-09-05 15:19:34 +00:00
commit f7c2073103
15 changed files with 33 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/mix/tasks/pleroma/config.ex
View file

@ -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