diff options
author | Evgeny Khramtsov <xramtsov@gmail.com> | 2017-06-04 14:25:31 +0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-04 14:25:31 +0400 |
commit | 5971eb3da00f60100f61f1f367ded20c92963264 (patch) | |
tree | 7b2e27bcc2531364151e31b726f53a1839eeb4f0 | |
parent | Merge pull request #1759 from reneklacan/fix-version-to-be-semver (diff) | |
parent | Fix mix warnings (diff) |
Merge pull request #1758 from reneklacan/fix-mix-warnings
Fix mix warnings
-rw-r--r-- | mix.exs | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -4,17 +4,17 @@ defmodule Ejabberd.Mixfile do def project do [app: :ejabberd, version: "17.3.0", - description: description, + description: description(), elixir: "~> 1.3", elixirc_paths: ["lib"], compile_path: ".", compilers: [:asn1] ++ Mix.compilers, - erlc_options: erlc_options, + erlc_options: erlc_options(), erlc_paths: ["asn1", "src"], # Elixir tests are starting the part of ejabberd they need aliases: [test: "test --no-start"], - package: package, - deps: deps] + package: package(), + deps: deps()] end def description do @@ -29,7 +29,7 @@ defmodule Ejabberd.Mixfile do included_applications: [:lager, :mnesia, :inets, :p1_utils, :cache_tab, :fast_tls, :stringprep, :fast_xml, :xmpp, :stun, :fast_yaml, :esip, :jiffy, :p1_oauth2] - ++ cond_apps] + ++ cond_apps()] end defp erlc_options do @@ -53,7 +53,7 @@ defmodule Ejabberd.Mixfile do {:p1_oauth2, "~> 0.6.1"}, {:distillery, "~> 1.0"}, {:ex_doc, ">= 0.0.0", only: :dev}] - ++ cond_deps + ++ cond_deps() end defp deps_include(deps) do @@ -108,7 +108,7 @@ defmodule Ejabberd.Mixfile do end defp config(key) do - case vars[key] do + case vars()[key] do nil -> false value -> value end @@ -142,7 +142,7 @@ defmodule Mix.Tasks.Compile.Asn1 do end) end - def manifests, do: [manifest] + def manifests, do: [manifest()] defp manifest, do: Path.join(Mix.Project.manifest_path, @manifest) def clean, do: Erlang.clean(manifest()) |