From c3f938710ab690e71b09d95c5ab11f15fdcb0f36 Mon Sep 17 00:00:00 2001 From: Kyle Boe Date: Tue, 19 Apr 2022 13:50:58 -0700 Subject: [PATCH 01/13] Bump gen_smtp version to remove Rebar2 deprecation warning --- mix.exs | 4 ++-- mix.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mix.exs b/mix.exs index 333161c..c0ff3c6 100644 --- a/mix.exs +++ b/mix.exs @@ -2,7 +2,7 @@ defmodule BambooSmtp.Mixfile do use Mix.Project @project_url "https://github.com/fewlinesco/bamboo_smtp" - @version "4.1.0" + @version "4.2.0" def project do [ @@ -30,7 +30,7 @@ defmodule BambooSmtp.Mixfile do [ # core {:bamboo, "~> 2.2.0"}, - {:gen_smtp, "~> 1.1.1"}, + {:gen_smtp, "~> 1.2.0"}, # dev / test {:credo, "~> 1.5.0", only: [:dev, :test]}, diff --git a/mix.lock b/mix.lock index 9bc96c7..b348b69 100644 --- a/mix.lock +++ b/mix.lock @@ -8,7 +8,7 @@ "ex_doc": {:hex, :ex_doc, "0.24.2", "e4c26603830c1a2286dae45f4412a4d1980e1e89dc779fcd0181ed1d5a05c8d9", [: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", "e134e1d9e821b8d9e4244687fb2ace58d479b67b282de5158333b0d57c6fb7da"}, "excoveralls": {:hex, :excoveralls, "0.14.1", "14140e4ef343f2af2de33d35268c77bc7983d7824cb945e6c2af54235bc2e61f", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "4a588f9f8cf9dc140cc1f3d0ea4d849b2f76d5d8bee66b73c304bb3d3689c8b0"}, "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"}, - "gen_smtp": {:hex, :gen_smtp, "1.1.1", "bf9303c31735100631b1d708d629e4c65944319d1143b5c9952054f4a1311d85", [:rebar3], [{:hut, "1.3.0", [hex: :hut, repo: "hexpm", optional: false]}, {:ranch, ">= 1.7.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "51bc50cc017efd4a4248cbc39ea30fb60efa7d4a49688986fafad84434ff9ab7"}, + "gen_smtp": {:hex, :gen_smtp, "1.2.0", "9cfc75c72a8821588b9b9fe947ae5ab2aed95a052b81237e0928633a13276fd3", [:rebar3], [{:ranch, ">= 1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "5ee0375680bca8f20c4d85f58c2894441443a743355430ff33a783fe03296779"}, "hackney": {:hex, :hackney, "1.17.4", "99da4674592504d3fb0cfef0db84c3ba02b4508bae2dff8c0108baa0d6e0977c", [:rebar3], [{:certifi, "~>2.6.1", [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", "de16ff4996556c8548d512f4dbe22dd58a587bf3332e7fd362430a7ef3986b16"}, "hut": {:hex, :hut, "1.3.0", "71f2f054e657c03f959cf1acc43f436ea87580696528ca2a55c8afb1b06c85e7", [:"erlang.mk", :rebar, :rebar3], [], "hexpm", "7e15d28555d8a1f2b5a3a931ec120af0753e4853a4c66053db354f35bf9ab563"}, "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"}, @@ -24,7 +24,7 @@ "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"}, "plug": {:hex, :plug, "1.11.1", "f2992bac66fdae679453c9e86134a4201f6f43a687d8ff1cd1b2862d53c80259", [:mix], [{:mime, "~> 1.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", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "23524e4fefbb587c11f0833b3910bfb414bf2e2534d61928e920f54e3a1b881f"}, "plug_crypto": {:hex, :plug_crypto, "1.2.2", "05654514ac717ff3a1843204b424477d9e60c143406aa94daf2274fdd280794d", [:mix], [], "hexpm", "87631c7ad914a5a445f0a3809f99b079113ae4ed4b867348dd9eec288cecb6db"}, - "ranch": {:hex, :ranch, "2.0.0", "fbf3d79661c071543256f9051caf19d65daa6df1cf6824d8f37a49b19a66f703", [:rebar3], [], "hexpm", "c20a4840c7d6623c19812d3a7c828b2f1bd153ef0f124cb69c54fe51d8a42ae0"}, + "ranch": {:hex, :ranch, "2.1.0", "2261f9ed9574dcfcc444106b9f6da155e6e540b2f82ba3d42b339b93673b72a3", [:make, :rebar3], [], "hexpm", "244ee3fa2a6175270d8e1fc59024fd9dbc76294a321057de8f803b1479e76916"}, "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"}, "telemetry": {:hex, :telemetry, "0.4.3", "a06428a514bdbc63293cd9a6263aad00ddeb66f608163bdec7c8995784080818", [:rebar3], [], "hexpm", "eb72b8365ffda5bed68a620d1da88525e326cb82a75ee61354fc24b844768041"}, "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"}, From 78a38ef412a1772b262cf4a3311a7b77f5b9a6e2 Mon Sep 17 00:00:00 2001 From: Kyle Boe Date: Tue, 19 Apr 2022 14:06:28 -0700 Subject: [PATCH 02/13] bump to latest patch release of elixir versions and add elixir 1.13.4 --- .github/workflows/bamboo_smtp.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bamboo_smtp.yml b/.github/workflows/bamboo_smtp.yml index 6931465..59474f3 100644 --- a/.github/workflows/bamboo_smtp.yml +++ b/.github/workflows/bamboo_smtp.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - elixir: [1.7.4, 1.8.2, 1.9.1, 1.10.3, 1.11.3, 1.12.0] + elixir: [1.7.4, 1.8.2, 1.9.1, 1.10.3, 1.11.3, 1.12.3, 1.13.4] otp: [20.3, 21.3, 22.0, 23.0, 24.0.1] exclude: - elixir: 1.7.4 @@ -25,9 +25,13 @@ jobs: otp: 20.3 - elixir: 1.11.3 otp: 20.3 - - elixir: 1.12.0 + - elixir: 1.12.3 otp: 20.3 - - elixir: 1.12.0 + - elixir: 1.12.3 + otp: 21.3 + - elixir: 1.13.4 + otp: 20.3 + - elixir: 1.13.4 otp: 21.3 steps: - name: Checkout code From aadb647d785eff75a710eda05c37c590cf675df4 Mon Sep 17 00:00:00 2001 From: Kyle Boe Date: Tue, 19 Apr 2022 14:10:12 -0700 Subject: [PATCH 03/13] setup-elixir has been deprecated in favor of setup-beam See note at https://github.com/actions/setup-elixir --- .github/workflows/bamboo_smtp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bamboo_smtp.yml b/.github/workflows/bamboo_smtp.yml index 59474f3..f7cfe94 100644 --- a/.github/workflows/bamboo_smtp.yml +++ b/.github/workflows/bamboo_smtp.yml @@ -42,7 +42,7 @@ jobs: path: deps key: ${{ runner.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}-elixir-${{ matrix.elixir }}-otp-${{ matrix.otp }} - - uses: erlef/setup-elixir@v1 + - uses: erlef/setup-beam@v1 with: otp-version: ${{ matrix.otp }} elixir-version: ${{ matrix.elixir }} @@ -64,7 +64,7 @@ jobs: path: deps key: ${{ runner.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }} - - uses: erlef/setup-elixir@v1 + - uses: erlef/setup-beam@v1 with: otp-version: 22.0 elixir-version: 1.10.3 From 92099909c9e4b68a2f0e924c1dfb608774c4e4ee Mon Sep 17 00:00:00 2001 From: Kyle Boe Date: Mon, 6 Jun 2022 16:47:51 -0700 Subject: [PATCH 04/13] Lock ranch dep to ~> 2.0.0 --- mix.exs | 1 + mix.lock | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mix.exs b/mix.exs index c0ff3c6..e568ef3 100644 --- a/mix.exs +++ b/mix.exs @@ -31,6 +31,7 @@ defmodule BambooSmtp.Mixfile do # core {:bamboo, "~> 2.2.0"}, {:gen_smtp, "~> 1.2.0"}, + {:ranch, "2.0.0"}, # dev / test {:credo, "~> 1.5.0", only: [:dev, :test]}, diff --git a/mix.lock b/mix.lock index b348b69..b983f3a 100644 --- a/mix.lock +++ b/mix.lock @@ -24,7 +24,7 @@ "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"}, "plug": {:hex, :plug, "1.11.1", "f2992bac66fdae679453c9e86134a4201f6f43a687d8ff1cd1b2862d53c80259", [:mix], [{:mime, "~> 1.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", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "23524e4fefbb587c11f0833b3910bfb414bf2e2534d61928e920f54e3a1b881f"}, "plug_crypto": {:hex, :plug_crypto, "1.2.2", "05654514ac717ff3a1843204b424477d9e60c143406aa94daf2274fdd280794d", [:mix], [], "hexpm", "87631c7ad914a5a445f0a3809f99b079113ae4ed4b867348dd9eec288cecb6db"}, - "ranch": {:hex, :ranch, "2.1.0", "2261f9ed9574dcfcc444106b9f6da155e6e540b2f82ba3d42b339b93673b72a3", [:make, :rebar3], [], "hexpm", "244ee3fa2a6175270d8e1fc59024fd9dbc76294a321057de8f803b1479e76916"}, + "ranch": {:hex, :ranch, "2.0.0", "fbf3d79661c071543256f9051caf19d65daa6df1cf6824d8f37a49b19a66f703", [:rebar3], [], "hexpm", "c20a4840c7d6623c19812d3a7c828b2f1bd153ef0f124cb69c54fe51d8a42ae0"}, "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"}, "telemetry": {:hex, :telemetry, "0.4.3", "a06428a514bdbc63293cd9a6263aad00ddeb66f608163bdec7c8995784080818", [:rebar3], [], "hexpm", "eb72b8365ffda5bed68a620d1da88525e326cb82a75ee61354fc24b844768041"}, "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"}, From 64aac497bd88a1441fc38c6cf0ce9241b8792550 Mon Sep 17 00:00:00 2001 From: Kyle Boe Date: Fri, 10 Jun 2022 15:19:40 -0700 Subject: [PATCH 05/13] Remove OTP < 21 to adhere with gen_smtp minimum version https://github.com/gen-smtp/gen_smtp/blob/99fad81cc3aeb33657ff7598c846c4120c3a480e/rebar.config\#L2 --- .github/workflows/bamboo_smtp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bamboo_smtp.yml b/.github/workflows/bamboo_smtp.yml index f7cfe94..052eaa0 100644 --- a/.github/workflows/bamboo_smtp.yml +++ b/.github/workflows/bamboo_smtp.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: elixir: [1.7.4, 1.8.2, 1.9.1, 1.10.3, 1.11.3, 1.12.3, 1.13.4] - otp: [20.3, 21.3, 22.0, 23.0, 24.0.1] + otp: [21.3, 22.0, 23.0, 24.0.1] exclude: - elixir: 1.7.4 otp: 24.0.1 From cfc86c6f1b0b001bd05c86c48384eccce2434a68 Mon Sep 17 00:00:00 2001 From: Kyle Boe Date: Fri, 10 Jun 2022 15:22:40 -0700 Subject: [PATCH 06/13] Bump to latest versions of OTP in strategy matrix --- .github/workflows/bamboo_smtp.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/bamboo_smtp.yml b/.github/workflows/bamboo_smtp.yml index 052eaa0..0dadae3 100644 --- a/.github/workflows/bamboo_smtp.yml +++ b/.github/workflows/bamboo_smtp.yml @@ -13,24 +13,16 @@ jobs: strategy: matrix: elixir: [1.7.4, 1.8.2, 1.9.1, 1.10.3, 1.11.3, 1.12.3, 1.13.4] - otp: [21.3, 22.0, 23.0, 24.0.1] + otp: [21.3, 22.3, 23.3, 24.3] exclude: - elixir: 1.7.4 - otp: 24.0.1 + otp: 24.3 - elixir: 1.8.2 - otp: 24.0.1 + otp: 24.3 - elixir: 1.9.1 - otp: 24.0.1 - - elixir: 1.10.3 - otp: 20.3 - - elixir: 1.11.3 - otp: 20.3 - - elixir: 1.12.3 - otp: 20.3 + otp: 24.3 - elixir: 1.12.3 otp: 21.3 - - elixir: 1.13.4 - otp: 20.3 - elixir: 1.13.4 otp: 21.3 steps: From 30fb529d31d18be103bcbf567786d48c98cfe5fb Mon Sep 17 00:00:00 2001 From: Kyle Boe Date: Fri, 10 Jun 2022 15:26:58 -0700 Subject: [PATCH 07/13] Use latest otp/elixir to build docs --- .github/workflows/bamboo_smtp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bamboo_smtp.yml b/.github/workflows/bamboo_smtp.yml index 0dadae3..cac6c0e 100644 --- a/.github/workflows/bamboo_smtp.yml +++ b/.github/workflows/bamboo_smtp.yml @@ -58,8 +58,8 @@ jobs: - uses: erlef/setup-beam@v1 with: - otp-version: 22.0 - elixir-version: 1.10.3 + otp-version: 24.3 + elixir-version: 1.13.4 - run: mix deps.get --only docs - run: MIX_ENV=docs mix inch.report From 450d654af82542db6054a616ba0279a65a845313 Mon Sep 17 00:00:00 2001 From: Kyle Boe Date: Fri, 10 Jun 2022 15:56:32 -0700 Subject: [PATCH 08/13] update credo --- mix.exs | 2 +- mix.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mix.exs b/mix.exs index e568ef3..cb664ef 100644 --- a/mix.exs +++ b/mix.exs @@ -34,7 +34,7 @@ defmodule BambooSmtp.Mixfile do {:ranch, "2.0.0"}, # dev / test - {:credo, "~> 1.5.0", only: [:dev, :test]}, + {:credo, "~> 1.6.0", only: [:dev, :test]}, {:excoveralls, "~> 0.14.0", only: :test}, # doc diff --git a/mix.lock b/mix.lock index b983f3a..0139974 100644 --- a/mix.lock +++ b/mix.lock @@ -2,7 +2,7 @@ "bamboo": {:hex, :bamboo, "2.2.0", "f10a406d2b7f5123eb1f02edfa043c259db04b47ab956041f279eaac776ef5ce", [:mix], [{:hackney, ">= 1.15.2", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.4", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "8c3b14ba7d2f40cb4be04128ed1e2aff06d91d9413d38bafb4afccffa3ade4fc"}, "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"}, "certifi": {:hex, :certifi, "2.6.1", "dbab8e5e155a0763eea978c913ca280a6b544bfa115633fa20249c3d396d9493", [:rebar3], [], "hexpm", "524c97b4991b3849dd5c17a631223896272c6b0af446778ba4675a1dff53bb7e"}, - "credo": {:hex, :credo, "1.5.6", "e04cc0fdc236fefbb578e0c04bd01a471081616e741d386909e527ac146016c6", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "4b52a3e558bd64e30de62a648518a5ea2b6e3e5d2b164ef5296244753fc7eb17"}, + "credo": {:hex, :credo, "1.6.4", "ddd474afb6e8c240313f3a7b0d025cc3213f0d171879429bf8535d7021d9ad78", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "c28f910b61e1ff829bffa056ef7293a8db50e87f2c57a9b5c3f57eee124536b7"}, "earmark": {:hex, :earmark, "1.4.15", "2c7f924bf495ec1f65bd144b355d0949a05a254d0ec561740308a54946a67888", [:mix], [{:earmark_parser, ">= 1.4.13", [hex: :earmark_parser, repo: "hexpm", optional: false]}], "hexpm", "3b1209b85bc9f3586f370f7c363f6533788fb4e51db23aa79565875e7f9999ee"}, "earmark_parser": {:hex, :earmark_parser, "1.4.13", "0c98163e7d04a15feb62000e1a891489feb29f3d10cb57d4f845c405852bbef8", [:mix], [], "hexpm", "d602c26af3a0af43d2f2645613f65841657ad6efc9f0e361c3b6c06b578214ba"}, "ex_doc": {:hex, :ex_doc, "0.24.2", "e4c26603830c1a2286dae45f4412a4d1980e1e89dc779fcd0181ed1d5a05c8d9", [: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", "e134e1d9e821b8d9e4244687fb2ace58d479b67b282de5158333b0d57c6fb7da"}, @@ -13,7 +13,7 @@ "hut": {:hex, :hut, "1.3.0", "71f2f054e657c03f959cf1acc43f436ea87580696528ca2a55c8afb1b06c85e7", [:"erlang.mk", :rebar, :rebar3], [], "hexpm", "7e15d28555d8a1f2b5a3a931ec120af0753e4853a4c66053db354f35bf9ab563"}, "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"}, "inch_ex": {:hex, :inch_ex, "2.0.0", "24268a9284a1751f2ceda569cd978e1fa394c977c45c331bb52a405de544f4de", [:mix], [{:bunt, "~> 0.2", [hex: :bunt, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "96d0ec5ecac8cf63142d02f16b7ab7152cf0f0f1a185a80161b758383c9399a8"}, - "jason": {:hex, :jason, "1.2.2", "ba43e3f2709fd1aa1dce90aaabfd039d000469c05c56f0b8e31978e03fa39052", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "18a228f5f0058ee183f29f9eae0805c6e59d61c3b006760668d8d18ff0d12179"}, + "jason": {:hex, :jason, "1.3.0", "fa6b82a934feb176263ad2df0dbd91bf633d4a46ebfdffea0c8ae82953714946", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "53fc1f51255390e0ec7e50f9cb41e751c260d065dcba2bf0d08dc51a4002c2ac"}, "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"}, "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"}, From 063284ae78419dc5f8f2cd6ef0e7f4490ba756c5 Mon Sep 17 00:00:00 2001 From: Kyle Boe Date: Fri, 10 Jun 2022 16:01:08 -0700 Subject: [PATCH 09/13] Specifically need a fix in credo >= 1.6.1 https://github.com/rrrene/credo/issues/893\#issuecomment-973857552 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mix.exs b/mix.exs index cb664ef..33687ab 100644 --- a/mix.exs +++ b/mix.exs @@ -34,7 +34,7 @@ defmodule BambooSmtp.Mixfile do {:ranch, "2.0.0"}, # dev / test - {:credo, "~> 1.6.0", only: [:dev, :test]}, + {:credo, "~> 1.6.1", only: [:dev, :test]}, {:excoveralls, "~> 0.14.0", only: :test}, # doc From cad787afba273379b6c59012d9c45115337a411d Mon Sep 17 00:00:00 2001 From: Kyle Boe Date: Fri, 10 Jun 2022 16:01:23 -0700 Subject: [PATCH 10/13] Make credo adjustments --- lib/bamboo/adapters/smtp_adapter.ex | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/bamboo/adapters/smtp_adapter.ex b/lib/bamboo/adapters/smtp_adapter.ex index b037e73..5b59bdc 100644 --- a/lib/bamboo/adapters/smtp_adapter.ex +++ b/lib/bamboo/adapters/smtp_adapter.ex @@ -413,10 +413,7 @@ defmodule Bamboo.SMTPAdapter do defp raise_on_missing_configuration([], config), do: config defp raise_on_missing_configuration(errors, config) do - formatted_errors = - errors - |> Enum.map(&"* #{&1}") - |> Enum.join("\n") + formatted_errors = Enum.map_join(errors, &"* #{&1}", "\n") raise ArgumentError, """ The following settings have not been found in your settings: From 64d842b1a8c9fc917f6ae4f2e7dd053fb42346b5 Mon Sep 17 00:00:00 2001 From: Kyle Boe Date: Fri, 10 Jun 2022 16:04:13 -0700 Subject: [PATCH 11/13] correct map_join argument order --- lib/bamboo/adapters/smtp_adapter.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bamboo/adapters/smtp_adapter.ex b/lib/bamboo/adapters/smtp_adapter.ex index 5b59bdc..6dc57ea 100644 --- a/lib/bamboo/adapters/smtp_adapter.ex +++ b/lib/bamboo/adapters/smtp_adapter.ex @@ -413,7 +413,7 @@ defmodule Bamboo.SMTPAdapter do defp raise_on_missing_configuration([], config), do: config defp raise_on_missing_configuration(errors, config) do - formatted_errors = Enum.map_join(errors, &"* #{&1}", "\n") + formatted_errors = Enum.map_join(errors, "\n", &"* #{&1}") raise ArgumentError, """ The following settings have not been found in your settings: From a366b1828102a9ea4c0a196c1b51dd32bb90d506 Mon Sep 17 00:00:00 2001 From: Kyle Boe Date: Fri, 10 Jun 2022 16:08:59 -0700 Subject: [PATCH 12/13] Update .tool-versions file to latest elixir/otp --- .tool-versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.tool-versions b/.tool-versions index a5aabb2..96369e6 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -elixir 1.12.0 -erlang 24.0.1 +elixir 1.13.4 +erlang 24.3.4 From 2e151ab62c64397cccd2a66203c62495ca297d13 Mon Sep 17 00:00:00 2001 From: Kyle Boe Date: Fri, 10 Jun 2022 16:25:02 -0700 Subject: [PATCH 13/13] Update changelog for v4.2.0 --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0d1c27..8daa56f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # CHANGELOG +## 4.2.0 + +- Drop testing for OTP ~> 20.3 to align with [gen_smtp minimum otp version of 21](https://github.com/gen-smtp/gen_smtp/blob/99fad81cc3aeb33657ff7598c846c4120c3a480e/rebar.config#L2) ([#205]) +- Bump elixir to 1.13.4 and erlang to 24.3.4 ([#205]) +- Use `Enum.map_join/3` instead of `Enum.map/2 |> Enum.join/2` ([#205]) +- Dependencies update ([#205]): + - core: + - gen_smtp, ~> 1.2.0 + - dev/test: + - credo, ~> 1.6.1 + +[#205]: https://github.com/fewlinesco/bamboo_smtp/pull/205 + ## 4.1.0 - Bump elixir to 1.12.0 and erlang to 24.0 ([#191])