From 4d6938c741ecdf102ef3299d1b7a92dca1d3e281 Mon Sep 17 00:00:00 2001 From: Sean Hinde Date: Wed, 10 Nov 2021 14:21:23 +0100 Subject: [PATCH 1/3] Update aebytecode dep for otp-24 --- rebar.config | 2 +- rebar.lock | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rebar.config b/rebar.config index b57782d..52516dc 100644 --- a/rebar.config +++ b/rebar.config @@ -2,7 +2,7 @@ {erl_opts, [debug_info]}. -{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {ref,"05dfd7f"}}} +{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {ref,"0699f35"}}} , {getopt, "1.0.1"} , {eblake2, "1.0.0"} , {jsx, {git, "https://github.com/talentdeficit/jsx.git", diff --git a/rebar.lock b/rebar.lock index 8df56f7..0cdb1c0 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,7 +1,7 @@ -{"1.1.0", +{"1.2.0", [{<<"aebytecode">>, {git,"https://github.com/aeternity/aebytecode.git", - {ref,"05dfd7ffc7fb1e07ecc0b1e516da571f56d7dc8f"}}, + {ref,"0699f35b0398bac6cd4468da654d608375bd853d"}}, 0}, {<<"aeserialization">>, {git,"https://github.com/aeternity/aeserialization.git", @@ -24,5 +24,8 @@ [ {pkg_hash,[ {<<"eblake2">>, <<"EC8AD20E438AAB3F2E8D5D118C366A0754219195F8A0F536587440F8F9BCF2EF">>}, - {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]} + {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]}, +{pkg_hash_ext,[ + {<<"eblake2">>, <<"3C4D300A91845B25D501929A26AC2E6F7157480846FAB2347A4C11AE52E08A99">>}, + {<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>}]} ]. From 30bedad16414ba574ed4d638ae4b0e6821da3bca Mon Sep 17 00:00:00 2001 From: Sean Hinde Date: Wed, 10 Nov 2021 14:25:33 +0100 Subject: [PATCH 2/3] Use older rebar3 for upgrade --- rebar.lock | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/rebar.lock b/rebar.lock index 0cdb1c0..207d6e9 100644 --- a/rebar.lock +++ b/rebar.lock @@ -24,8 +24,5 @@ [ {pkg_hash,[ {<<"eblake2">>, <<"EC8AD20E438AAB3F2E8D5D118C366A0754219195F8A0F536587440F8F9BCF2EF">>}, - {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]}, -{pkg_hash_ext,[ - {<<"eblake2">>, <<"3C4D300A91845B25D501929A26AC2E6F7157480846FAB2347A4C11AE52E08A99">>}, - {<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>}]} + {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]} ]. From 6b46fc268b5ea88a19a7ad54a5d9a4d3295f8cb2 Mon Sep 17 00:00:00 2001 From: Sean Hinde Date: Wed, 10 Nov 2021 14:32:29 +0100 Subject: [PATCH 3/3] Use older rebar3 for upgrade --- rebar.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebar.lock b/rebar.lock index 207d6e9..10be9f5 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,4 +1,4 @@ -{"1.2.0", +{"1.1.0", [{<<"aebytecode">>, {git,"https://github.com/aeternity/aebytecode.git", {ref,"0699f35b0398bac6cd4468da654d608375bd853d"}},