Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

Merge pull request #1758 from reneklacan/fix-mix-warnings

Browse Source 
Fix mix warnings
This commit is contained in:
Evgeny Khramtsov 2017-06-04 14:25:31 +04:00 committed by GitHub
commit 5971eb3da0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mix.exs
View File

@ -4,17 +4,17 @@ defmodule Ejabberd.Mixfile do
def project do def project do
[app: :ejabberd, [app: :ejabberd,
version: "17.3.0", version: "17.3.0",
description: description, description: description(),
elixir: "~> 1.3", elixir: "~> 1.3",
elixirc_paths: ["lib"], elixirc_paths: ["lib"],
compile_path: ".", compile_path: ".",
compilers: [:asn1] ++ Mix.compilers, compilers: [:asn1] ++ Mix.compilers,
erlc_options: erlc_options, erlc_options: erlc_options(),
erlc_paths: ["asn1", "src"], erlc_paths: ["asn1", "src"],
# Elixir tests are starting the part of ejabberd they need # Elixir tests are starting the part of ejabberd they need
aliases: [test: "test --no-start"], aliases: [test: "test --no-start"],
package: package, package: package(),
deps: deps] deps: deps()]
end end
def description do def description do
@ -29,7 +29,7 @@ defmodule Ejabberd.Mixfile do
included_applications: [:lager, :mnesia, :inets, :p1_utils, :cache_tab, included_applications: [:lager, :mnesia, :inets, :p1_utils, :cache_tab,
:fast_tls, :stringprep, :fast_xml, :xmpp, :fast_tls, :stringprep, :fast_xml, :xmpp,
:stun, :fast_yaml, :esip, :jiffy, :p1_oauth2] :stun, :fast_yaml, :esip, :jiffy, :p1_oauth2]
++ cond_apps] ++ cond_apps()]
end end
defp erlc_options do defp erlc_options do
@ -53,7 +53,7 @@ defmodule Ejabberd.Mixfile do
{:p1_oauth2, "~> 0.6.1"}, {:p1_oauth2, "~> 0.6.1"},
{:distillery, "~> 1.0"}, {:distillery, "~> 1.0"},
{:ex_doc, ">= 0.0.0", only: :dev}] {:ex_doc, ">= 0.0.0", only: :dev}]
++ cond_deps ++ cond_deps()
end end
defp deps_include(deps) do defp deps_include(deps) do
@ -108,7 +108,7 @@ defmodule Ejabberd.Mixfile do
end end
defp config(key) do defp config(key) do
case vars[key] do case vars()[key] do
nil -> false nil -> false
value -> value value -> value
end end
@ -142,7 +142,7 @@ defmodule Mix.Tasks.Compile.Asn1 do
end) end)
end end
def manifests, do: [manifest] 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()) def clean, do: Erlang.clean(manifest())