Skip to content

Commit

Permalink
Merge pull request #143 from adoptoposs/dependabot/cargo/native/mjml_…
Browse files Browse the repository at this point in the history
…nif/mrml-3.1.5

Bump mrml from 3.0.4 to 3.1.5 in /native/mjml_nif
  • Loading branch information
paulgoetze authored Apr 18, 2024
2 parents 52a4b21 + 636698b commit 679e842
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 7 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]).
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -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
[
Expand Down
22 changes: 19 additions & 3 deletions native/mjml_nif/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions native/mjml_nif/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "mjml_nif"
version = "3.0.3"
version = "3.1.0"
authors = ["Paul Götze"]
edition = "2021"

Expand All @@ -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"]
Expand Down

0 comments on commit 679e842

Please sign in to comment.