aboutsummaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorChristophe Romain <christophe.romain@process-one.net>2016-11-22 14:43:10 +0100
committerChristophe Romain <christophe.romain@process-one.net>2016-11-22 14:43:10 +0100
commit577eeb642f2280f030303a06094947d3e6be85d0 (patch)
tree7868d1fa0d64c755e3da0b07b97414a949bfc356 /mix.exs
parentRemove now() from mod_offline.hrl (diff)
Add new xmpp repo as dependency in mix.exs
Diffstat (limited to '')
-rw-r--r--mix.exs9
1 files changed, 5 insertions, 4 deletions
diff --git a/mix.exs b/mix.exs
index c77f2abb4..5e1676043 100644
--- a/mix.exs
+++ b/mix.exs
@@ -27,14 +27,14 @@ defmodule Ejabberd.Mixfile do
[mod: {:ejabberd_app, []},
applications: [:ssl],
included_applications: [:lager, :mnesia, :p1_utils, :cache_tab,
- :fast_tls, :stringprep, :fast_xml,
+ :fast_tls, :stringprep, :fast_xml, :xmpp,
:stun, :fast_yaml, :esip, :jiffy, :p1_oauth2]
++ cond_apps]
end
defp erlc_options do
# Use our own includes + includes from all dependencies
- includes = ["include"] ++ Path.wildcard(Path.join("..", "/*/include"))
+ includes = ["include"] ++ Path.wildcard("deps/*/include")
[:debug_info] ++ Enum.map(includes, fn(path) -> {:i, path} end)
end
@@ -42,10 +42,11 @@ defmodule Ejabberd.Mixfile do
[{:lager, "~> 3.2"},
{:p1_utils, "~> 1.0"},
{:cache_tab, "~> 1.0"},
- {:stringprep, "~> 1.0"},
+ {:stringprep, "~> 1.0", override: true}, # override cause of :xmpp
{:fast_yaml, "~> 1.0"},
{:fast_tls, "~> 1.0"},
- {:fast_xml, "~> 1.1"},
+ {:fast_xml, "~> 1.1", override: true}, # override cause of :xmpp
+ {:xmpp, github: "processone/xmpp", tag: "1.0.3"},
{:stun, "~> 1.0"},
{:esip, "~> 1.0"},
{:jiffy, "~> 0.14.7"},