Skip to content

Commit 61907cc

Browse files
committed
Updated gem dependencies, especially faraday to support v2.
1 parent 7917df5 commit 61907cc

5 files changed

Lines changed: 36 additions & 53 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## [1.2.0] - 2023-07-20
2+
- Updated dependency `faraday` to `v2`.
3+
14
## [1.1.0] - 2023-05-11
25
- Switch to dual licensing under AGPL-3.0 or MIT licenses.
36

Gemfile.lock

Lines changed: 28 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,53 @@
11
PATH
22
remote: .
33
specs:
4-
zammad_api (1.0.8)
5-
faraday (~> 1)
4+
zammad_api (1.2.0)
5+
faraday (~> 2)
66

77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
addressable (2.8.0)
11-
public_suffix (>= 2.0.2, < 5.0)
10+
addressable (2.8.4)
11+
public_suffix (>= 2.0.2, < 6.0)
1212
crack (0.4.5)
1313
rexml
14-
diff-lcs (1.2.5)
15-
faraday (1.10.0)
16-
faraday-em_http (~> 1.0)
17-
faraday-em_synchrony (~> 1.0)
18-
faraday-excon (~> 1.1)
19-
faraday-httpclient (~> 1.0)
20-
faraday-multipart (~> 1.0)
21-
faraday-net_http (~> 1.0)
22-
faraday-net_http_persistent (~> 1.0)
23-
faraday-patron (~> 1.0)
24-
faraday-rack (~> 1.0)
25-
faraday-retry (~> 1.0)
14+
diff-lcs (1.5.0)
15+
faraday (2.7.10)
16+
faraday-net_http (>= 2.0, < 3.1)
2617
ruby2_keywords (>= 0.0.4)
27-
faraday-em_http (1.0.0)
28-
faraday-em_synchrony (1.0.0)
29-
faraday-excon (1.1.0)
30-
faraday-httpclient (1.0.1)
31-
faraday-multipart (1.0.3)
32-
multipart-post (>= 1.2, < 3)
33-
faraday-net_http (1.0.1)
34-
faraday-net_http_persistent (1.2.0)
35-
faraday-patron (1.0.0)
36-
faraday-rack (1.0.0)
37-
faraday-retry (1.0.3)
38-
hashdiff (0.3.7)
39-
multipart-post (2.1.1)
40-
public_suffix (4.0.6)
41-
rake (13.0.1)
18+
faraday-net_http (3.0.2)
19+
hashdiff (1.0.1)
20+
public_suffix (5.0.3)
21+
rake (13.0.6)
4222
rexml (3.2.5)
43-
rspec (3.5.0)
44-
rspec-core (~> 3.5.0)
45-
rspec-expectations (~> 3.5.0)
46-
rspec-mocks (~> 3.5.0)
47-
rspec-core (3.5.2)
48-
rspec-support (~> 3.5.0)
49-
rspec-expectations (3.5.0)
23+
rspec (3.12.0)
24+
rspec-core (~> 3.12.0)
25+
rspec-expectations (~> 3.12.0)
26+
rspec-mocks (~> 3.12.0)
27+
rspec-core (3.12.2)
28+
rspec-support (~> 3.12.0)
29+
rspec-expectations (3.12.3)
5030
diff-lcs (>= 1.2.0, < 2.0)
51-
rspec-support (~> 3.5.0)
52-
rspec-mocks (3.5.0)
31+
rspec-support (~> 3.12.0)
32+
rspec-mocks (3.12.6)
5333
diff-lcs (>= 1.2.0, < 2.0)
54-
rspec-support (~> 3.5.0)
55-
rspec-support (3.5.0)
34+
rspec-support (~> 3.12.0)
35+
rspec-support (3.12.1)
5636
ruby2_keywords (0.0.5)
57-
webmock (3.3.0)
58-
addressable (>= 2.3.6)
37+
webmock (3.18.1)
38+
addressable (>= 2.8.0)
5939
crack (>= 0.3.2)
60-
hashdiff
40+
hashdiff (>= 0.4.0, < 2.0.0)
6141

6242
PLATFORMS
6343
ruby
6444

6545
DEPENDENCIES
6646
bundler (>= 2.2.10)
67-
rake (~> 13)
68-
rspec (~> 3.0)
47+
rake
48+
rspec
6949
webmock
7050
zammad_api!
7151

7252
BUNDLED WITH
73-
2.2.20
53+
2.4.15

lib/zammad_api/transport.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def initialize(config, logger)
2020
elsif config[:oauth2_token] && !config[:oauth2_token].empty?
2121
@conn.request :authorization, 'Bearer', config[:oauth2_token]
2222
else
23-
@conn.request :basic_auth, config[:user], config[:password]
23+
@conn.request :authorization, :basic, config[:user], config[:password]
2424
end
2525
end
2626

lib/zammad_api/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module ZammadAPI
2-
VERSION = '1.1.0'.freeze
2+
VERSION = '1.2.0'.freeze
33
end

zammad_api.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
2323
spec.files = Dir['{lib}/**/*']
2424
spec.require_paths = ['lib']
2525

26-
spec.add_runtime_dependency 'faraday', '~> 1'
26+
spec.add_runtime_dependency 'faraday', '~> 2'
2727

2828
spec.add_development_dependency 'bundler', '>= 2.2.10'
29-
spec.add_development_dependency 'rake', '~> 13'
30-
spec.add_development_dependency 'rspec', '~> 3.0'
29+
spec.add_development_dependency 'rake'
30+
spec.add_development_dependency 'rspec'
3131
spec.add_development_dependency 'webmock'
3232
end

0 commit comments

Comments
 (0)