From a11648307e0d5b54a56cf8208f5bf0b48b2b1bd1 Mon Sep 17 00:00:00 2001 From: Kip Cole Date: Sat, 25 Sep 2021 10:30:39 +0800 Subject: [PATCH] Support phoenix_html version 3.x as well as 1.x and 2.x --- CHANGELOG.md | 8 ++++++++ mix.exs | 6 +++--- mix.lock | 12 ++++++------ test/cldr_html_currency_test.exs | 4 ++-- test/cldr_html_locale_test.exs | 2 +- test/cldr_html_territory_test.exs | 10 +++++----- test/cldr_html_unit_test.exs | 6 +++--- 7 files changed, 28 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69be4b6..fda1449 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## Cldr_HTML v1.1.0 + +This is the changelog for Cldr HTML v1.1.0 released on September 25th, 2021. For older changelogs please consult the release tag on [GitHub](https://github.com/elixir-cldr/cldr_html/tags) + +### Bug Fixes + +* Support `phoenix_html` version 3.0 in additional to earlier releases. + ## Cldr_HTML v1.0.1 This is the changelog for Cldr HTML v1.0.1 released on September 2nd, 2021. For older changelogs please consult the release tag on [GitHub](https://github.com/elixir-cldr/cldr_html/tags) diff --git a/mix.exs b/mix.exs index 639b5b3..e5487ca 100644 --- a/mix.exs +++ b/mix.exs @@ -1,7 +1,7 @@ defmodule Cldr.Html.MixProject do use Mix.Project - @version "1.0.1" + @version "1.1.0" def project do [ @@ -43,7 +43,7 @@ defmodule Cldr.Html.MixProject do defp package do [ maintainers: ["Kip Cole"], - licenses: ["Apache 2.0"], + licenses: ["Apache-2.0"], links: links(), files: [ "lib", @@ -84,7 +84,7 @@ defmodule Cldr.Html.MixProject do {:ex_cldr_territories, "~> 2.2", optional: true}, {:ex_cldr_collation, "~> 0.5", optional: true}, {:ex_money, "~> 5.0", optional: true}, - {:phoenix_html, "~> 1.2 or ~> 2.0"}, + {:phoenix_html, "~> 1.2 or ~> 2.0 or ~> 3.0"}, {:jason, "~> 1.0", optional: true}, {:poison, "~> 2.1 or ~> 3.0 or ~> 4.0", optional: true}, {:ex_doc, "~> 0.18", only: [:dev, :test, :release], runtime: false}, diff --git a/mix.lock b/mix.lock index a618d78..c79b773 100644 --- a/mix.lock +++ b/mix.lock @@ -8,16 +8,16 @@ "earmark_parser": {:hex, :earmark_parser, "1.4.15", "b29e8e729f4aa4a00436580dcc2c9c5c51890613457c193cc8525c388ccb2f06", [:mix], [], "hexpm", "044523d6438ea19c1b8ec877ec221b008661d3c27e3b848f4c879f500421ca5c"}, "elixir_make": {:hex, :elixir_make, "0.6.2", "7dffacd77dec4c37b39af867cedaabb0b59f6a871f89722c25b28fcd4bd70530", [:mix], [], "hexpm", "03e49eadda22526a7e5279d53321d1cced6552f344ba4e03e619063de75348d9"}, "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"}, - "ex_cldr": {:hex, :ex_cldr, "2.23.1", "a449fb44d00131b096f0e203da563827f731ceceafce50cf5e756379bf29e32a", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:cldr_utils, "~> 2.15", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.13", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "f7b42cf2d72bd48feda95890447ff7ef3a07d94c572bf9607db0f7d5c5effaf0"}, + "ex_cldr": {:hex, :ex_cldr, "2.23.2", "76c51b722cefdcd1a13eb5e7c7f4da5b9acfd64ff054424a977ff6e2d6a78981", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:cldr_utils, "~> 2.15", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.13", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "d9ce03c8d3fdc7ab751bdb2be742b6972f94adc856d51dfe5bb06a51ac96b8f4"}, "ex_cldr_collation": {:hex, :ex_cldr_collation, "0.6.0", "c748c34a411b8a0cef5754e29b95223795c740170c632b6a9dd706dcfa5b71e6", [:mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "4bba917037df921de143e9d53adff549a06ab7fcd50ef902c6e7842d26d6fa2d"}, "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.11.1", "a6e56209d6f98082cd197aa424333e7a0e38e79253fce9589117719728de4fef", [:mix], [{:ex_cldr, "~> 2.23", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "99e8eb3f48a30127bb11ab70f484c124c9fe5b11bce710c94c53939032b0c58c"}, "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.8.0", "373d8574d28590fdbc475436cc1590d37200867b4116f69a51e6e57cb0e62ee6", [:mix], [{:ex_cldr_numbers, "~> 2.17", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "455406d488452d6eb0b044e23a918e015418787ffc87791d81e7320742269483"}, - "ex_cldr_locale_display": {:hex, :ex_cldr_locale_display, "1.1.1", "36528547371d9885d7150e5fafb6f34512486ad52e09030bd71244dcf98e8de0", [:mix], [{:ex_cldr, "~> 2.23", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, "~> 2.11", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:ex_cldr_territories, "~> 2.2", [hex: :ex_cldr_territories, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "90fb8bb76cfaa15dda4b0e99bdf1b3d21e59dab6cdc25a94882b1c010e05ae20"}, - "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.22.0", "fd1bedc4275dd294316ea64faee61abac3bf5ccf78c8d2e4667eb4010790ddde", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.23", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, "~> 2.11", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "af8e726712744efe08bc3d5af795e29118269b46f64bc8950f57d7d8420baf7c"}, + "ex_cldr_locale_display": {:hex, :ex_cldr_locale_display, "1.1.2", "36f1faf123a800a010ddc1a5b3d9b870b73bcadb744e0e14ff8d9e2efc357941", [:mix], [{:ex_cldr, "~> 2.23", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, "~> 2.11", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:ex_cldr_territories, "~> 2.2", [hex: :ex_cldr_territories, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "c3191f392104af7dfad2611c094f858738cebc95963b15e2f65d204090f982a3"}, + "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.22.1", "c710abb30a89875a5e2aff5f8a5e073ffad8689c6e84034729f10c51d39c4dcf", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.23", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, "~> 2.11", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2015161a54f583eede00f18cdf43ec2b27aecf53e22486f6158d787da1f02bb9"}, "ex_cldr_territories": {:hex, :ex_cldr_territories, "2.2.2", "f7f3cdc0ed1b9948bd05565275f830738e2e2d9eb356b15ade4d6e3b643dbfbf", [:mix], [{:ex_cldr, "~> 2.20", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "931144e831eec3a337dec56b4009dbe6e5e16ff72f6de5b698c40431277b5442"}, "ex_cldr_units": {:hex, :ex_cldr_units, "3.7.1", "89241de864e4673fe352d15d5727d89c63c10ce9c271b827c07452719f5e2a16", [:mix], [{:cldr_utils, "~> 2.16", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:ex_cldr_lists, "~> 2.8", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.19", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:ratio, "~> 2.4", [hex: :ratio, repo: "hexpm", optional: false]}], "hexpm", "b9595bea124b6355632784bc8fb4a924c6456f1934a9a80359622e52b9bcdeb6"}, - "ex_doc": {:hex, :ex_doc, "0.25.1", "4b736fa38dc76488a937e5ef2944f5474f3eff921de771b25371345a8dc810bc", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "3200b0a69ddb2028365281fbef3753ea9e728683863d8cdaa96580925c891f67"}, - "ex_money": {:hex, :ex_money, "5.5.4", "e40ad29426b418f1444dca9b862c69b0b4a1bdc234f8b7b6d6266ef4576203d1", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.16", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "c17c3446497b4136238055a25c733c9f346c9585e967ebd4a54224170ca12f67"}, + "ex_doc": {:hex, :ex_doc, "0.25.3", "3edf6a0d70a39d2eafde030b8895501b1c93692effcbd21347296c18e47618ce", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "9ebebc2169ec732a38e9e779fd0418c9189b3ca93f4a676c961be6c1527913f5"}, + "ex_money": {:hex, :ex_money, "5.6.0", "f95b3ff03b5ae015d717f86d49bbf08d82b3e984b958799bb1061d79374110d4", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.16", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.0 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "fe8ac94f67bd461476011cb2bb90e8517769a734e5c23da649eb77c120081308"}, "jason": {:hex, :jason, "1.2.2", "ba43e3f2709fd1aa1dce90aaabfd039d000469c05c56f0b8e31978e03fa39052", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "18a228f5f0058ee183f29f9eae0805c6e59d61c3b006760668d8d18ff0d12179"}, "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"}, "makeup_elixir": {:hex, :makeup_elixir, "0.15.1", "b5888c880d17d1cc3e598f05cdb5b5a91b7b17ac4eaf5f297cb697663a1094dd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "db68c173234b07ab2a07f645a5acdc117b9f99d69ebf521821d89690ae6c6ec8"}, @@ -25,7 +25,7 @@ "mime": {:hex, :mime, "2.0.1", "0de4c81303fe07806ebc2494d5321ce8fb4df106e34dd5f9d787b637ebadc256", [:mix], [], "hexpm", "7a86b920d2aedce5fb6280ac8261ac1a739ae6c1a1ad38f5eadf910063008942"}, "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"}, "numbers": {:hex, :numbers, "5.2.4", "f123d5bb7f6acc366f8f445e10a32bd403c8469bdbce8ce049e1f0972b607080", [:mix], [{:coerce, "~> 1.0", [hex: :coerce, repo: "hexpm", optional: false]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "eeccf5c61d5f4922198395bf87a465b6f980b8b862dd22d28198c5e6fab38582"}, - "phoenix_html": {:hex, :phoenix_html, "2.14.3", "51f720d0d543e4e157ff06b65de38e13303d5778a7919bcc696599e5934271b8", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "efd697a7fff35a13eeeb6b43db884705cba353a1a41d127d118fda5f90c8e80f"}, + "phoenix_html": {:hex, :phoenix_html, "3.0.4", "232d41884fe6a9c42d09f48397c175cd6f0d443aaa34c7424da47604201df2e1", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ce17fd3cf815b2ed874114073e743507704b1f5288bb03c304a77458485efc8b"}, "plug": {:hex, :plug, "1.12.1", "645678c800601d8d9f27ad1aebba1fdb9ce5b2623ddb961a074da0b96c35187d", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d57e799a777bc20494b784966dc5fbda91eb4a09f571f76545b72a634ce0d30b"}, "plug_crypto": {:hex, :plug_crypto, "1.2.2", "05654514ac717ff3a1843204b424477d9e60c143406aa94daf2274fdd280794d", [:mix], [], "hexpm", "87631c7ad914a5a445f0a3809f99b079113ae4ed4b867348dd9eec288cecb6db"}, "poison": {:hex, :poison, "4.0.1", "bcb755a16fac91cad79bfe9fc3585bb07b9331e50cfe3420a24bcc2d735709ae", [:mix], [], "hexpm", "ba8836feea4b394bb718a161fc59a288fe0109b5006d6bdf97b6badfcf6f0f25"}, diff --git a/test/cldr_html_currency_test.exs b/test/cldr_html_currency_test.exs index ae8d77d..31fba0a 100644 --- a/test/cldr_html_currency_test.exs +++ b/test/cldr_html_currency_test.exs @@ -25,7 +25,7 @@ defmodule Cldr.HTML.Currency.Test do ~s() <> ~s() <> ~s() <> - ~s() <> ~s() + ~s() <> ~s() ) end @@ -64,7 +64,7 @@ defmodule Cldr.HTML.Currency.Test do ~s() + ~s() <> ~s() ) end diff --git a/test/cldr_html_locale_test.exs b/test/cldr_html_locale_test.exs index 21131b5..dc6ba0c 100644 --- a/test/cldr_html_locale_test.exs +++ b/test/cldr_html_locale_test.exs @@ -19,7 +19,7 @@ defmodule Cldr.HTML.Locale.Test do ~s{} <> ~s{} <> ~s{} <> - ~s{} <> + ~s{} <> ~s{} <> ~s{} diff --git a/test/cldr_html_territory_test.exs b/test/cldr_html_territory_test.exs index 259773b..d1a638a 100644 --- a/test/cldr_html_territory_test.exs +++ b/test/cldr_html_territory_test.exs @@ -16,7 +16,7 @@ defmodule Cldr.HTML.Territory.Test do ) assert string == ~s() @@ -36,7 +36,7 @@ defmodule Cldr.HTML.Territory.Test do ) assert string == ~s() @@ -54,7 +54,7 @@ defmodule Cldr.HTML.Territory.Test do ) assert string == ~s() end @@ -73,7 +73,7 @@ defmodule Cldr.HTML.Territory.Test do ~s() end @@ -90,7 +90,7 @@ defmodule Cldr.HTML.Territory.Test do ) assert string == ~s() diff --git a/test/cldr_html_unit_test.exs b/test/cldr_html_unit_test.exs index 7b45d7c..fdf0d5c 100644 --- a/test/cldr_html_unit_test.exs +++ b/test/cldr_html_unit_test.exs @@ -17,7 +17,7 @@ defmodule Cldr.HTML.Unit.Test do ) assert string == ~s() @@ -36,7 +36,7 @@ defmodule Cldr.HTML.Unit.Test do ) assert string == ~s() @@ -54,7 +54,7 @@ defmodule Cldr.HTML.Unit.Test do ) assert string == ~s() end