diff --git a/rebar.config b/rebar.config index 7c4b92460..dc8fe4f9c 100644 --- a/rebar.config +++ b/rebar.config @@ -30,10 +30,10 @@ {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}}, {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.2"}}}, {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.2"}}}, - {jose, ".*", {git, "git://github.com/potatosalad/erlang-jose.git", {tag, "1.8.4"}}}, - {fs, ".*", {git, "https://github.com/synrc/fs.git", {tag, "2.12.0"}}}, - {if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.16"}}}}, - {if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.17"}}}}, + {jose, ".*", {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.8.4"}}}, + {fs, ".*", {git, "https://github.com/synrc/fs", {tag, "2.12.0"}}}, + {if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.16"}}}}, + {if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.17"}}}}, {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql", {tag, "1.0.4"}}}}, {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql", @@ -44,20 +44,20 @@ {tag, "1.0.3"}}}}, {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib", {tag, "1.0.3"}}}}, - {if_var_true, riak, {riakc, ".*", {git, "https://github.com/processone/riak-erlang-client.git", + {if_var_true, riak, {riakc, ".*", {git, "https://github.com/processone/riak-erlang-client", {tag, {if_version_above, "19", "develop", "2.5.3"}}}}}, - {if_var_true, graphics, {eimp, ".*", {git, "https://github.com/processone/eimp.git", {tag, "1.0.2"}}}}, - %% Elixir support, needed to run tests + {if_var_true, graphics, {eimp, ".*", {git, "https://github.com/processone/eimp", {tag, "1.0.2"}}}}, + %% Elixir support, needed to run tests {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", {tag, {if_version_above, "17", "v1.4.4", "v1.1.1"}}}}}, %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin - {if_not_rebar3, {if_var_true, elixir, {rebar_elixir_plugin, ".*", - {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}}, + {if_not_rebar3, {if_var_true, elixir, {rebar_elixir_plugin, ".*", + {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}}, {if_var_true, iconv, {iconv, ".*", {git, "https://github.com/processone/iconv", {tag, "1.0.6"}}}}, {if_var_true, tools, {meck, "0.8.*", {git, "https://github.com/eproxus/meck", {tag, "0.8.4"}}}}, - {if_var_true, tools, {moka, ".*", {git, "https://github.com/processone/moka.git", + {if_var_true, tools, {moka, ".*", {git, "https://github.com/processone/moka", {tag, "1.0.5c"}}}}, {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis", {tag, "v1.0.8"}}}}]}. @@ -70,37 +70,37 @@ esip, stun, fast_yaml, - xmpp, + xmpp, p1_utils, p1_mysql, p1_pgsql, p1_oauth2, epam, ezlib, - eimp, + eimp, iconv]}}. {erl_first_files, ["src/ejabberd_sql_pt.erl", "src/ejabberd_config.erl", - "src/gen_mod.erl", "src/mod_muc_room.erl", "src/mod_push.erl"]}. + "src/gen_mod.erl", "src/mod_muc_room.erl", "src/mod_push.erl"]}. {erl_opts, [nowarn_deprecated_function, {i, "include"}, - {i, "deps/fast_xml/include"}, - {i, "deps/xmpp/include"}, - {i, "deps/p1_utils/include"}, + {i, "deps/fast_xml/include"}, + {i, "deps/xmpp/include"}, + {i, "deps/p1_utils/include"}, {if_var_false, debug, no_debug_info}, {if_var_true, debug, debug_info}, - {if_var_true, sip, {d, 'SIP'}}, - {if_var_true, stun, {d, 'STUN'}}, - {if_var_true, graphics, {d, 'GRAPHICS'}}, + {if_var_true, sip, {d, 'SIP'}}, + {if_var_true, stun, {d, 'STUN'}}, + {if_var_true, graphics, {d, 'GRAPHICS'}}, {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}}, {if_var_match, db_type, mssql, {d, 'mssql'}}, {if_var_true, elixir, {d, 'ELIXIR_ENABLED'}}, {if_var_true, erlang_deprecated_types, {d, 'ERL_DEPRECATED_TYPES'}}, - {if_have_fun, {crypto, strong_rand_bytes, 1}, {d, 'STRONG_RAND_BYTES'}}, - {if_have_fun, {rand, uniform, 1}, {d, 'RAND_UNIFORM'}}, - {if_have_fun, {gb_sets, iterator_from, 2}, {d, 'GB_SETS_ITERATOR_FROM'}}, - {if_have_fun, {public_key, short_name_hash, 1}, {d, 'SHORT_NAME_HASH'}}, + {if_have_fun, {crypto, strong_rand_bytes, 1}, {d, 'STRONG_RAND_BYTES'}}, + {if_have_fun, {rand, uniform, 1}, {d, 'RAND_UNIFORM'}}, + {if_have_fun, {gb_sets, iterator_from, 2}, {d, 'GB_SETS_ITERATOR_FROM'}}, + {if_have_fun, {public_key, short_name_hash, 1}, {d, 'SHORT_NAME_HASH'}}, {if_var_true, new_sql_schema, {d, 'NEW_SQL_SCHEMA'}}, {if_var_true, hipe, native}, {src_dirs, [asn1, src, @@ -111,10 +111,10 @@ {if_rebar3, {plugins, [rebar3_hex, {provider_asn1, "0.2.0"}]}}. {if_not_rebar3, {plugins, [ - deps_erl_opts, override_deps_versions, override_opts, - {if_var_true, elixir, rebar_elixir_compiler}, - {if_var_true, elixir, rebar_exunit} - ]}}. + deps_erl_opts, override_deps_versions, override_opts, + {if_var_true, elixir, rebar_elixir_compiler}, + {if_var_true, elixir, rebar_exunit} + ]}}. {if_var_true, elixir, {lib_dirs, ["deps/elixir/lib"]}}. @@ -146,10 +146,10 @@ {if_var_false, redis, "(\"eredis\":_/_)"}]}. {eunit_compile_opts, [{i, "tools"}, - {i, "include"}, - {i, "deps/p1_utils/include"}, - {i, "deps/fast_xml/include"}, - {i, "deps/xmpp/include"}]}. + {i, "include"}, + {i, "deps/p1_utils/include"}, + {i, "deps/fast_xml/include"}, + {i, "deps/xmpp/include"}]}. {if_version_above, "17", {cover_enabled, true}}. {cover_export_enabled, true}. @@ -161,7 +161,7 @@ {"fast_xml", [{if_var_true, full_xml, "--enable-full-xml"}]}, {if_var_true, pam, {"epam", []}}, {if_var_true, zlib, {"ezlib", []}}, - {if_var_true, graphics, {"eimp", []}}, + {if_var_true, graphics, {"eimp", []}}, {if_var_true, iconv, {"iconv", []}}]}. {port_env, [{"CFLAGS", "-g -O2 -Wall"}]}.