diff options
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 28 |
1 files changed, 17 insertions, 11 deletions
@@ -3,7 +3,7 @@ defmodule Ejabberd.Mixfile do def project do [app: :ejabberd, - version: "18.6.0", + version: "18.12.1", description: description(), elixir: "~> 1.4", elixirc_paths: ["lib"], @@ -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, - :eimp, :base64url, :jose] + :eimp, :base64url, :jose, :pkix] ++ cond_apps()] end @@ -42,10 +42,19 @@ defmodule Ejabberd.Mixfile do end end + defp if_version_above(ver, okResult) do + if :erlang.system_info(:otp_release) > ver do + okResult + else + [] + end + end + defp erlc_options do # Use our own includes + includes from all dependencies includes = ["include"] ++ deps_include(["fast_xml", "xmpp", "p1_utils"]) [:debug_info, {:d, :ELIXIR_ENABLED}] ++ cond_options() ++ Enum.map(includes, fn(path) -> {:i, path} end) ++ + if_version_above('20', [{:d, :DEPRECATED_GET_STACKTRACE}]) ++ if_function_exported(:crypto, :strong_rand_bytes, 1, [{:d, :STRONG_RAND_BYTES}]) ++ if_function_exported(:rand, :uniform, 1, [{:d, :RAND_UNIFORM}]) ++ if_function_exported(:gb_sets, :iterator_from, 2, [{:d, :GB_SETS_ITERATOR_FROM}]) ++ @@ -58,7 +67,7 @@ defmodule Ejabberd.Mixfile do end defp deps do - [{:lager, "~> 3.4.0"}, + [{:lager, "~> 3.6.0"}, {:p1_utils, "~> 1.0"}, {:fast_xml, "~> 1.1"}, {:xmpp, "~> 1.2"}, @@ -72,7 +81,8 @@ defmodule Ejabberd.Mixfile do {:p1_pgsql, "~> 1.1"}, {:jiffy, "~> 0.14.7"}, {:p1_oauth2, "~> 0.6.1"}, - {:distillery, "~> 1.0"}, + {:distillery, "~> 2.0"}, + {:pkix, "~> 1.0"}, {:ex_doc, ">= 0.0.0", only: :dev}, {:eimp, "~> 1.0"}, {:base64url, "~> 0.0.1"}, @@ -93,11 +103,8 @@ defmodule Ejabberd.Mixfile do {config(:riak), {:riakc, "~> 2.4"}}, {config(:redis), {:eredis, "~> 1.0"}}, {config(:zlib), {:ezlib, "~> 1.0"}}, - {config(:iconv), {:iconv, "~> 1.0"}}, {config(:pam), {:epam, "~> 1.0"}}, - {config(:tools), {:luerl, "~> 0.3.1"}}, - {config(:tools), {:meck, "~> 0.8.4"}}, - {config(:tools), {:moka, github: "processone/moka", tag: "1.0.5c"}}], do: + {config(:tools), {:luerl, "~> 0.3.1"}}], do: dep end @@ -106,8 +113,7 @@ defmodule Ejabberd.Mixfile do {config(:mysql), :p1_mysql}, {config(:pgsql), :p1_pgsql}, {config(:sqlite), :sqlite3}, - {config(:zlib), :ezlib}, - {config(:iconv), :iconv}], do: + {config(:zlib), :ezlib}], do: app end @@ -125,7 +131,7 @@ defmodule Ejabberd.Mixfile do defp vars do case :file.consult("vars.config") do {:ok,config} -> config - _ -> [zlib: true, iconv: false] + _ -> [zlib: true] end end |