Skip to content
This repository was archived by the owner on Sep 26, 2025. It is now read-only.

Dependency updates #21

Merged
merged 1 commit into from
Feb 12, 2019
Merged

Dependency updates #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/ruby:2.4.1-node-browsers
- image: circleci/ruby:2.6.1-node-browsers

working_directory: ~/repo

Expand All @@ -13,9 +13,9 @@ jobs:
- run:
name: Install dependencies
command: |
sudo gem update --system
gem install bundler
bundle install --jobs=4 --retry=3 --path vendor/bundler
gem install bundler -v 2.0.1
Copy link
Contributor

@luckyj5 luckyj5 Feb 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can remove bundler version (2.0.1) from here, it's included in circleci/ruby:2.6.1-node-browsers image.
Just add gem install bundler

bundle update --bundler
bundle install

- run:
name: Builder
Expand Down
40 changes: 20 additions & 20 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ PATH
remote: .
specs:
fluent-plugin-kubernetes-metrics (1.1.0.Alpha)
fluentd (>= 0.14.10, < 2)
kubeclient (~> 4.0)
multi_json (~> 1.13)
oj (~> 3.6)
fluentd (~> 1.3.3)
kubeclient (~> 4.2.2)
multi_json (~> 1.13.1)
oj (~> 3.7.8)

GEM
remote: https://rubygems.org/
specs:
addressable (2.5.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
cool.io (1.5.3)
crack (0.4.3)
Expand All @@ -19,7 +19,7 @@ GEM
docile (1.3.1)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
fluentd (1.3.0)
fluentd (1.3.3)
cool.io (>= 1.4.5, < 2.0.0)
dig_rb (~> 1.0.0)
http_parser.rb (>= 0.5.1, < 0.7.0)
Expand All @@ -30,7 +30,7 @@ GEM
tzinfo (~> 1.0)
tzinfo-data (~> 1.0)
yajl-ruby (~> 1.0)
hashdiff (0.3.7)
hashdiff (0.3.8)
http (3.3.0)
addressable (~> 2.3)
http-cookie (~> 1.0)
Expand All @@ -41,27 +41,27 @@ GEM
http-form_data (2.1.1)
http_parser.rb (0.6.0)
json (2.1.0)
kubeclient (4.0.0)
kubeclient (4.2.2)
http (~> 3.0)
recursive-open-struct (~> 1.0, >= 1.0.4)
rest-client (~> 2.0)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
msgpack (1.2.4)
msgpack (1.2.6)
multi_json (1.13.1)
netrc (0.11.0)
oj (3.6.10)
oj (3.7.8)
power_assert (1.1.3)
public_suffix (3.0.3)
rake (12.3.1)
rake (12.3.2)
recursive-open-struct (1.1.0)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
safe_yaml (1.0.4)
serverengine (2.0.7)
serverengine (2.1.0)
sigdump (~> 0.2.2)
sigdump (0.2.4)
simplecov (0.16.1)
Expand All @@ -70,17 +70,17 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
strptime (0.2.3)
test-unit (3.2.8)
test-unit (3.3.0)
power_assert
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
tzinfo-data (1.2018.7)
tzinfo-data (1.2018.9)
tzinfo (>= 1.0.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
webmock (3.4.2)
webmock (3.5.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
Expand All @@ -90,12 +90,12 @@ PLATFORMS
ruby

DEPENDENCIES
bundler (~> 1.14)
bundler (~> 2.0.1)
fluent-plugin-kubernetes-metrics!
rake (~> 12.0)
rake (~> 12.3.2)
simplecov (~> 0.16.1)
test-unit (~> 3.0)
webmock (~> 3.4.2)
test-unit (~> 3.3.0)
webmock (~> 3.5.1)

BUNDLED WITH
1.16.6
2.0.1
5 changes: 3 additions & 2 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@ RUN apk update \
ruby-dev wget gnupg \
&& echo 'gem: --no-document' >> /etc/gemrc \
&& gem install -N \
fluentd:1.3.1 \
fluentd:1.3.3 \
fluent-plugin-record-modifier:1.1.0 \
fluent-plugin-splunk-hec:1.0.1 \
oj:3.7.4 \
oj:3.7.8 \
multi_json:1.13.1 \
bigdecimal:1.3.5 \
kubeclient:4.2.2 \
&& gem install -N /tmp/*.gem \
&& apk del .build-deps \
&& rm -rf /var/cache/apk/* \
Expand Down
16 changes: 8 additions & 8 deletions fluent-plugin-kubernetes-metrics.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ Gem::Specification.new do |spec|
spec.test_files = test_files
spec.require_paths = ["lib"]

spec.add_development_dependency "bundler", "~> 1.14"
spec.add_development_dependency "rake", "~> 12.0"
spec.add_development_dependency "test-unit", "~> 3.0"
spec.add_development_dependency "bundler", "~> 2.0.1"
spec.add_development_dependency "rake", "~> 12.3.2"
spec.add_development_dependency "test-unit", "~> 3.3.0"
spec.add_development_dependency "simplecov", "~> 0.16.1"
spec.add_development_dependency "webmock", "~> 3.4.2"
spec.add_runtime_dependency "fluentd", [">= 0.14.10", "< 2"]
spec.add_runtime_dependency "kubeclient", "~> 4.0"
spec.add_runtime_dependency "multi_json", "~> 1.13"
spec.add_runtime_dependency "oj", "~> 3.6"
spec.add_development_dependency "webmock", "~> 3.5.1"
spec.add_runtime_dependency "fluentd", "~> 1.3.3"
spec.add_runtime_dependency "kubeclient", "~> 4.2.2"
spec.add_runtime_dependency "multi_json", "~> 1.13.1"
spec.add_runtime_dependency "oj", "~> 3.7.8"
end