diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2019-05-19 08:54:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-19 08:54:44 -0400 |
| commit | cf51007d9c7f58a61069037ec079c84b2760527b (patch) | |
| tree | 348014db4b11810ff43e3e5ac24c31ee63a145e3 | |
| parent | 3a16cf3763c198e9167ec11a146e25334adc82f5 (diff) | |
| parent | 8653a95ae59e4ceca1968484e1be0c83b4792c9e (diff) | |
Merge pull request #2078 from ferd/otp-22.0
OTP-22.0 readiness
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | rebar.config | 5 | ||||
| -rw-r--r-- | src/rebar.hrl | 14 | ||||
| -rw-r--r-- | src/rebar_utils.erl | 2 |
5 files changed, 6 insertions, 21 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 11d4229..7b50d62 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,11 +1,11 @@ test_task: container: matrix: + - image: erlang:22 - image: erlang:21 - image: erlang:20 - image: erlang:19 - image: erlang:18 - - image: erlang:17 test_script: | ./bootstrap ./rebar3 ct diff --git a/.travis.yml b/.travis.yml index 32d51ca..2833f6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ language: erlang matrix: include: - os: linux - otp_release: 17.5 - - os: linux otp_release: 18.3 - os: linux otp_release: 19.3 @@ -11,6 +9,8 @@ matrix: otp_release: 20.0 - os: linux otp_release: 21.0 + - os: linux + otp_release: 22.0 - os: osx language: generic before_script: diff --git a/rebar.config b/rebar.config index 6a83a37..3bc5ae9 100644 --- a/rebar.config +++ b/rebar.config @@ -29,8 +29,7 @@ {escript_incl_extra, [{"relx/priv/templates/*", "_build/default/lib/"}, {"rebar/priv/templates/*", "_build/default/lib/"}]}. -{erl_opts, [{platform_define, "^[0-9]+", namespaced_types}, - {platform_define, "^(19|2)", rand_only}, +{erl_opts, [{platform_define, "^(19|2)", rand_only}, {platform_define, "^2", unicode_str}, {platform_define, "^(2[1-9])|(20\\\\.3)", filelib_find_source}, {platform_define, "^(R|1|20)", fun_stacktrace}, @@ -45,7 +44,7 @@ %% Profiles {profiles, [{test, [ - {deps, [{meck, "0.8.12"}]}, + {deps, [{meck, "0.8.13"}]}, {erl_opts, [debug_info, nowarn_export_all]} ] }, diff --git a/src/rebar.hrl b/src/rebar.hrl index f11302d..fedf0d0 100644 --- a/src/rebar.hrl +++ b/src/rebar.hrl @@ -55,23 +55,9 @@ state :: term(), implementation :: rebar_resource | rebar_resource_v2}). --ifdef(namespaced_types). -type rebar_dict() :: dict:dict(). --else. --type rebar_dict() :: dict(). --endif. - --ifdef(namespaced_types). -type rebar_digraph() :: digraph:graph(). --else. --type rebar_digraph() :: digraph(). --endif. - --ifdef(namespaced_types). -type rebar_set() :: sets:set(). --else. --type rebar_set() :: set(). --endif. -ifdef(fun_stacktrace). -define(WITH_STACKTRACE(T, R, S), T:R -> S = erlang:get_stacktrace(),). diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl index c920e46..6e5e934 100644 --- a/src/rebar_utils.erl +++ b/src/rebar_utils.erl @@ -972,7 +972,7 @@ get_proxy_auth() -> {ok, ProxyAuth} -> ProxyAuth end. --spec rebar_utils:is_list_of_strings(term()) -> boolean(). +-spec is_list_of_strings(term()) -> boolean(). is_list_of_strings(List) when not is_list(hd(List)) -> false; is_list_of_strings(List) when is_list(hd(List)) -> |