From d77d5323d9eee98eb74b14d80d5272992ac0704d Mon Sep 17 00:00:00 2001 From: Benjamin Schultzer Date: Sat, 27 Apr 2024 12:00:58 -0400 Subject: [PATCH] Update CHANGELOG, mix and README --- .github/workflows/{elixir.yml => ci.yml} | 0 CHANGELOG.md | 10 ++++++++++ README.md | 6 +++--- mix.exs | 18 +++++++++--------- mix.lock | 2 +- 5 files changed, 23 insertions(+), 13 deletions(-) rename .github/workflows/{elixir.yml => ci.yml} (100%) diff --git a/.github/workflows/elixir.yml b/.github/workflows/ci.yml similarity index 100% rename from .github/workflows/elixir.yml rename to .github/workflows/ci.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index b8e9f64..acf0b68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## Cldr Territories v2.9.0 Apr TBD, 2024 + +### Enhancements + +* Updates to support [CLDR release 45](https://cldr.unicode.org/index/downloads/cldr-45) via [ex_cldr version 2.38](https://hex.pm/packages/ex_cldr/2.38.0) +* Fixed typespec in `info/1` and `info!/1`, thanks to @jfpedroza. +* Fixed typespec in `known_territory_subdivision/0`, thanks to @richard-ash. +* Fixed compiler warnings for Elixir 1.16, thanks to @tomciopp. +* Require Elixir 1.12.0. + ## Cldr Territories v2.8.1 July 18, 2023 ### Enhancements diff --git a/README.md b/README.md index 06673be..1472f16 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Cldr for Territories -[![CircleCI](https://circleci.com/gh/Schultzer/cldr_territories.svg?style=svg)](https://circleci.com/gh/Schultzer/cldr_territories) +![main](https://github.com/github/docs/actions/workflows/elixir.yml/badge.svg?branch=main) ## Introduction and Getting Started @@ -87,14 +87,14 @@ iex> h MyCldr.Territory.from_territory_code ## Installation -Note that `:ex_cldr_territories` requires Elixir 1.5 or later. +Note that `:ex_cldr_territories` requires Elixir 1.12 or later. Add `ex_cldr_territories` as a dependency to your `mix` project: ```elixir defp deps do [ - {:ex_cldr_territories, "~> 2.4.1"} + {:ex_cldr_territories, "~> 2.9.0"} ] end ``` diff --git a/mix.exs b/mix.exs index 6ea87ee..a317756 100644 --- a/mix.exs +++ b/mix.exs @@ -1,7 +1,7 @@ defmodule Cldr.Territories.Mixfile do use Mix.Project - @version "2.8.1" + @version "2.9.0" def project do [ @@ -9,7 +9,7 @@ defmodule Cldr.Territories.Mixfile do version: @version, elixir: "~> 1.12", name: "Cldr Territories", - source_url: "https://github.com/schultzer/cldr_territories", + source_url: "https://github.com/elixir-cldr/cldr_territories", description: description(), package: package(), docs: docs(), @@ -47,10 +47,10 @@ defmodule Cldr.Territories.Mixfile do end defp cldr_dep do - cond do - path = System.get_env("CLDR_PATH") -> {:ex_cldr, path: path} - branch = System.get_env("BRANCH") -> {:ex_cldr, github: "elixir-cldr/cldr", branch: branch} - true -> {:ex_cldr, git: "https://github.com/elixir-cldr/cldr.git"} + if path = System.get_env("CLDR_PATH") do + {:ex_cldr, path: path} + else + {:ex_cldr, github: "elixir-cldr/cldr", branch: System.get_env("BRANCH", "main")} end end @@ -74,9 +74,9 @@ defmodule Cldr.Territories.Mixfile do def links do %{ - "GitHub" => "https://github.com/schultzer/cldr_territories", - "Readme" => "https://github.com/schultzer/cldr_territories/blob/v#{@version}/README.md", - "Changelog" => "https://github.com/schultzer/cldr_territories/blob/v#{@version}/CHANGELOG.md" + "GitHub" => "https://github.com/elixir-cldr/cldr_territories", + "Readme" => "https://github.com/elixir-cldr/cldr_territories/blob/v#{@version}/README.md", + "Changelog" => "https://github.com/elixir-cldr/cldr_territories/blob/v#{@version}/CHANGELOG.md" } end diff --git a/mix.lock b/mix.lock index e3a1038..1ae6854 100644 --- a/mix.lock +++ b/mix.lock @@ -6,7 +6,7 @@ "earmark": {:hex, :earmark, "1.4.5", "62ffd3bd7722fb7a7b1ecd2419ea0b458c356e7168c1f5d65caf09b4fbdd13c8", [:mix], [], "hexpm", "b7d0e6263d83dc27141a523467799a685965bf8b13b6743413f19a7079843f4f"}, "earmark_parser": {:hex, :earmark_parser, "1.4.19", "de0d033d5ff9fc396a24eadc2fcf2afa3d120841eb3f1004d138cbf9273210e8", [:mix], [], "hexpm", "527ab6630b5c75c3a3960b75844c314ec305c76d9899bb30f71cb85952a9dc45"}, "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"}, - "ex_cldr": {:git, "https://github.com/elixir-cldr/cldr.git", "801293c10d57fe63388078d51fdd42d4f24b7fa6", []}, + "ex_cldr": {:git, "https://github.com/elixir-cldr/cldr.git", "ccb1a6e6d7ec98b8c45e9fec6c13f71240ad685e", [branch: "main"]}, "ex_doc": {:hex, :ex_doc, "0.28.1", "34fab7e7201c5a1f275f3b2f837125c940c512e8543d181bd4dd7acb19c8dba0", [:mix], [{:earmark_parser, "~> 1.4.19", [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", "10e564dd59101a5edc4de7009a54baed015a246dee01f7200aab24e8f57fc044"}, "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"}, "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},