summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2021-07-15 21:07:22 +0200
committerBadlop <badlop@process-one.net>2021-07-16 13:36:04 +0200
commite2aaca7cdd9acf0d1d1f87677df2e307b96acda0 (patch)
tree74b0956d1f5ef0c21c135ec46adac48e89fcd19a
parentWith the recent changes it seems mod_mix supports 0.14.1 (#3634) (diff)
Update mix applications list to fix error "p1_utils is listed as both..."
-rw-r--r--mix.exs16
1 files changed, 8 insertions, 8 deletions
diff --git a/mix.exs b/mix.exs
index 74ac4bf0..e5184fdc 100644
--- a/mix.exs
+++ b/mix.exs
@@ -25,12 +25,13 @@ defmodule Ejabberd.Mixfile do
def application do
[mod: {:ejabberd_app, []},
- applications: [:kernel, :stdlib, :sasl, :ssl],
- included_applications: [:lager, :mnesia, :inets, :p1_utils, :cache_tab,
- :fast_tls, :stringprep, :fast_xml, :xmpp, :mqtree,
- :stun, :fast_yaml, :esip, :jiffy, :p1_oauth2,
- :eimp, :base64url, :jose, :pkix, :os_mon, :yconf,
- :p1_acme, :idna]
+ extra_applications: [:mix],
+ applications: [:idna, :inets, :kernel, :sasl, :ssl, :stdlib,
+ :base64url, :fast_tls, :fast_xml, :fast_yaml, :jiffy, :jose,
+ :p1_utils, :stringprep, :stun, :yconf],
+ included_applications: [:lager, :mnesia, :os_mon,
+ :cache_tab, :eimp, :esip, :mqtree, :p1_acme,
+ :p1_oauth2, :pkix, :xmpp]
++ cond_apps()]
end
@@ -140,8 +141,7 @@ defmodule Ejabberd.Mixfile do
{config(:mysql), :p1_mysql},
{config(:odbc), :odbc},
{config(:pgsql), :p1_pgsql},
- {config(:sqlite), :sqlite3},
- {config(:zlib), :ezlib}], do:
+ {config(:sqlite), :sqlite3}], do:
app
end