Skip to content

Commit 39606b0

Browse files
committed
chore: upgrade deps to latest versions
1 parent 958f856 commit 39606b0

File tree

12 files changed

+98
-165
lines changed

12 files changed

+98
-165
lines changed

.github/workflows/test.yml

Lines changed: 34 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,33 @@
11
name: Test
22

3-
on: [push, pull_request]
3+
on: [pull_request]
44

55
jobs:
6-
test:
6+
Test:
77
runs-on: ubuntu-latest
8+
name: OTP ${{matrix.otp}} / Elixir ${{matrix.elixir}}
89
strategy:
910
matrix:
1011
elixir:
11-
- 1.13-slim # otp 24
12-
- 1.12-slim # otp 24
13-
- 1.11-slim # otp 23
14-
- 1.10-slim # otp 22
15-
- 1.9-slim # otp 22
16-
container:
17-
image: elixir:${{ matrix.elixir }}
12+
- 1.14
13+
- 1.13
14+
otp:
15+
- 25.3
16+
- 24.3
1817
steps:
1918
- uses: actions/checkout@v2
19+
- name: Set up Elixir
20+
uses: erlef/setup-beam@v1
21+
with:
22+
elixir-version: ${{ matrix.elixir }}
23+
otp-version: ${{ matrix.otp }}
24+
version-type: strict
25+
- name: Restore dependencies cache
26+
uses: actions/cache@v2
27+
with:
28+
path: deps
29+
key: ${{ runner.os }}-mix-${{ hashFiles('**/mix.lock') }}
30+
restore-keys: ${{ runner.os }}-mix-
2031
- name: Install Dependencies
2132
env:
2233
MIX_ENV: test
@@ -27,73 +38,26 @@ jobs:
2738
- name: Run Tests
2839
run: mix test --trace
2940

30-
test-1:
31-
name: run tests from v1.0.0
41+
Linting:
3242
runs-on: ubuntu-latest
33-
container:
34-
image: elixir:1.7-slim
3543
steps:
3644
- uses: actions/checkout@v2
37-
38-
- name: Install Dependencies
39-
env:
40-
MIX_ENV: test
41-
run: |
42-
mix local.rebar --force
43-
mix local.hex --force
44-
mix deps.get
45-
46-
- name: Checkout v1.0.0 tests
47-
uses: actions/checkout@v2
45+
- name: Set up Elixir
46+
uses: erlef/setup-beam@v1
4847
with:
49-
path: "test-1"
50-
ref: "v1.0.0-compat"
51-
52-
- name: Replace test dir with test-1/test dir
53-
run: |
54-
ls -la
55-
rm -rf test
56-
mv test-1/test test
57-
58-
- name: Run v1.0.0 Tests
59-
run: mix test --trace
60-
61-
test-poison3:
62-
runs-on: ubuntu-latest
63-
container:
64-
image: elixir:1.10-slim
65-
steps:
66-
- uses: actions/checkout@v2
48+
elixir-version: '1.13'
49+
otp-version: '24.3'
50+
version-type: strict
51+
- name: Restore dependencies cache
52+
uses: actions/cache@v2
53+
with:
54+
path: deps
55+
key: ${{ runner.os }}-mix-${{ hashFiles('**/mix.lock') }}
56+
restore-keys: ${{ runner.os }}-mix-
6757
- name: Install Dependencies
68-
env:
69-
MIX_ENV: test
70-
LOCKFILE: poison3
7158
run: |
7259
mix local.rebar --force
7360
mix local.hex --force
7461
mix deps.get
75-
- name: Run Tests for poison 3.x
76-
env:
77-
MIX_ENV: test
78-
LOCKFILE: poison3
79-
run: mix test --trace
80-
81-
Linting:
82-
runs-on: ubuntu-latest
83-
steps:
84-
- name: Checkout Code
85-
uses: actions/checkout@v1
86-
87-
- name: Set up Elixir
88-
uses: erlef/setup-beam@v1
89-
with:
90-
elixir-version: "1.14"
91-
otp-version: "24.3"
92-
93-
- name: Install Dependencies
94-
run: |
95-
mix local.rebar --force
96-
mix local.hex --force
97-
mix deps.get
98-
- name: Run Formatter
99-
run: mix format --check-formatted
62+
- name: Check Format
63+
run: mix format --check-formatted

config/config.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use Mix.Config
1+
import Config
22

33
config :tesla, adapter: Tesla.Adapter.Httpc
44

5-
if Mix.env() == :test do
5+
if config_env() == :test do
66
config :logger, :console,
77
level: :debug,
88
format: "$date $time [$level] $metadata$message\n"

lib/tesla/middleware/logger.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ defmodule Tesla.Middleware.Logger do
182182

183183
alias Tesla.Middleware.Logger.Formatter
184184

185-
@config Application.get_env(:tesla, __MODULE__, [])
185+
@config Application.compile_env(:tesla, __MODULE__, [])
186186
@format Formatter.compile(@config[:format])
187187

188188
@type log_level :: :info | :warn | :error

lib/tesla/middleware/retry.ex

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ defmodule Tesla.Middleware.Retry do
4747
(float between 0 and 1, defaults to 0.2)
4848
"""
4949

50-
# Not necessary in Elixir 1.14+
51-
import Bitwise
52-
5350
@behaviour Tesla.Middleware
5451

5552
@defaults [

lib/tesla/middleware/telemetry.ex

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,11 @@ if Code.ensure_loaded?(:telemetry) do
8080
```
8181
"""
8282

83-
@disable_legacy_event Application.get_env(:tesla, Tesla.Middleware.Telemetry,
84-
disable_legacy_event: false
85-
)[:disable_legacy_event]
83+
@disable_legacy_event Application.compile_env(
84+
:tesla,
85+
[Tesla.Middleware.Telemetry, :disable_legacy_event],
86+
false
87+
)
8688

8789
@behaviour Tesla.Middleware
8890

mix.exs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ defmodule Tesla.Mixfile do
5555
{:mime, "~> 1.0 or ~> 2.0"},
5656

5757
# http clients
58-
{:ibrowse, "4.4.0", optional: true},
58+
{:ibrowse, "~> 4.4", optional: true},
5959
{:hackney, "~> 1.6", optional: true},
6060
{:gun, "~> 1.3", optional: true},
6161
{:finch, "~> 0.13", optional: true},
@@ -74,17 +74,15 @@ defmodule Tesla.Mixfile do
7474
{:fuse, "~> 2.4", optional: true},
7575
{:telemetry, "~> 0.4 or ~> 1.0", optional: true},
7676

77-
# testing & docs
78-
{:excoveralls, "~> 0.8", only: :test},
77+
# devtools
78+
{:excoveralls, ">= 0.0.0", only: :test, runtime: false},
79+
{:ex_doc, ">= 0.0.0", only: :dev, runtime: false},
80+
{:mix_test_watch, ">= 0.0.0", only: :dev},
81+
{:dialyxir, ">= 0.0.0", only: [:dev, :test], runtime: false},
82+
{:inch_ex, ">= 0.0.0", only: :docs},
7983
{:httparrot, "~> 1.3", only: :test},
80-
{:ex_doc, "~> 0.21", only: :dev, runtime: false},
81-
{:mix_test_watch, "~> 1.0", only: :dev},
82-
{:dialyxir, "~> 1.0", only: [:dev, :test], runtime: false},
83-
{:inch_ex, "~> 2.0", only: :docs},
84-
85-
# override httparrot dependencies
8684
{:cowlib, "~> 2.9", only: :test, override: true},
87-
{:ranch, "~> 1.8", only: :test, override: true}
85+
{:ranch, "~> 2.1", only: :test, override: true}
8886
]
8987
end
9088

0 commit comments

Comments
 (0)