Skip to content

Commit

Permalink
Work around the conflict with hypdf 1.0.19 and multipart-post 2.3.0 b…
Browse files Browse the repository at this point in the history
  • Loading branch information
knu committed May 26, 2023
1 parent dc2156f commit 7f20a9a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ end
gem 'erector', github: 'dsander/erector', branch: 'rails6'
gem 'forecast_io', '~> 2.0.0' # WeatherAgent
gem 'hipchat', '~> 1.2.0' # HipchatAgent
gem 'hypdf', '~> 1.0.10' # PDFInfoAgent
gem 'hypdf', bitbucket: 'knu/hypdf_gem', branch: 'uploadio_namespace' # PDFInfoAgent
gem 'mini_racer' # JavaScriptAgent
gem 'mqtt' # MQTTAgent
gem 'net-ftp'
Expand Down
12 changes: 9 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ GIT
oauth
simple_oauth

GIT
remote: https://knu@bitbucket.org/knu/hypdf_gem.git
revision: e11df6bd71356c9211e5001d729f3e92bfd6e19e
branch: uploadio_namespace
specs:
hypdf (1.0.19)
httparty (> 0.16.0, < 1.0)

PATH
remote: vendor/gems/dotenv-2.0.1
specs:
Expand Down Expand Up @@ -420,8 +428,6 @@ GEM
httpclient (2.8.3)
huginn_agent (0.6.1)
thor
hypdf (1.0.19)
httparty (> 0.16.0, < 1.0)
i18n (1.13.0)
concurrent-ruby (~> 1.0)
jmespath (1.6.2)
Expand Down Expand Up @@ -872,7 +878,7 @@ DEPENDENCIES
httmultiparty (~> 0.3.16)
httparty (~> 0.13)
huginn_agent
hypdf (~> 1.0.10)
hypdf!
jquery-rails (~> 4.2.1)
json (~> 2.3)
jsonpath (~> 1.1)
Expand Down

0 comments on commit 7f20a9a

Please sign in to comment.