chore: update dependencies

kivra · Nov 8, 2023 · 1fcd168 · 1fcd168
1 parent e5df6d6
commit 1fcd168
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 22 deletions.
diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
@@ -9,7 +9,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
+    - uses: erlef/[email protected]
+        with:
+          otp-version: 24
+          rebar3-version: "3.20.0" 
     - name: Compile
       run: rebar3 compile
     - name: Run tests
@@ -26,6 +30,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
+    - uses: erlef/[email protected]
+        with:
+          otp-version: 24
+          rebar3-version: "3.20.0"
     - name: Run dialyzer
       run: rebar3 dialyzer
diff --git a/Makefile b/Makefile
@@ -3,9 +3,9 @@ PROJECT = restc
 # Dependecies ##########################################################
 DEPS = hackney jsx erlsom
 
-dep_hackney       = hex 1.15.1
-dep_jsx           = hex 2.9.0
-dep_erlsom        = hex 1.5.0
+dep_hackney       = hex 1.20.1
+dep_jsx           = hex 3.1.0
+dep_erlsom        = hex 1.5.1
 
 # Standard targets #####################################################
 include erlang.mk

diff --git a/rebar.config b/rebar.config
@@ -1,6 +1,6 @@
-{deps, [{hackney,"1.19.0"},
-        {jsx,"2.11.0"},
-        {erlsom,"1.5.0"}
+{deps, [{hackney,"1.20.1"},
+        {jsx,"v3.1.0"},
+        {erlsom,"1.5.1"}
        ]}.
 
 {project_plugins, [rebar3_proper, erlfmt]}.

diff --git a/rebar.config.script b/rebar.config.script
@@ -5,8 +5,8 @@ case erlang:function_exported(rebar3, main, 1) of
         %% Rebuild deps, possibly including those that have been moved to
         %% profiles
         [{deps, [
-            {hackney,       ".*", {git, "https://github.com/benoitc/hackney.git",     {tag, "1.15.1"}}},
-            {jsx,           ".*", {git, "https://github.com/talentdeficit/jsx.git",   {tag, "v2.9.0"}}},
-            {erlsom,        ".*", {git, "https://github.com/willemdj/erlsom.git",     {tag, "1.5.0"}}}
+            {hackney,       ".*", {git, "https://github.com/benoitc/hackney.git",     {tag, "1.20.1"}}},
+            {jsx,           ".*", {git, "https://github.com/talentdeficit/jsx.git",   {tag, "v3.1.0"}}},
+            {erlsom,        ".*", {git, "https://github.com/willemdj/erlsom.git",     {tag, "1.5.1"}}}
         ]} | [Config || {Key, _Value}=Config <- CONFIG, Key =/= deps]]
 end.
diff --git a/rebar.lock b/rebar.lock
@@ -1,9 +1,9 @@
 {"1.2.0",
 [{<<"certifi">>,{pkg,<<"certifi">>,<<"2.6.1">>},1},
- {<<"erlsom">>,{pkg,<<"erlsom">>,<<"1.5.0">>},0},
- {<<"hackney">>,{pkg,<<"hackney">>,<<"1.17.4">>},0},
+ {<<"erlsom">>,{pkg,<<"erlsom">>,<<"1.5.1">>},0},
+ {<<"hackney">>,{pkg,<<"hackney">>,<<"1.20.1">>},0},
  {<<"idna">>,{pkg,<<"idna">>,<<"6.1.1">>},1},
- {<<"jsx">>,{pkg,<<"jsx">>,<<"2.9.0">>},0},
+ {<<"jsx">>,{pkg,<<"jsx">>,<<"3.1.0">>},0},
  {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},1},
  {<<"mimerl">>,{pkg,<<"mimerl">>,<<"1.2.0">>},1},
  {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.1">>},1},
@@ -12,21 +12,21 @@
 [
 {pkg_hash,[
  {<<"certifi">>, <<"DBAB8E5E155A0763EEA978C913CA280A6B544BFA115633FA20249C3D396D9493">>},
- {<<"erlsom">>, <<"C5A5CDD0EE0E8DCA62BCC4B13FF08DA24FDEFC16CCD8B25282A2FDA2BA1BE24A">>},
- {<<"hackney">>, <<"99DA4674592504D3FB0CFEF0DB84C3BA02B4508BAE2DFF8C0108BAA0D6E0977C">>},
+ {<<"erlsom">>, <<"C8FE2BABD33FF0846403F6522328B8AB676F896B793634CFE7EF181C05316C03">>},
+ {<<"hackney">>, <<"8D97AEC62DDDDD757D128BFD1DF6C5861093419F8F7A4223823537BAD5D064E2">>},
  {<<"idna">>, <<"8A63070E9F7D0C62EB9D9FCB360A7DE382448200FBBD1B106CC96D3D8099DF8D">>},
- {<<"jsx">>, <<"D2F6E5F069C00266CAD52FB15D87C428579EA4D7D73A33669E12679E203329DD">>},
+ {<<"jsx">>, <<"D12516BAA0BB23A59BB35DCCAF02A1BD08243FCBB9EFE24F2D9D056CCFF71268">>},
  {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>},
  {<<"mimerl">>, <<"67E2D3F571088D5CFD3E550C383094B47159F3EEE8FFA08E64106CDF5E981BE3">>},
  {<<"parse_trans">>, <<"16328AB840CC09919BD10DAB29E431DA3AF9E9E7E7E6F0089DD5A2D2820011D8">>},
  {<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>},
  {<<"unicode_util_compat">>, <<"BC84380C9AB48177092F43AC89E4DFA2C6D62B40B8BD132B1059ECC7232F9A78">>}]},
 {pkg_hash_ext,[
  {<<"certifi">>, <<"524C97B4991B3849DD5C17A631223896272C6B0AF446778BA4675A1DFF53BB7E">>},
- {<<"erlsom">>, <<"55A9DBF9CFA77FCFC108BD8E2C4F9F784DEA228A8F4B06EA10B684944946955A">>},
- {<<"hackney">>, <<"DE16FF4996556C8548D512F4DBE22DD58A587BF3332E7FD362430A7EF3986B16">>},
+ {<<"erlsom">>, <<"7965485494C5844DD127656AC40F141AADFA174839EC1BE1074E7EDF5B4239EB">>},
+ {<<"hackney">>, <<"FE9094E5F1A2A2C0A7D10918FEE36BFEC0EC2A979994CFF8CFE8058CD9AF38E3">>},
  {<<"idna">>, <<"92376EB7894412ED19AC475E4A86F7B413C1B9FBB5BD16DCCD57934157944CEA">>},
- {<<"jsx">>, <<"8EE1DB1CABAFDD578A2776A6AAAE87C2A8CE54B47B59E9EC7DAB5D7EB71CD8DC">>},
+ {<<"jsx">>, <<"0C5CC8FDC11B53CC25CF65AC6705AD39E54ECC56D1C22E4ADB8F5A53FB9427F3">>},
  {<<"metrics">>, <<"69B09ADDDC4F74A40716AE54D140F93BEB0FB8978D8636EADED0C31B6F099F16">>},
  {<<"mimerl">>, <<"F278585650AA581986264638EBF698F8BB19DF297F66AD91B18910DFC6E19323">>},
  {<<"parse_trans">>, <<"07CD9577885F56362D414E8C4C4E6BDF10D43A8767ABB92D24CBE8B24C54888B">>},

diff --git a/src/restc_body.erl b/src/restc_body.erl
@@ -21,8 +21,8 @@ decode(_, <<>>, Opts) ->
 decode(<<"application/json">>, Body, Opts0) ->
     Opts =
         case lists:member(return_maps, Opts0) of
-            true -> [return_maps];
-            false -> []
+            true -> [{return_maps, true}];
+            false -> [{return_maps, false}]
         end,
     jsx:decode(Body, Opts);
 decode(<<"application/xml">>, Body, _Opts) ->