include changes from unmerged PR bitwalker#772

Author: brycejohnston

.github/workflows/elixir.yml

@@ -7,13 +7,20 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
+      fail-fast: true
       matrix:
-        otp: ['24.2', '25']
-        elixir: ['1.12.3', '1.13.3', '1.14.0']
-        exclude:
-          - otp: '25'
-            elixir: '1.12.3'
+        include:
+          - otp: "27.2"
+            elixir: "1.18.0"
+            experimental: false
+          - otp: "27.2"
+            elixir: "1.17.3"
+            experimental: false
+          - otp: "26.2"
+            elixir: "1.17.3"
+            experimental: false
     steps:
       - uses: actions/checkout@v2
       - uses: erlef/setup-beam@v1
@@ -22,4 +29,3 @@ jobs:
           elixir-version: ${{matrix.elixir}}
       - run: mix deps.get
       - run: mix test
-

CHANGELOG.md

@@ -20,6 +20,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Corrected pluralization rules for bg/cs/he/id/ro/ru
 - Fixed documentation formatting of `Timex.TimezoneInfo.create/6`
 - Updated tzdata to fix issues with 2024b
+- Fix deprecation: Module.eval_quoted/4 is deprecated. Use Code.eval_quoted/3 instead
+- Update dependencies and fix deprecations when using Gettext 0.26.x
 
 ---
 
@@ -553,4 +555,4 @@ name. Timezone abbreviations are only supported if they are POSIX timezones in t
 ### Fixed
 - Timezone abbreviation handling (was previously non-deterministic/incorrect)
 - Disable tzdata's auto-update during compilation
-- Usage of imperative if
+- Usage of imperative if

lib/format/datetime/formatter.ex

@@ -890,6 +890,6 @@ defmodule Timex.Format.DateTime.Formatter do
   defp pad_char(:zeroes), do: <<?0>>
   defp pad_char(:spaces), do: <<32>>
 
-  defp width_spec(min..max), do: [min: min, max: max]
+  defp width_spec(min..max//1), do: [min: min, max: max]
   defp width_spec(min, max), do: [min: min, max: max]
 end

lib/l10n/gettext.ex

@@ -1,3 +1,3 @@
 defmodule Timex.Gettext do
-  use Gettext, otp_app: :timex, priv: "priv/translations"
+  use Gettext.Backend, otp_app: :timex, priv: "priv/translations"
 end

lib/l10n/translator.ex

@@ -1,5 +1,5 @@
 defmodule Timex.Translator do
-  import Timex.Gettext
+  use Gettext, backend: Timex.Gettext
 
   defmacro with_locale(locale, do: block) do
     quote do

lib/timex.ex

@@ -1202,7 +1202,7 @@ defmodule Timex do
         def day_to_num(unquote(atom)), do: unquote(day_num)
       end
 
-    Module.eval_quoted(__MODULE__, day_quoted, [], __ENV__)
+    Code.eval_quoted(day_quoted, [], __ENV__)
   end)
 
   # Make an attempt at cleaning up the provided string
@@ -1300,7 +1300,7 @@ defmodule Timex do
         end
       end
 
-    Module.eval_quoted(__MODULE__, month_quoted, [], __ENV__)
+    Code.eval_quoted(month_quoted, [], __ENV__)
   end)
 
   # Make an attempt at cleaning up the provided string

lib/timezone/utils.ex

@@ -19,7 +19,7 @@ defmodule Timex.Timezone.Utils do
         def to_olson(unquote(key)), do: unquote(value)
       end
 
-    Module.eval_quoted(__MODULE__, quoted, [], __ENV__)
+    Code.eval_quoted(quoted, [], __ENV__)
   end)
 
   def to_olson(_tz), do: nil
@@ -39,7 +39,7 @@ defmodule Timex.Timezone.Utils do
         def olson_to_win(unquote(key)), do: unquote(value)
       end
 
-    Module.eval_quoted(__MODULE__, quoted, [], __ENV__)
+    Code.eval_quoted(quoted, [], __ENV__)
   end)
 
   def olson_to_win(_tz), do: nil

mix.exs

@@ -57,12 +57,12 @@ defmodule Timex.Mixfile do
     [
       {:tzdata, "~> 1.1"},
       {:combine, "~> 0.10"},
-      {:gettext, "~> 0.20"},
+      {:gettext, "~> 0.26"},
       {:ex_doc, "~> 0.13", only: [:docs]},
       {:benchfella, "~> 0.3", only: [:bench]},
       {:dialyxir, "~> 1.0", only: [:dev], runtime: false},
       {:excoveralls, "~> 0.4", only: [:test]},
-      {:stream_data, "~> 0.4", only: [:test]}
+      {:stream_data, "~> 1.1", only: [:test]}
     ]
   end
 

mix.lock

@@ -7,8 +7,8 @@
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "ex_doc": {:hex, :ex_doc, "0.28.4", "001a0ea6beac2f810f1abc3dbf4b123e9593eaa5f00dd13ded024eae7c523298", [: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", "bf85d003dd34911d89c8ddb8bda1a958af3471a274a4c2150a9c01c78ac3f8ed"},
   "excoveralls": {:hex, :excoveralls, "0.14.4", "295498f1ae47bdc6dce59af9a585c381e1aefc63298d48172efaaa90c3d251db", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "e3ab02f2df4c1c7a519728a6f0a747e71d7d6e846020aae338173619217931c1"},
-  "expo": {:hex, :expo, "0.3.0", "13127c1d5f653b2927f2616a4c9ace5ae372efd67c7c2693b87fd0fdc30c6feb", [:mix], [], "hexpm", "fb3cd4bf012a77bc1608915497dae2ff684a06f0fa633c7afa90c4d72b881823"},
-  "gettext": {:hex, :gettext, "0.22.0", "a25d71ec21b1848957d9207b81fd61cb25161688d282d58bdafef74c2270bdc4", [:mix], [{:expo, "~> 0.3.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "cb0675141576f73720c8e49b4f0fd3f2c69f0cd8c218202724d4aebab8c70ace"},
+  "expo": {:hex, :expo, "1.1.0", "f7b9ed7fb5745ebe1eeedf3d6f29226c5dd52897ac67c0f8af62a07e661e5c75", [:mix], [], "hexpm", "fbadf93f4700fb44c331362177bdca9eeb8097e8b0ef525c9cc501cb9917c960"},
+  "gettext": {:hex, :gettext, "0.26.2", "5978aa7b21fada6deabf1f6341ddba50bc69c999e812211903b169799208f2a8", [:mix], [{:expo, "~> 0.5.1 or ~> 1.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "aa978504bcf76511efdc22d580ba08e2279caab1066b76bb9aa81c4a1e0a32a5"},
   "hackney": {:hex, :hackney, "1.18.1", "f48bf88f521f2a229fc7bae88cf4f85adc9cd9bcf23b5dc8eb6a1788c662c4f6", [:rebar3], [{:certifi, "~>2.9.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "a4ecdaff44297e9b5894ae499e9a070ea1888c84afdd1fd9b7b2bc384950128e"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "jason": {:hex, :jason, "1.3.0", "fa6b82a934feb176263ad2df0dbd91bf633d4a46ebfdffea0c8ae82953714946", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "53fc1f51255390e0ec7e50f9cb41e751c260d065dcba2bf0d08dc51a4002c2ac"},
@@ -20,7 +20,7 @@
   "nimble_parsec": {:hex, :nimble_parsec, "1.2.3", "244836e6e3f1200c7f30cb56733fd808744eca61fd182f731eac4af635cc6d0b", [:mix], [], "hexpm", "c8d789e39b9131acf7b99291e93dae60ab48ef14a7ee9d58c6964f59efb570b0"},
   "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"},
-  "stream_data": {:hex, :stream_data, "0.5.0", "b27641e58941685c75b353577dc602c9d2c12292dd84babf506c2033cd97893e", [:mix], [], "hexpm", "012bd2eec069ada4db3411f9115ccafa38540a3c78c4c0349f151fc761b9e271"},
+  "stream_data": {:hex, :stream_data, "1.2.0", "58dd3f9e88afe27dc38bef26fce0c84a9e7a96772b2925c7b32cd2435697a52b", [:mix], [], "hexpm", "eb5c546ee3466920314643edf68943a5b14b32d1da9fe01698dc92b73f89a9ed"},
   "tzdata": {:hex, :tzdata, "1.1.2", "45e5f1fcf8729525ec27c65e163be5b3d247ab1702581a94674e008413eef50b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "cec7b286e608371602318c414f344941d5eb0375e14cfdab605cca2fe66cba8b"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
 }