diff --git a/lib/ejabberd/config/config.ex b/lib/ejabberd/config/config.ex index a1b91858a..df508fb4d 100644 --- a/lib/ejabberd/config/config.ex +++ b/lib/ejabberd/config/config.ex @@ -36,8 +36,8 @@ defmodule Ejabberd.Config do case force do true -> - Ejabberd.Config.Store.stop - Ejabberd.Config.Store.start_link + Ejabberd.Config.Store.stop() + Ejabberd.Config.Store.start_link() do_init(file_path) false -> if not init_already_executed, do: do_init(file_path) diff --git a/lib/mix/tasks/deps.tree.ex b/lib/mix/tasks/deps.tree.ex index a3439c40b..e93b4aa48 100644 --- a/lib/mix/tasks/deps.tree.ex +++ b/lib/mix/tasks/deps.tree.ex @@ -14,15 +14,15 @@ defmodule Mix.Tasks.Ejabberd.Deps.Tree do def run(_argv) do # First we need to start manually the store to be available # during the compilation of the config file. - Ejabberd.Config.Store.start_link + Ejabberd.Config.Store.start_link() Ejabberd.Config.init(:ejabberd_config.path()) - Mix.shell.info "ejabberd modules" + Mix.shell().info "ejabberd modules" Ejabberd.Config.Store.get(:modules) |> Enum.reverse # Because of how mods are stored inside the store |> format_mods - |> Mix.shell.info + |> Mix.shell().info end defp format_mods(mods) when is_list(mods) do diff --git a/mix.exs b/mix.exs index b11687cc5..d190e9da0 100644 --- a/mix.exs +++ b/mix.exs @@ -8,7 +8,7 @@ defmodule Ejabberd.MixProject do elixir: elixir_required_version(), elixirc_paths: ["lib"], compile_path: ".", - compilers: [:asn1] ++ Mix.compilers, + compilers: [:asn1] ++ Mix.compilers(), erlc_options: erlc_options(), erlc_paths: ["asn1", "src"], # Elixir tests are starting the part of ejabberd they need @@ -260,7 +260,7 @@ defmodule Ejabberd.MixProject do end # Mix/Elixir lower than 1.11.0 use config/releases.exs instead of runtime.exs - case Version.match?(System.version, "~> 1.11") do + case Version.match?(System.version(), "~> 1.11") do true -> :ok false -> @@ -339,7 +339,7 @@ defmodule Mix.Tasks.Compile.Asn1 do def run(args) do {opts, _, _} = OptionParser.parse(args, switches: [force: :boolean]) - project = Mix.Project.config + project = Mix.Project.config() source_paths = project[:asn1_paths] || ["asn1"] dest_paths = project[:asn1_target] || ["src"] mappings = Enum.zip(source_paths, dest_paths) @@ -361,7 +361,7 @@ defmodule Mix.Tasks.Compile.Asn1 do end def manifests, do: [manifest()] - defp manifest, do: Path.join(Mix.Project.manifest_path, @manifest) + defp manifest, do: Path.join(Mix.Project.manifest_path(), @manifest) def clean, do: Erlang.clean(manifest()) end