diff options
| author | Tristan Sloughter <t@crashfast.com> | 2014-09-25 13:38:33 -0500 |
|---|---|---|
| committer | Tristan Sloughter <t@crashfast.com> | 2014-09-25 13:38:33 -0500 |
| commit | 6efdd8cbfea393e8b9c2a8b9029b53f25aa0cef4 (patch) | |
| tree | 02bc7bb3020b507994fc877fcf382fc362213956 | |
| parent | ffe8924f3b0f6fd68fec197e11a4229c0542b0b5 (diff) | |
fix namespaced types for pre-17 otp
| -rw-r--r-- | include/rebar.hrl | 6 | ||||
| -rw-r--r-- | src/rebar_packages.erl | 2 | ||||
| -rw-r--r-- | src/rebar_prv_install_deps.erl | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/include/rebar.hrl b/include/rebar.hrl index 92fdbe9..7f85892 100644 --- a/include/rebar.hrl +++ b/include/rebar.hrl @@ -27,3 +27,9 @@ -define(DEFAULT_PLUGINS_DIR, "_plugins"). -define(DEFAULT_CONFIG_FILE, "rebar.config"). -define(LOCK_FILE, "rebar.lock"). + +-ifdef(namespaced_types). +-type rebar_dict() :: dict:dict(). +-else. +-type rebar_dict() :: dict(). +-endif. diff --git a/src/rebar_packages.erl b/src/rebar_packages.erl index a87c388..b3a7542 100644 --- a/src/rebar_packages.erl +++ b/src/rebar_packages.erl @@ -4,7 +4,7 @@ -include("rebar.hrl"). --spec get_packages(rebar_state:t()) -> {dict:dict(), tuple()}. +-spec get_packages(rebar_state:t()) -> {rebar_dict(), tuple()}. get_packages(State) -> RebarDir = rebar_state:get(State, global_rebar_dir, filename:join(os:getenv("HOME"), ".rebar")), PackagesFile = filename:join(RebarDir, "packages"), diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl index 9180cc4..1c3049c 100644 --- a/src/rebar_prv_install_deps.erl +++ b/src/rebar_prv_install_deps.erl @@ -140,7 +140,7 @@ handle_deps(State, Deps, Update) -> is_valid(App) -> rebar_app_info:valid(App). --spec package_to_app(file:filename_all(), dict:dict(), +-spec package_to_app(file:filename_all(), rebar_dict(), rlx_depsolver:pkg()) -> rebar_app_info:t(). package_to_app(DepsDir, Packages, Pkg={_, Vsn}) -> Name = ec_cnv:to_binary(rlx_depsolver:dep_pkg(Pkg)), |