From 65ebddf5d7222c7d06111cce09fb5e076686fc06 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Tue, 22 Apr 2014 14:51:13 -0500 Subject: handle deprecated pre-defined types for 17.0 and later --- rebar.config | 5 ++++- src/rlx_depsolver.erl | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/rebar.config b/rebar.config index cf03ea3..a250ce9 100644 --- a/rebar.config +++ b/rebar.config @@ -21,7 +21,10 @@ %% Compiler Options ============================================================ {erl_opts, - [debug_info, warnings_as_errors, inline]}. + [{platform_define, "^[0-9]+", namespaced_types}, + debug_info, + warnings_as_errors, + inline]}. %% EUnit ======================================================================= {eunit_opts, diff --git a/src/rlx_depsolver.erl b/src/rlx_depsolver.erl index 20423d0..5d78174 100644 --- a/src/rlx_depsolver.erl +++ b/src/rlx_depsolver.erl @@ -112,7 +112,11 @@ %%============================================================================ %% type %%============================================================================ +-ifdef(namespaced_types). +-type dep_graph() :: gb_tree:tree(). +-else. -type dep_graph() :: gb_tree(). +-endif. -opaque t() :: {?MODULE, dep_graph()}. -type pkg() :: {pkg_name(), vsn()}. -type pkg_name() :: binary() | atom(). -- cgit v1.2.3 From 7fede533d583ec86e0868cdda4b5f4c5333b6697 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Tue, 22 Apr 2014 14:51:23 -0500 Subject: remove 17.0rc1 from travis, wait for travis 17.0 support --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 764fe9c..0217788 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: erlang otp_release: - - 17.0-rc1 - R16B03-1 - R16B03 - R16B02 -- cgit v1.2.3