Skip to content

Commit acd48e3

Browse files
Merge branch 'vitalie:master' into patch-1
2 parents 7a816ff + da00ab8 commit acd48e3

4 files changed

Lines changed: 13 additions & 11 deletions

File tree

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ cache: bundler
33
before_install:
44
- gem install bundler
55
rvm:
6-
- 2.3
7-
- 2.2
6+
- 2.5
7+
- 2.6
8+
- 2.7
89
matrix:
910
fast_finish: true

lib/webshot.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def self.setup
2727
yield self
2828
end
2929

30-
# Capibara setup
30+
# Capybara setup
3131
def self.capybara_setup!
3232
# By default Capybara will try to boot a rack application
3333
# automatically. You might want to switch off Capybara's

lib/webshot/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module Webshot
2-
VERSION = '0.1.0'
2+
VERSION = '0.1.2'
33
end

webshot.gemspec

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ Gem::Specification.new do |spec|
1818
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
1919
spec.require_paths = ["lib"]
2020

21-
spec.add_development_dependency "rake"
22-
spec.add_development_dependency "minitest"
23-
spec.add_development_dependency "gem-release"
21+
spec.add_development_dependency "rake", "~> 13"
22+
spec.add_development_dependency "minitest", "~> 5.14"
23+
spec.add_development_dependency "gem-release", "~> 2.1"
24+
spec.add_development_dependency "bump", "~> 0.9"
2425

25-
spec.add_dependency "activesupport"
26-
spec.add_dependency "poltergeist", "~> 1.12.0"
27-
spec.add_dependency "faye-websocket", "~> 0.7.3"
28-
spec.add_dependency "mini_magick", "~> 4.3.3"
26+
spec.add_dependency "activesupport", "~> 5"
27+
spec.add_dependency "poltergeist", [">= 1.12.0", "<= 1.18.1"]
28+
spec.add_dependency "faye-websocket", "~> 0.11.0"
29+
spec.add_dependency "mini_magick", "~> 4.9"
2930
end

0 commit comments

Comments
 (0)