From 2f3f6f8b71e40954c44b81e15f637a2abe36ee35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= Date: Thu, 26 Jan 2017 16:43:47 +0100 Subject: Improve compilation with rebar3 --- rebar.config | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'rebar.config') diff --git a/rebar.config b/rebar.config index 7e9fe145..f824f620 100644 --- a/rebar.config +++ b/rebar.config @@ -43,12 +43,12 @@ {tag, "1.0.2"}}}}, {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", {tag, "2.4.1"}}}}, - %% Elixir support, needed to run tests + %% Elixir support, needed to run tests {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", {tag, {if_version_above, "17", "v1.2.6", "v1.1.1"}}}}}, %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin - {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.3"}}}}, {if_var_true, tools, {meck, "0.8.*", {git, "https://github.com/eproxus/meck", @@ -96,9 +96,12 @@ {deps_erl_opts, [{if_var_true, hipe, native}]}. -{plugins, [deps_erl_opts, - {if_var_true, elixir, rebar_elixir_compiler}, - {if_var_true, elixir, rebar_exunit}]}. +{if_rebar3, {plugins, [rebar3_hex, {provider_asn1, "0.2.0"}]}}. +{if_not_rebar3, {plugins, [ + deps_erl_opts, + {if_var_true, elixir, rebar_elixir_compiler}, + {if_var_true, elixir, rebar_exunit} + ]}}. {if_var_true, elixir, {lib_dirs, ["deps/elixir/lib"]}}. -- cgit v1.2.3