[AUTO] [ RTI-15051 ] Update Dependencies

[pablocostass]

@elbrujohalcon the latest katana_code release (2.1.0) bumps the minimum required OTP version to OTP24, while this project still has OTP23 as the minimum version. You okay with bumping the version in this PR already?

[elbrujohalcon]

@pablocostass yeah… let's BUMP, baby!!

[elbrujohalcon]

@paulo-ferraz-oliveira is bumping it everywhere these days… let's follow the trend!

[pablocostass]

@elbrujohalcon I considered adding OTP26 to the CI but I first tried running the CI checks (rebar3 test) in my machine with said OTP release and the formatter is somewhat broken, so I consider it out of scope for the PR :(

Most of the failing tests do fail because in OTP26 the inline items are being re-ordered? but then there is maybe format test-case

Click me to read the output of rebar3 ct --verbose

``` ➜ rebar3 ct --verbose ===> Verifying dependencies... ===> Failed to restore ===> Analyzing applications... ===> Compiling katana_code ===> Failed to restore ===> Analyzing applications... ===> Compiling rebar3_format ===> Running Common Test suites... Common Test starting (cwd is /Users/pablocostassanchez/code/other/rebar3_format) CWD set to: "/Users/pablocostassanchez/code/other/rebar3_format/_build/test/logs/ct_run.nonode@nohost.2023-08-07_10.22.34" TEST INFO: 1 test(s), 26 case(s) in 5 suite(s) Testing lib.rebar3_format: Starting test, 26 test cases %%% complete_coverage_SUITE: .......... %%% erlfmt_formatter_SUITE: ....... %%% otp_formatter_SUITE: ... %%% sr_formatter_SUITE: .... %%% test_app_SUITE: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - test_app_SUITE:test_app failed on line 20 Reason: {test_case_failed,diff --git a/after/src/brackets.erl b/formatted/src/brackets.erl index 7c9a386..895c33d 100644 --- a/after/src/brackets.erl +++ b/formatted/src/brackets.erl @@ -1,6 +1,6 @@ -module(brackets). --format #{inline_items => all, paper => 50}. +-format #{paper => 50, inline_items => all}. -compile(export_all). diff --git a/after/src/inline_items/inline_items_when_over.erl b/formatted/src/inline_items/inline_items_when_over.erl index c77e270..ba744a1 100644 --- a/after/src/inline_items/inline_items_when_over.erl +++ b/formatted/src/inline_items/inline_items_when_over.erl @@ -3,7 +3,7 @@ %% per line if they're larger than 5 elements. -module(inline_items_when_over). --format #{inline_items => {when_over, 5}, paper => 80}. +-format #{paper => 80, inline_items => {when_over, 5}}. -export([short_tuple/0, short_list/0, short_fun/0]). -export([short_bin/0, short_guard/1, short_lc/0]). diff --git a/after/src/inline_items/inline_items_when_under.erl b/formatted/src/inline_items/inline_items_when_under.erl index 55bc77c..b26e42c 100644 --- a/after/src/inline_items/inline_items_when_under.erl +++ b/formatted/src/inline_items/inline_items_when_under.erl @@ -1,6 +1,6 @@ -module(inline_items_when_under). --format #{inline_items => {when_under, 5}, paper => 80}. +-format #{paper => 80, inline_items => {when_under, 5}}. -export([short_tuple/0, short_list/0, short_fun/0]). -export([short_bin/0, short_guard/1, short_lc/0]). diff --git a/after/src/inline_items/inline_no_items.erl b/formatted/src/inline_items/inline_no_items.erl index 0ab7b30..86db03c 100644 --- a/after/src/inline_items/inline_no_items.erl +++ b/formatted/src/inline_items/inline_no_items.erl @@ -3,7 +3,7 @@ %% per line if they're large. -module(inline_no_items). --format #{inline_items => none, paper => 80}. +-format #{paper => 80, inline_items => none}. -export([short_tuple/0, short_list/0, short_fun/0]). -export([short_bin/0, short_guard/1, short_lc/0]). diff --git a/after/src/otp25.erl b/formatted/src/otp25.erl index d846028..a38bc5b 100644 --- a/after/src/otp25.erl +++ b/formatted/src/otp25.erl @@ -3,40 +3,10 @@ -feature(maybe_expr, enable). --export(['maybe'/0, 'else'/0, short/0]). +-export([maybe/0, else/0, short/0]). -'maybe'() -> - maybe - 'maybe' ?= multiple:expressions(), - with ?= question:equal(), - which ?= - should_indent_properly_even_if:the_next_thing(is_very_very_extremely_long_and_goes_beyond_the_margin), - which ?= - should_indent_properly_even_if:the_next_thing(is_very_very_extremely_long, - and_goes_beyond_the_margin) - end. +'maybe'( ) -> maybe 'maybe' ?= multiple : expressions( ) , with ?= question : equal( ) , which ?= should_indent_properly_even_if : the_next_thing( is_very_very_extremely_long_and_goes_beyond_the_margin ) , which ?= should_indent_properly_even_if : the_next_thing( is_very_very_extremely_long , and_goes_beyond_the_margin ) end . -'else'() -> - OneLiner = - maybe - ok ?= ok - else - _ -> - ng - end, - MultiLiner = - maybe - ok ?= ok - else - _ -> - more:than(), - one:expression(), - in:the_else() - end, - {OneLiner, MultiLiner}. +'else'( ) -> OneLiner = maybe ok ?= ok else _ -> ng end , MultiLiner = maybe ok ?= ok else _ -> more : than( ) , one : expression( ) , in : the_else( ) end , { OneLiner , MultiLiner } . -short() -> - maybe - A ?= one:liner() - end, - A. +short( ) -> maybe A ?= one : liner( ) end , A . diff --git a/after/src/paper_and_ribbon/indent_18.erl b/formatted/src/paper_and_ribbon/indent_18.erl index c342542..dc7f951 100644 --- a/after/src/paper_and_ribbon/indent_18.erl +++ b/formatted/src/paper_and_ribbon/indent_18.erl @@ -1,9 +1,9 @@ -module(indent_18). --format #{break_indent => 1, - inline_clause_bodies => true, +-format #{sub_indent => 8, + break_indent => 1, paper => 50, - sub_indent => 8}. + inline_clause_bodies => true}. -record(record, {fields = diff --git a/after/src/paper_and_ribbon/indent_81.erl b/formatted/src/paper_and_ribbon/indent_81.erl index 4b00c9d..b4324a8 100644 --- a/after/src/paper_and_ribbon/indent_81.erl +++ b/formatted/src/paper_and_ribbon/indent_81.erl @@ -1,8 +1,8 @@ -module(indent_81). --format #{break_indent => 8, - paper => 50, - sub_indent => 1}. +-format #{sub_indent => 1, + break_indent => 8, + paper => 50}. -format #{inline_clause_bodies => true}. -record(record, } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Testing lib.rebar3_format: *** FAILED test case 25 of 26 *** ---------------------------------------------------- 2023-08-07 10:22:38.594 Differences: diff --git a/after/src/brackets.erl b/formatted/src/brackets.erl index 7c9a386..895c33d 100644 --- a/after/src/brackets.erl +++ b/formatted/src/brackets.erl @@ -1,6 +1,6 @@ -module(brackets). --format #{inline_items => all, paper => 50}. +-format #{paper => 50, inline_items => all}. -compile(export_all). diff --git a/after/src/inline_items/inline_items_when_over.erl b/formatted/src/inline_items/inline_items_when_over.erl index c77e270..ba744a1 100644 --- a/after/src/inline_items/inline_items_when_over.erl +++ b/formatted/src/inline_items/inline_items_when_over.erl @@ -3,7 +3,7 @@ %% per line if they're larger than 5 elements. -module(inline_items_when_over). --format #{inline_items => {when_over, 5}, paper => 80}. +-format #{paper => 80, inline_items => {when_over, 5}}. -export([short_tuple/0, short_list/0, short_fun/0]). -export([short_bin/0, short_guard/1, short_lc/0]). diff --git a/after/src/inline_items/inline_items_when_under.erl b/formatted/src/inline_items/inline_items_when_under.erl index 55bc77c..b26e42c 100644 --- a/after/src/inline_items/inline_items_when_under.erl +++ b/formatted/src/inline_items/inline_items_when_under.erl @@ -1,6 +1,6 @@ -module(inline_items_when_under). --format #{inline_items => {when_under, 5}, paper => 80}. +-format #{paper => 80, inline_items => {when_under, 5}}. -export([short_tuple/0, short_list/0, short_fun/0]). -export([short_bin/0, short_guard/1, short_lc/0]). diff --git a/after/src/inline_items/inline_no_items.erl b/formatted/src/inline_items/inline_no_items.erl index 0ab7b30..86db03c 100644 --- a/after/src/inline_items/inline_no_items.erl +++ b/formatted/src/inline_items/inline_no_items.erl @@ -3,7 +3,7 @@ %% per line if they're large. -module(inline_no_items). --format #{inline_items => none, paper => 80}. +-format #{paper => 80, inline_items => none}. -export([short_tuple/0, short_list/0, short_fun/0]). -export([short_bin/0, short_guard/1, short_lc/0]). diff --git a/after/src/otp25.erl b/formatted/src/otp25.erl index d846028..a38bc5b 100644 --- a/after/src/otp25.erl +++ b/formatted/src/otp25.erl @@ -3,40 +3,10 @@ -feature(maybe_expr, enable). --export(['maybe'/0, 'else'/0, short/0]). +-export([maybe/0, else/0, short/0]). -'maybe'() -> - maybe - 'maybe' ?= multiple:expressions(), - with ?= question:equal(), - which ?= - should_indent_properly_even_if:the_next_thing(is_very_very_extremely_long_and_goes_beyond_the_margin), - which ?= - should_indent_properly_even_if:the_next_thing(is_very_very_extremely_long, - and_goes_beyond_the_margin) - end. +'maybe'( ) -> maybe 'maybe' ?= multiple : expressions( ) , with ?= question : equal( ) , which ?= should_indent_properly_even_if : the_next_thing( is_very_very_extremely_long_and_goes_beyond_the_margin ) , which ?= should_indent_properly_even_if : the_next_thing( is_very_very_extremely_long , and_goes_beyond_the_margin ) end . -'else'() -> - OneLiner = - maybe - ok ?= ok - else - _ -> - ng - end, - MultiLiner = - maybe - ok ?= ok - else - _ -> - more:than(), - one:expression(), - in:the_else() - end, - {OneLiner, MultiLiner}. +'else'( ) -> OneLiner = maybe ok ?= ok else _ -> ng end , MultiLiner = maybe ok ?= ok else _ -> more : than( ) , one : expression( ) , in : the_else( ) end , { OneLiner , MultiLiner } . -short() -> - maybe - A ?= one:liner() - end, - A. +short( ) -> maybe A ?= one : liner( ) end , A . diff --git a/after/src/paper_and_ribbon/indent_18.erl b/formatted/src/paper_and_ribbon/indent_18.erl index c342542..dc7f951 100644 --- a/after/src/paper_and_ribbon/indent_18.erl +++ b/formatted/src/paper_and_ribbon/indent_18.erl @@ -1,9 +1,9 @@ -module(indent_18). --format #{break_indent => 1, - inline_clause_bodies => true, +-format #{sub_indent => 8, + break_indent => 1, paper => 50, - sub_indent => 8}. + inline_clause_bodies => true}. -record(record, {fields = diff --git a/after/src/paper_and_ribbon/indent_81.erl b/formatted/src/paper_and_ribbon/indent_81.erl index 4b00c9d..b4324a8 100644 --- a/after/src/paper_and_ribbon/indent_81.erl +++ b/formatted/src/paper_and_ribbon/indent_81.erl @@ -1,8 +1,8 @@ -module(indent_81). --format #{break_indent => 8, - paper => 50, - sub_indent => 1}. +-format #{sub_indent => 1, + break_indent => 8, + paper => 50}. -format #{inline_clause_bodies => true}. -record(record, %%% test_app_SUITE ==> test_app: FAILED %%% test_app_SUITE ==> {test_case_failed,<<"diff --git a/after/src/brackets.erl b/formatted/src/brackets.erl\nindex 7c9a386..895c33d 100644\n--- a/after/src/brackets.erl\n+++ b/formatted/src/brackets.erl\n@@ -1,6 +1,6 @@\n -module(brackets).\n \n--format #{inline_items => all, paper => 50}.\n+-format #{paper => 50, inline_items => all}.\n \n -compile(export_all).\n \ndiff --git a/after/src/inline_items/inline_items_when_over.erl b/formatted/src/inline_items/inline_items_when_over.erl\nindex c77e270..ba744a1 100644\n--- a/after/src/inline_items/inline_items_when_over.erl\n+++ b/formatted/src/inline_items/inline_items_when_over.erl\n@@ -3,7 +3,7 @@\n %% per line if they're larger than 5 elements.\n -module(inline_items_when_over).\n \n--format #{inline_items => {when_over, 5}, paper => 80}.\n+-format #{paper => 80, inline_items => {when_over, 5}}.\n \n -export([short_tuple/0, short_list/0, short_fun/0]).\n -export([short_bin/0, short_guard/1, short_lc/0]).\ndiff --git a/after/src/inline_items/inline_items_when_under.erl b/formatted/src/inline_items/inline_items_when_under.erl\nindex 55bc77c..b26e42c 100644\n--- a/after/src/inline_items/inline_items_when_under.erl\n+++ b/formatted/src/inline_items/inline_items_when_under.erl\n@@ -1,6 +1,6 @@\n -module(inline_items_when_under).\n \n--format #{inline_items => {when_under, 5}, paper => 80}.\n+-format #{paper => 80, inline_items => {when_under, 5}}.\n \n -export([short_tuple/0, short_list/0, short_fun/0]).\n -export([short_bin/0, short_guard/1, short_lc/0]).\ndiff --git a/after/src/inline_items/inline_no_items.erl b/formatted/src/inline_items/inline_no_items.erl\nindex 0ab7b30..86db03c 100644\n--- a/after/src/inline_items/inline_no_items.erl\n+++ b/formatted/src/inline_items/inline_no_items.erl\n@@ -3,7 +3,7 @@\n %% per line if they're large.\n -module(inline_no_items).\n \n--format #{inline_items => none, paper => 80}.\n+-format #{paper => 80, inline_items => none}.\n \n -export([short_tuple/0, short_list/0, short_fun/0]).\n -export([short_bin/0, short_guard/1, short_lc/0]).\ndiff --git a/after/src/otp25.erl b/formatted/src/otp25.erl\nindex d846028..a38bc5b 100644\n--- a/after/src/otp25.erl\n+++ b/formatted/src/otp25.erl\n@@ -3,40 +3,10 @@\n \n -feature(maybe_expr, enable).\n \n--export(['maybe'/0, 'else'/0, short/0]).\n+-export([maybe/0, else/0, short/0]).\n \n-'maybe'() ->\n- maybe\n- 'maybe' ?= multiple:expressions(),\n- with ?= question:equal(),\n- which ?=\n- should_indent_properly_even_if:the_next_thing(is_very_very_extremely_long_and_goes_beyond_the_margin),\n- which ?=\n- should_indent_properly_even_if:the_next_thing(is_very_very_extremely_long,\n- and_goes_beyond_the_margin)\n- end.\n+'maybe'( ) -> maybe 'maybe' ?= multiple : expressions( ) , with ?= question : equal( ) , which ?= should_indent_properly_even_if : the_next_thing( is_very_very_extremely_long_and_goes_beyond_the_margin ) , which ?= should_indent_properly_even_if : the_next_thing( is_very_very_extremely_long , and_goes_beyond_the_margin ) end .\n \n-'else'() ->\n- OneLiner =\n- maybe\n- ok ?= ok\n- else\n- _ ->\n- ng\n- end,\n- MultiLiner =\n- maybe\n- ok ?= ok\n- else\n- _ ->\n- more:than(),\n- one:expression(),\n- in:the_else()\n- end,\n- {OneLiner, MultiLiner}.\n+'else'( ) -> OneLiner = maybe ok ?= ok else _ -> ng end , MultiLiner = maybe ok ?= ok else _ -> more : than( ) , one : expression( ) , in : the_else( ) end , { OneLiner , MultiLiner } .\n \n-short() ->\n- maybe\n- A ?= one:liner()\n- end,\n- A.\n+short( ) -> maybe A ?= one : liner( ) end , A .\ndiff --git a/after/src/paper_and_ribbon/indent_18.erl b/formatted/src/paper_and_ribbon/indent_18.erl\nindex c342542..dc7f951 100644\n--- a/after/src/paper_and_ribbon/indent_18.erl\n+++ b/formatted/src/paper_and_ribbon/indent_18.erl\n@@ -1,9 +1,9 @@\n -module(indent_18).\n \n--format #{break_indent => 1,\n- inline_clause_bodies => true,\n+-format #{sub_indent => 8,\n+ break_indent => 1,\n paper => 50,\n- sub_indent => 8}.\n+ inline_clause_bodies => true}.\n \n -record(record,\n {fields =\ndiff --git a/after/src/paper_and_ribbon/indent_81.erl b/formatted/src/paper_and_ribbon/indent_81.erl\nindex 4b00c9d..b4324a8 100644\n--- a/after/src/paper_and_ribbon/indent_81.erl\n+++ b/formatted/src/paper_and_ribbon/indent_81.erl\n@@ -1,8 +1,8 @@\n -module(indent_81).\n \n--format #{break_indent => 8,\n- paper => 50,\n- sub_indent => 1}.\n+-format #{sub_indent => 1,\n+ break_indent => 8,\n+ paper => 50}.\n -format #{inline_clause_bodies => true}.\n \n -record(record,\n">>} . Testing lib.rebar3_format: TEST COMPLETE, 25 ok, 1 failed of 26 test cases ```

[elbrujohalcon]

Yup… out of scope, @pablocostass

[pablocostass]

Arghhhh ex_doc worked in my machine (albeit it still outputted those warnings) but in the CI is failing 🙄

Reverting that too