Merge pull request #2296 from ferd/update-relx-4.0.0-rc2

bump relx to rc2
erlang · May 28, 2020 · 728bd2c · 728bd2c
2 parents e339167 + 3b4f8ca
commit 728bd2c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/rebar.config b/rebar.config
@@ -8,8 +8,7 @@
         {providers,           "1.8.1"},
         {getopt,              "1.0.1"},
         {bbmustache,          "1.8.0"},
-        %% {relx,                "3.33.0"},
-        {relx, {git, "https://github.com/erlware/relx.git", {branch, "master"}}},
+        {relx,                "4.0.0-rc2"},
         {cf,                  "0.2.2"},
         {cth_readable,        "1.4.8"},
         {eunit_formatters,    "0.5.0"}]}.

diff --git a/rebar.lock b/rebar.lock
@@ -8,10 +8,7 @@
  {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},0},
  {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.0">>},0},
  {<<"providers">>,{pkg,<<"providers">>,<<"1.8.1">>},0},
- {<<"relx">>,
-  {git,"https://github.com/erlware/relx.git",
-       {ref,"0d9d6255a53af63927f826c0b827b3741a8ed458"}},
-  0},
+ {<<"relx">>,{pkg,<<"relx">>,<<"4.0.0-rc2">>},0},
  {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.5">>},0}]}.
 [
 {pkg_hash,[
@@ -24,6 +21,7 @@
  {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>},
  {<<"parse_trans">>, <<"09765507A3C7590A784615CFD421D101AEC25098D50B89D7AA1D66646BC571C1">>},
  {<<"providers">>, <<"70B4197869514344A8A60E2B2A4EF41CA03DEF43CFB1712ECF076A0F3C62F083">>},
+ {<<"relx">>, <<"6031ED37FB496435FA992E52E540C22020B6678C9FA541CD748F987AD9D732D7">>},
  {<<"ssl_verify_fun">>, <<"6EAF7AD16CB568BB01753DBBD7A95FF8B91C7979482B95F38443FE2C8852A79B">>}]},
 {pkg_hash_ext,[
  {<<"bbmustache">>, <<"190EA2206128BDFABF5D9200B8DF97F6511D9C62953655828E28C2BC79161252">>},
@@ -35,5 +33,6 @@
  {<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>},
  {<<"parse_trans">>, <<"17EF63ABDE837AD30680EA7F857DD9E7CED9476CDD7B0394432AF4BFC241B960">>},
  {<<"providers">>, <<"E45745ADE9C476A9A469EA0840E418AB19360DC44F01A233304E118A44486BA0">>},
+ {<<"relx">>, <<"7DF43DC485821DC5B7EBC4C43487A06F68769F1406C12D6EC47FC6A3889F23D4">>},
  {<<"ssl_verify_fun">>, <<"13104D7897E38ED7F044C4DE953A6C28597D1C952075EB2E328BC6D6F2BFC496">>}]}
 ].