Merge pull request #560 from paulo-ferraz-oliveira/feature/approach-o…

…tp-24

Approach OTP 24

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       image: erlang:${{matrix.otp_vsn}}
     strategy:
       matrix:
-        otp_vsn: ["19.3", "20.3", "21.3", "22.3", "23.2"]
+        otp_vsn: ["21.3", "22.3", "23.2"]
         os: [ubuntu-latest]
     steps:
       - name: Install Git 2.18

rebar.config

@@ -25,9 +25,9 @@
 {profiles, [
   {test, [
     {extra_src_dirs, [{"test/examples", [{recursive, true}]}]},
-    {deps, [ {mixer,       "1.0.0", {pkg, inaka_mixer}}
-           , {meck,        "0.9.0"}
-           , {xref_runner, "1.1.0"}
+    {deps, [ {mixer,       "1.1.1", {pkg, inaka_mixer}}
+           , {meck,        "0.9.2"}
+           , {xref_runner, "1.2.0"}
     ]}
   ]}
 ]}.
@@ -63,9 +63,9 @@
 
 %% == Dependencies ==
 
-{deps, [ {elvis_core, "1.0.0"}
+{deps, [ {elvis_core, "1.1.2"}
        , {getopt,  "1.0.2"}
-       , {egithub, "0.6.1"}
+       , {egithub, "0.7.0"}
        ]}.
 
 %% == Dialyzer ==

rebar.lock

@@ -1,53 +1,53 @@
 {"1.2.0",
-[{<<"certifi">>,{pkg,<<"certifi">>,<<"2.5.2">>},2},
- {<<"egithub">>,{pkg,<<"egithub">>,<<"0.6.1">>},0},
- {<<"elvis_core">>,{pkg,<<"elvis_core">>,<<"1.0.0">>},0},
+[{<<"certifi">>,{pkg,<<"certifi">>,<<"2.6.1">>},2},
+ {<<"egithub">>,{pkg,<<"egithub">>,<<"0.7.0">>},0},
+ {<<"elvis_core">>,{pkg,<<"elvis_core">>,<<"1.1.2">>},0},
  {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.2">>},0},
  {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
- {<<"hackney">>,{pkg,<<"hackney">>,<<"1.16.0">>},1},
- {<<"idna">>,{pkg,<<"idna">>,<<"6.0.1">>},2},
+ {<<"hackney">>,{pkg,<<"hackney">>,<<"1.17.1">>},1},
+ {<<"idna">>,{pkg,<<"idna">>,<<"6.1.1">>},2},
  {<<"jsx">>,{pkg,<<"jsx">>,<<"2.10.0">>},1},
- {<<"katana_code">>,{pkg,<<"katana_code">>,<<"0.2.1">>},1},
- {<<"lager">>,{pkg,<<"lager">>,<<"3.8.0">>},1},
+ {<<"katana_code">>,{pkg,<<"katana_code">>,<<"1.1.2">>},1},
+ {<<"lager">>,{pkg,<<"lager">>,<<"3.9.1">>},1},
  {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},2},
  {<<"mimerl">>,{pkg,<<"mimerl">>,<<"1.2.0">>},2},
- {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.0">>},2},
+ {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.4.0">>},2},
  {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},2},
- {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.5.0">>},3},
+ {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.0">>},2},
  {<<"zipper">>,{pkg,<<"zipper">>,<<"1.0.1">>},1}]}.
 [
 {pkg_hash,[
- {<<"certifi">>, <<"B7CFEAE9D2ED395695DD8201C57A2D019C0C43ECAF8B8BCB9320B40D6662F340">>},
- {<<"egithub">>, <<"AC6DB0F15C7685AAD9C2146EC7AF508D6803BBD9AB1ACFCE731E35F3B35D42D0">>},
- {<<"elvis_core">>, <<"01A18169EC80004D2444001E1157B117270B4CD38693A66C3AAB61A6459ADBFA">>},
+ {<<"certifi">>, <<"DBAB8E5E155A0763EEA978C913CA280A6B544BFA115633FA20249C3D396D9493">>},
+ {<<"egithub">>, <<"CFF720B2ADE8A0528B8861D2309339FD3C1C289B9BCB9E498FF77C619CE28AF2">>},
+ {<<"elvis_core">>, <<"7CE6D2ECC91D768F8A36E2AEB30FD4901322F2E73C3D47113CEB9C7931ADF05A">>},
  {<<"getopt">>, <<"33D9B44289FE7AD08627DDFE1D798E30B2DA0033B51DA1B3A2D64E72CD581D02">>},
  {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
- {<<"hackney">>, <<"5096AC8E823E3A441477B2D187E30DD3FFF1A82991A806B2003845CE72CE2D84">>},
- {<<"idna">>, <<"1D038FB2E7668CE41FBF681D2C45902E52B3CB9E9C77B55334353B222C2EE50C">>},
+ {<<"hackney">>, <<"08463F93D2CC1A03817BF28D8DAE6021543F773BD436C9377047224856C4422C">>},
+ {<<"idna">>, <<"8A63070E9F7D0C62EB9D9FCB360A7DE382448200FBBD1B106CC96D3D8099DF8D">>},
  {<<"jsx">>, <<"77760560D6AC2B8C51FD4C980E9E19B784016AA70BE354CE746472C33BEB0B1C">>},
- {<<"katana_code">>, <<"B2195859DF57D8BEBF619A9FD3327CD7D01563A98417156D0F4C5FAB435F2630">>},
- {<<"lager">>, <<"3402B9A7E473680CA179FC2F1D827CAB88DD37DD1E6113090C6F45EF05228A1C">>},
+ {<<"katana_code">>, <<"4336743263236C3213FF1B979ECAE263940B9084ACE90E9434838F3F98CCA578">>},
+ {<<"lager">>, <<"5885BC71308CD38F9D025C8ECDE4E5CCE1CE8565F80BFC6199865C845D6DBE95">>},
  {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>},
  {<<"mimerl">>, <<"67E2D3F571088D5CFD3E550C383094B47159F3EEE8FFA08E64106CDF5E981BE3">>},
- {<<"parse_trans">>, <<"09765507A3C7590A784615CFD421D101AEC25098D50B89D7AA1D66646BC571C1">>},
+ {<<"parse_trans">>, <<"BB87AC362A03CA674EBB7D9D498F45C03256ADED7214C9101F7035EF44B798C7">>},
  {<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>},
- {<<"unicode_util_compat">>, <<"8516502659002CEC19E244EBD90D312183064BE95025A319A6C7E89F4BCCD65B">>},
+ {<<"unicode_util_compat">>, <<"BC84380C9AB48177092F43AC89E4DFA2C6D62B40B8BD132B1059ECC7232F9A78">>},
  {<<"zipper">>, <<"3CCB4F14B97C06B2749B93D8B6C204A1ECB6FAFC6050CACC3B93B9870C05952A">>}]},
 {pkg_hash_ext,[
- {<<"certifi">>, <<"3B3B5F36493004AC3455966991EAF6E768CE9884693D9968055AEEEB1E575040">>},
- {<<"egithub">>, <<"FE0610CD0102DC60A5B5635235EFEA863C2C464F64450A41FA444971ECD64BFB">>},
- {<<"elvis_core">>, <<"DDA7A54CD4CE3D2BD93A4C9B421F59CA69C2301ECF3C171761BF098C6EB6AE0A">>},
+ {<<"certifi">>, <<"524C97B4991B3849DD5C17A631223896272C6B0AF446778BA4675A1DFF53BB7E">>},
+ {<<"egithub">>, <<"E009CE11EFD8008D0F9ED59D9C488E3E9ABE302A0F2CD6D663E4CC26756FCC4C">>},
+ {<<"elvis_core">>, <<"C4EE42A7A7C2FC567F3EA6B5150164CD68290F1100E9B19A4CF886D8AA1CA73C">>},
  {<<"getopt">>, <<"A0029AEA4322FB82A61F6876A6D9C66DC9878B6CB61FAA13DF3187384FD4EA26">>},
  {<<"goldrush">>, <<"99CB4128CFFCB3227581E5D4D803D5413FA643F4EB96523F77D9E6937D994CEB">>},
- {<<"hackney">>, <<"3BF0BEBBD5D3092A3543B783BF065165FA5D3AD4B899B836810E513064134E18">>},
- {<<"idna">>, <<"A02C8A1C4FD601215BB0B0324C8A6986749F807CE35F25449EC9E69758708122">>},
+ {<<"hackney">>, <<"D2CBA9E3C8103AD0320623E9F1C33E8D378A15EAABE2EE8AE441898F3D35A18C">>},
+ {<<"idna">>, <<"92376EB7894412ED19AC475E4A86F7B413C1B9FBB5BD16DCCD57934157944CEA">>},
  {<<"jsx">>, <<"9A83E3704807298016968DB506F9FAD0F027DE37546EB838B3AE1064C3A0AD62">>},
- {<<"katana_code">>, <<"8448AD3F56D9814F98A28BE650F7191BDD506575E345CC16D586660B10F6E992">>},
- {<<"lager">>, <<"F6CB541B688EAB60730D8D286EB77256A5A9AD06EAC10D43BEAF55D07E68BBB6">>},
+ {<<"katana_code">>, <<"E7E6162A44E826A03F68B503B7D92981B894BF834C1EF0E647783F7D6688021C">>},
+ {<<"lager">>, <<"3F59BA75A04A99E5F18BF91C89F46DCE536F83C6CB415FE26E6E75A62BEF37DC">>},
  {<<"metrics">>, <<"69B09ADDDC4F74A40716AE54D140F93BEB0FB8978D8636EADED0C31B6F099F16">>},
  {<<"mimerl">>, <<"F278585650AA581986264638EBF698F8BB19DF297F66AD91B18910DFC6E19323">>},
- {<<"parse_trans">>, <<"17EF63ABDE837AD30680EA7F857DD9E7CED9476CDD7B0394432AF4BFC241B960">>},
+ {<<"parse_trans">>, <<"F99E368830BEA44552224E37E04943A54874F08B8590485DE8D13832B63A2DC3">>},
  {<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>},
- {<<"unicode_util_compat">>, <<"D48D002E15F5CC105A696CF2F1BBB3FC72B4B770A184D8420C8DB20DA2674B38">>},
+ {<<"unicode_util_compat">>, <<"25EEE6D67DF61960CF6A794239566599B09E17E668D3700247BC498638152521">>},
  {<<"zipper">>, <<"6A1FD3E1F0CC1D1DF5642C9A0CE2178036411B0A5C9642851D1DA276BD737C2D">>}]}
 ].

src/elvis.erl

@@ -91,7 +91,7 @@ option_spec_list() ->
       KeepRocking}
     ].
 
--spec process_options([atom()], [string()]) -> ok.
+-spec process_options([atom() | tuple()], [string()]) -> ok.
 process_options(Options, Commands) ->
     try
         Config = default_config(),
@@ -103,7 +103,7 @@ process_options(Options, Commands) ->
             elvis_utils:erlang_halt(1)
     end.
 
--spec process_options([atom()], [string()], elvis_config:config()) ->
+-spec process_options([atom() | tuple()], [string()], elvis_config:configs()) ->
   ok.
 process_options([help | Opts], Cmds, Config) ->
     help(),
@@ -142,7 +142,7 @@ process_options([{parallel, Num} | Opts], Cmds, Config) ->
 process_options([], Cmds, Config) ->
     process_commands(Cmds, Config).
 
--spec process_commands([string()], elvis_config:config()) ->ok.
+-spec process_commands([string()], elvis_config:configs()) ->ok.
 process_commands([rock | Files], Config) ->
     case Files of
         [] ->
@@ -177,8 +177,8 @@ help() ->
     OptSpecList = option_spec_list(),
     getopt:usage(OptSpecList, ?APP_NAME, standard_io).
 
--spec help(elvis_config:config()) ->
-    elvis_config:config().
+-spec help(elvis_config:configs()) ->
+    elvis_config:configs().
 help(Config) ->
     help(),
     Config.
@@ -228,13 +228,13 @@ rock_one_song(FileName, Config) ->
         ok -> ok
     end.
 
--spec default_config() -> elvis_config:config().
+-spec default_config() -> elvis_config:configs().
 default_config() ->
     default_config([ fun() -> elvis_config:from_file(?DEFAULT_CONFIG_PATH) end
                    , fun() -> elvis_config:from_rebar(?DEFAULT_REBAR_CONFIG_PATH) end
                    ]).
 
--spec default_config(list(Fun)) -> elvis_config:config() when
+-spec default_config(list(Fun)) -> elvis_config:configs() when
       Fun :: fun(() -> elvis_config:config()).
 default_config([Fun | Funs]) ->
     Config = try Fun() catch _:_ -> [] end,

src/elvis_git.erl

@@ -24,7 +24,7 @@
 %%% Public
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec run_hook(elvis_config:config()) -> ok.
+-spec run_hook(elvis_config:configs()) -> ok.
 run_hook(Config) ->
     Files = elvis_git:staged_files(),
     NewConfig = elvis_config:resolve_files(Config, Files),
@@ -33,7 +33,7 @@ run_hook(Config) ->
         ok -> ok
     end.
 
--spec run_branch(string(), elvis_config:config()) -> ok.
+-spec run_branch(string(), elvis_config:configs()) -> ok.
 run_branch(Commit, Config) ->
     Files = elvis_git:branch_files(Commit),
     NewConfig = elvis_config:resolve_files(Config, Files),