From 19776a44d11e2de794460b11afeda3d8563cfe10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 15:56:38 +0000 Subject: [PATCH 1/3] Bump mrml from 3.0.4 to 3.1.5 in /native/mjml_nif Bumps [mrml](https://github.com/jdrouet/mrml) from 3.0.4 to 3.1.5. - [Release notes](https://github.com/jdrouet/mrml/releases) - [Changelog](https://github.com/jdrouet/mrml/blob/main/changelog.md) - [Commits](https://github.com/jdrouet/mrml/compare/mrml-v3.0.4...mrml-v3.1.5) --- updated-dependencies: - dependency-name: mrml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- native/mjml_nif/Cargo.lock | 20 ++++++++++++++++++-- native/mjml_nif/Cargo.toml | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/native/mjml_nif/Cargo.lock b/native/mjml_nif/Cargo.lock index b6aa2ee..8715e72 100644 --- a/native/mjml_nif/Cargo.lock +++ b/native/mjml_nif/Cargo.lock @@ -21,6 +21,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "either" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" + [[package]] name = "equivalent" version = "1.0.1" @@ -50,6 +56,15 @@ dependencies = [ "serde", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -72,11 +87,12 @@ dependencies = [ [[package]] name = "mrml" -version = "3.0.4" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11090cceb14c2eaf9d10c1503937b3a53323f322c475f409c1e51a0d86949a8d" +checksum = "ed4c5f1e193a156a026c7e899b45b70b1499d887260f66ee40de60be0619e103" dependencies = [ "indexmap", + "itertools", "mrml-macros", "rustc-hash", "thiserror", diff --git a/native/mjml_nif/Cargo.toml b/native/mjml_nif/Cargo.toml index ac91c81..1fa269f 100644 --- a/native/mjml_nif/Cargo.toml +++ b/native/mjml_nif/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib"] [dependencies] rustler = "0.32.1" -mrml = { version = "3.0", default-features = false, features = ["parse", "render", "orderedmap"] } +mrml = { version = "3.1", default-features = false, features = ["parse", "render", "orderedmap"] } [features] default = ["nif_version_2_15"] From 17a01e2ab9b6bae85d4363542009e0e392dd0a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20G=C3=B6tze?= Date: Thu, 18 Apr 2024 10:47:38 +0200 Subject: [PATCH 2/3] Bump version to 3.1.0 --- mix.exs | 2 +- native/mjml_nif/Cargo.lock | 2 +- native/mjml_nif/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mix.exs b/mix.exs index 84f874a..d8e7da2 100644 --- a/mix.exs +++ b/mix.exs @@ -2,7 +2,7 @@ defmodule Mjml.MixProject do use Mix.Project @source_url "https://github.com/adoptoposs/mjml_nif" - @version "3.0.3" + @version "3.1.0" def project do [ diff --git a/native/mjml_nif/Cargo.lock b/native/mjml_nif/Cargo.lock index 8715e72..05490aa 100644 --- a/native/mjml_nif/Cargo.lock +++ b/native/mjml_nif/Cargo.lock @@ -79,7 +79,7 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "mjml_nif" -version = "3.0.3" +version = "3.1.0" dependencies = [ "mrml", "rustler", diff --git a/native/mjml_nif/Cargo.toml b/native/mjml_nif/Cargo.toml index 1fa269f..ebb35dd 100644 --- a/native/mjml_nif/Cargo.toml +++ b/native/mjml_nif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mjml_nif" -version = "3.0.3" +version = "3.1.0" authors = ["Paul Götze"] edition = "2021" From 636698b8d91e6797d53de223f0c138fc63ecff54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20G=C3=B6tze?= Date: Thu, 18 Apr 2024 10:48:40 +0200 Subject: [PATCH 3/3] Update changelog for v3.1.0 --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19dd403..97de5c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,12 @@ I.e. `mjml_nif 0.x` versions use mrml versions `>= 0.1, < 1.0.0`, and `mjml_nif ## [Unreleased] +## [3.1.0] - 2024-04-18 + +- Use [mrml] v3.1.5 (see [mrml diff v3.0.4..v3.1.5][mrml-v3.0.4-v3.1.5]) +- Use rustler v0.32.1 + + ## [3.0.3] - 2024-03-09 - Use [mrml] v3.0.4, which fixes applying mj-attributes inside mj-include tags and ensures fonts are rendered once (see https://github.com/jdrouet/mrml/issues/378, https://github.com/jdrouet/mrml/issues/383, [mrml diff v3.0.2..v3.0.4][mrml-v3.0.2-v3.0.4]). @@ -132,7 +138,8 @@ I.e. `mjml_nif 0.x` versions use mrml versions `>= 0.1, < 1.0.0`, and `mjml_nif ## [0.1.0] – 2020-07-19 Initial release -[Unreleased]: https://github.com/adoptoposs/mjml_nif/compare/v3.0.3...HEAD +[Unreleased]: https://github.com/adoptoposs/mjml_nif/compare/v3.1.0...HEAD +[3.1.0]: https://github.com/adoptoposs/mjml_nif/compare/v3.0.3...v3.1.0 [3.0.3]: https://github.com/adoptoposs/mjml_nif/compare/v3.0.2...v3.0.3 [3.0.2]: https://github.com/adoptoposs/mjml_nif/compare/v3.0.1...v3.0.2 [3.0.1]: https://github.com/adoptoposs/mjml_nif/compare/v3.0.0...v3.0.1 @@ -158,6 +165,7 @@ Initial release [0.1.0]: https://github.com/adoptoposs/mjml_nif/compare/e77d33e9bcb58e0e2e9e522322d97ebdcb212618...v0.1.0 [mrml]: https://github.com/jdrouet/mrml +[mrml-v3.0.4-v3.1.5]: https://github.com/jdrouet/mrml/compare/mrml-v3.0.4...mrml-v3.1.5 [mrml-v3.0.2-v3.0.4]: https://github.com/jdrouet/mrml/compare/mrml-v3.0.2...mrml-v3.0.4 [mrml-v3.0.1-v3.0.2]: https://github.com/jdrouet/mrml/compare/mrml-v3.0.1...mrml-v3.0.2 [mrml-v3.0.0-v3.0.1]: https://github.com/jdrouet/mrml/compare/mrml-v3.0.0...mrml-v3.0.1