From 844cd1c8d84dba206033084b50fb3a815469dac0 Mon Sep 17 00:00:00 2001 From: radrow Date: Wed, 26 May 2021 12:39:58 +0200 Subject: [PATCH 1/4] Prepare 6.0.0 --- CHANGELOG.md | 2 +- README.md | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8b8f58..53c9951 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed ### Removed -## [5.1.0] 2021-05-24 +## [6.0.0] 2021-05-26 ### Added - Child contracts - `Chain.clone` diff --git a/README.md b/README.md index a7c982c..6703cdd 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,12 @@ The compiler is currently being used three places ## Versioning -`aesophia` has a version that is only loosely connected to the version of the -Aeternity node - in principle they will share the major version but not -minor/patch version. The `aesophia` compiler version MUST be bumped whenever -there is a change in how byte code is generated, but it MAY also be bumped upon -API changes etc. +Versioning should follow [semantic versioning](https://semver.org/spec/v2.0.0) guidelines. Id est, given a version number MAJOR.MINOR.PATCH, increment the: + +- MAJOR version when you make incompatible API changes +- MINOR version when you add functionality in a backwards compatible manner +- PATCH version when you make backwards compatible bug fixes + ## Interface Modules -- 2.30.2 From a6701601f358964d0e04ae39701f214458e65144 Mon Sep 17 00:00:00 2001 From: radrow Date: Wed, 26 May 2021 12:40:27 +0200 Subject: [PATCH 2/4] Update docs --- docs/sophia.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sophia.md b/docs/sophia.md index a1fc518..dc36c2f 100644 --- a/docs/sophia.md +++ b/docs/sophia.md @@ -173,7 +173,7 @@ transaction still only uses up the gas spent running the contract. #### Contract factories and child contracts -Since the version 5.1.0 Sophia supports deploying contracts by other +Since the version 6.0.0 Sophia supports deploying contracts by other contracts. This can be done in two ways: - Contract cloning via [`Chain.clone`](sophia_stdlib.md#clone) -- 2.30.2 From 9b9343cb2405c1537d2dd194628463670d17f0e7 Mon Sep 17 00:00:00 2001 From: radrow Date: Wed, 26 May 2021 12:43:00 +0200 Subject: [PATCH 3/4] Prepare 6.0.0 one more time --- CHANGELOG.md | 4 ++-- rebar.config | 2 +- src/aesophia.app.src | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53c9951..e5636f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -298,8 +298,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/v5.1.0...HEAD -[5.1.0]: https://github.com/aeternity/aesophia/compare/v5.0.0...v5.1.0 +[Unreleased]: https://github.com/aeternity/aesophia/compare/v6.0.0...HEAD +[6.0.0]: https://github.com/aeternity/aesophia/compare/v5.0.0...v6.0.0 [5.0.0]: https://github.com/aeternity/aesophia/compare/v4.3.0...v5.0.0 [4.3.0]: https://github.com/aeternity/aesophia/compare/v4.2.0...v4.3.0 [4.2.0]: https://github.com/aeternity/aesophia/compare/v4.1.0...v4.2.0 diff --git a/rebar.config b/rebar.config index df4a71c..960c725 100644 --- a/rebar.config +++ b/rebar.config @@ -15,7 +15,7 @@ {base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]} ]}. -{relx, [{release, {aesophia, "5.1.0"}, +{relx, [{release, {aesophia, "6.0.0"}, [aesophia, aebytecode, getopt]}, {dev_mode, true}, diff --git a/src/aesophia.app.src b/src/aesophia.app.src index e21345c..5ae439f 100644 --- a/src/aesophia.app.src +++ b/src/aesophia.app.src @@ -1,6 +1,6 @@ {application, aesophia, [{description, "Contract Language for aeternity"}, - {vsn, "5.1.0"}, + {vsn, "6.0.0"}, {registered, []}, {applications, [kernel, -- 2.30.2 From 68ae75a671d90b61b00651edd61cd983b0324574 Mon Sep 17 00:00:00 2001 From: radrow Date: Wed, 26 May 2021 12:44:20 +0200 Subject: [PATCH 4/4] the --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6703cdd..68bcb6d 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The compiler is currently being used three places ## Versioning -Versioning should follow [semantic versioning](https://semver.org/spec/v2.0.0) guidelines. Id est, given a version number MAJOR.MINOR.PATCH, increment the: +Versioning should follow the [semantic versioning](https://semver.org/spec/v2.0.0) guidelines. Id est, given a version number MAJOR.MINOR.PATCH, increment the: - MAJOR version when you make incompatible API changes - MINOR version when you add functionality in a backwards compatible manner -- 2.30.2