From 937241b6c7e4cea95faf97df807909e3e9bbf790 Mon Sep 17 00:00:00 2001 From: uzair aslam Date: Fri, 12 May 2023 01:41:20 +0500 Subject: [PATCH 1/3] Replace get_env with compile_env in module body --- lib/tesla/middleware/logger.ex | 5 ++++- lib/tesla/middleware/telemetry.ex | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/tesla/middleware/logger.ex b/lib/tesla/middleware/logger.ex index e88afc22..1ef70831 100644 --- a/lib/tesla/middleware/logger.ex +++ b/lib/tesla/middleware/logger.ex @@ -182,7 +182,10 @@ defmodule Tesla.Middleware.Logger do alias Tesla.Middleware.Logger.Formatter - @config Application.get_env(:tesla, __MODULE__, []) + @config if function_exported?(Application, :compile_env, 3), + do: Application.compile_env(:tesla, __MODULE__, []), else: + Application.get_env(:tesla, __MODULE__, []) + @format Formatter.compile(@config[:format]) @type log_level :: :info | :warn | :error diff --git a/lib/tesla/middleware/telemetry.ex b/lib/tesla/middleware/telemetry.ex index 549058b2..32ea4667 100644 --- a/lib/tesla/middleware/telemetry.ex +++ b/lib/tesla/middleware/telemetry.ex @@ -80,9 +80,10 @@ if Code.ensure_loaded?(:telemetry) do ``` """ - @disable_legacy_event Application.get_env(:tesla, Tesla.Middleware.Telemetry, - disable_legacy_event: false - )[:disable_legacy_event] + @disable_legacy_event (if function_exported?(Application, :compile_env, 3), + do: Application.compile_env(:tesla, __MODULE__), else: + Application.get_env(:tesla, __MODULE__, []))[:disable_legacy_event] || false + @behaviour Tesla.Middleware From f93160e8aaba674bb5422b64db5c71826d35fdaa Mon Sep 17 00:00:00 2001 From: uzair aslam Date: Fri, 12 May 2023 12:38:03 +0500 Subject: [PATCH 2/3] Put prefix with unused vars --- lib/tesla/middleware/telemetry.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tesla/middleware/telemetry.ex b/lib/tesla/middleware/telemetry.ex index 32ea4667..52fc9b72 100644 --- a/lib/tesla/middleware/telemetry.ex +++ b/lib/tesla/middleware/telemetry.ex @@ -143,7 +143,7 @@ if Code.ensure_loaded?(:telemetry) do end if @disable_legacy_event do - defp emit_legacy_event(duration, result) do + defp emit_legacy_event(_duration, _result) do :ok end else From b2711c0763d07f500c09cbf7cea9cba4f4c1bd37 Mon Sep 17 00:00:00 2001 From: uzair aslam Date: Sun, 14 May 2023 01:35:18 +0500 Subject: [PATCH 3/3] Upgrade versions - Elixir version to 1.10. - Tesla version to 1.7.0 --- lib/tesla/middleware/logger.ex | 4 +--- lib/tesla/middleware/telemetry.ex | 6 ++---- mix.exs | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/tesla/middleware/logger.ex b/lib/tesla/middleware/logger.ex index 1ef70831..8057b523 100644 --- a/lib/tesla/middleware/logger.ex +++ b/lib/tesla/middleware/logger.ex @@ -182,9 +182,7 @@ defmodule Tesla.Middleware.Logger do alias Tesla.Middleware.Logger.Formatter - @config if function_exported?(Application, :compile_env, 3), - do: Application.compile_env(:tesla, __MODULE__, []), else: - Application.get_env(:tesla, __MODULE__, []) + @config Application.compile_env(:tesla, __MODULE__, []) @format Formatter.compile(@config[:format]) diff --git a/lib/tesla/middleware/telemetry.ex b/lib/tesla/middleware/telemetry.ex index 52fc9b72..8310064a 100644 --- a/lib/tesla/middleware/telemetry.ex +++ b/lib/tesla/middleware/telemetry.ex @@ -80,10 +80,8 @@ if Code.ensure_loaded?(:telemetry) do ``` """ - @disable_legacy_event (if function_exported?(Application, :compile_env, 3), - do: Application.compile_env(:tesla, __MODULE__), else: - Application.get_env(:tesla, __MODULE__, []))[:disable_legacy_event] || false - + @disable_legacy_event Application.compile_env(:tesla, Tesla.Middleware.Telemetry, + disable_legacy_event: false)[:disable_legacy_event] @behaviour Tesla.Middleware diff --git a/mix.exs b/mix.exs index 41118e0b..f956abf9 100644 --- a/mix.exs +++ b/mix.exs @@ -2,7 +2,7 @@ defmodule Tesla.Mixfile do use Mix.Project @source_url "https://github.com/teamon/tesla" - @version "1.6.1" + @version "1.7.0" def project do [ @@ -10,7 +10,7 @@ defmodule Tesla.Mixfile do version: @version, description: description(), package: package(), - elixir: "~> 1.7", + elixir: "~> 1.10", elixirc_paths: elixirc_paths(Mix.env()), deps: deps(), lockfile: lockfile(System.get_env("LOCKFILE")),