diff --git a/.circleci/config.yml b/.circleci/config.yml index 7e54d81..d684caa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 executors: aebuilder: docker: - - image: aeternity/builder:xenial-otp21 + - image: aeternity/builder:bionic-otp24 user: builder working_directory: ~/aesophia diff --git a/CHANGELOG.md b/CHANGELOG.md index edf51e6..eb15d90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added +### Changed +### Removed + +## [7.0.0] +### Added - Added support for `EXIT` opcode via `exit : (string) => 'a` function (behaves same as `ABORT`, but consumes all gas). -- Compiler warnings for the follwing: shadowing, negative spends, division by zero, unused functions, unused includes, unused stateful annotations, unused variables, unused parameters, unused user-defined type, dead return value. +- Compiler warnings for the following: shadowing, negative spends, division by zero, unused functions, unused includes, unused stateful annotations, unused variables, unused parameters, unused user-defined type, dead return value. - The pipe operator |> ``` [1, 2, 3] |> List.first |> Option.is_some // Option.is_some(List.first([1, 2, 3])) @@ -347,7 +352,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Simplify calldata creation - instead of passing a compiled contract, simply pass a (stubbed) contract string. -[Unreleased]: https://github.com/aeternity/aesophia/compare/v6.1.0...HEAD +[Unreleased]: https://github.com/aeternity/aesophia/compare/v7.0.0...HEAD +[7.0.0]: https://github.com/aeternity/aesophia/compare/v6.1.0...v7.0.0 [6.1.0]: https://github.com/aeternity/aesophia/compare/v6.0.2...v6.1.0 [6.0.2]: https://github.com/aeternity/aesophia/compare/v6.0.1...v6.0.2 [6.0.1]: https://github.com/aeternity/aesophia/compare/v6.0.0...v6.0.1 diff --git a/rebar.config b/rebar.config index 52516dc..7c86de1 100644 --- a/rebar.config +++ b/rebar.config @@ -2,11 +2,10 @@ {erl_opts, [debug_info]}. -{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {ref,"0699f35"}}} +{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {tag, "v3.1.1"}}} , {getopt, "1.0.1"} , {eblake2, "1.0.0"} - , {jsx, {git, "https://github.com/talentdeficit/jsx.git", - {tag, "2.8.0"}}} + , {jsx, {git, "https://github.com/talentdeficit/jsx.git", {tag, "2.8.0"}}} ]}. {dialyzer, [ @@ -15,7 +14,7 @@ {base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]} ]}. -{relx, [{release, {aesophia, "6.1.0"}, +{relx, [{release, {aesophia, "7.0.0"}, [aesophia, aebytecode, getopt]}, {dev_mode, true}, diff --git a/rebar.lock b/rebar.lock index 10be9f5..a1be66e 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,11 +1,11 @@ -{"1.1.0", +{"1.2.0", [{<<"aebytecode">>, {git,"https://github.com/aeternity/aebytecode.git", - {ref,"0699f35b0398bac6cd4468da654d608375bd853d"}}, + {ref,"8269dbd71e9011921c60141636f1baa270a0e784"}}, 0}, {<<"aeserialization">>, {git,"https://github.com/aeternity/aeserialization.git", - {ref,"47aaa8f5434b365c50a35bfd1490340b19241991"}}, + {ref,"eb68fe331bd476910394966b7f5ede7a74d37e35"}}, 1}, {<<"base58">>, {git,"https://github.com/aeternity/erl-base58.git", @@ -14,7 +14,7 @@ {<<"eblake2">>,{pkg,<<"eblake2">>,<<"1.0.0">>},0}, {<<"enacl">>, {git,"https://github.com/aeternity/enacl.git", - {ref,"26180f42c0b3a450905d2efd8bc7fd5fd9cece75"}}, + {ref,"793ddb502f7fe081302e1c42227dca70b09f8e17"}}, 2}, {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},0}, {<<"jsx">>, @@ -24,5 +24,8 @@ [ {pkg_hash,[ {<<"eblake2">>, <<"EC8AD20E438AAB3F2E8D5D118C366A0754219195F8A0F536587440F8F9BCF2EF">>}, - {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]} + {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]}, +{pkg_hash_ext,[ + {<<"eblake2">>, <<"3C4D300A91845B25D501929A26AC2E6F7157480846FAB2347A4C11AE52E08A99">>}, + {<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>}]} ]. diff --git a/rebar3 b/rebar3 index ea5a116..a83d554 100755 Binary files a/rebar3 and b/rebar3 differ diff --git a/src/aesophia.app.src b/src/aesophia.app.src index 9f35aea..972c4e2 100644 --- a/src/aesophia.app.src +++ b/src/aesophia.app.src @@ -1,6 +1,6 @@ {application, aesophia, [{description, "Compiler for Aeternity Sophia language"}, - {vsn, "6.1.0"}, + {vsn, "7.0.0"}, {registered, []}, {applications, [kernel,