diff --git a/Appraisals b/Appraisals index 95c6896..2a2ff5c 100644 --- a/Appraisals +++ b/Appraisals @@ -1,12 +1,5 @@ -appraise "2.7" do - gem "capybara", "~> 2.7.0" - gem "rspec", "~> 2.14.0" - gem 'addressable', '< 2.5.0', :platforms=>[:ruby_19, :jruby_19] # 2.5 requires public_suffix which requires ruby 2.0 - gem 'nokogiri', '< 1.7.0', :platforms=>[:ruby_19, :jruby_19] # 1.7.0 requires ruby 2.1+ -end - -appraise "2.13" do - gem "capybara", "~> 2.13.0" +appraise "2.15" do + gem "capybara", "~> 2.15.0" gem 'addressable', '< 2.5.0', :platforms=>[:ruby_19, :jruby_19] # 2.5 requires public_suffix which requires ruby 2.0 gem 'nokogiri', '< 1.7.0', :platforms=>[:ruby_19, :jruby_19] # 1.7.0 requires ruby 2.1+ end diff --git a/Gemfile.lock b/Gemfile.lock index be0261b..7335b09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,9 +10,10 @@ GEM specs: addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - appraisal (0.4.1) + appraisal (2.2.0) bundler rake + thor (>= 0.14.0) capybara (2.15.4) addressable mini_mime (>= 0.1.3) @@ -66,6 +67,7 @@ GEM tilt (~> 2.0) spoon (0.0.6) ffi + thor (0.20.0) tilt (2.0.8) xpath (2.1.0) nokogiri (~> 1.3) @@ -76,7 +78,7 @@ PLATFORMS x86-mingw32 DEPENDENCIES - appraisal (~> 0.4.0) + appraisal capybara-webkit! json (< 2.0) launchy diff --git a/capybara-webkit.gemspec b/capybara-webkit.gemspec index 56c91b8..121b344 100644 --- a/capybara-webkit.gemspec +++ b/capybara-webkit.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |s| s.add_development_dependency("sinatra") s.add_development_dependency("mini_magick") s.add_development_dependency("rake", "< 12.0.0") - s.add_development_dependency("appraisal", "~> 0.4.0") + s.add_development_dependency("appraisal") s.add_development_dependency("launchy") end diff --git a/gemfiles/2.15.gemfile b/gemfiles/2.15.gemfile index 41fe5c9..50207ae 100644 --- a/gemfiles/2.15.gemfile +++ b/gemfiles/2.15.gemfile @@ -2,10 +2,10 @@ source "https://rubygems.org" -gem "mime-types", "< 3.0", :platforms=>[:ruby_19, :jruby_19] -gem "json", "< 2.0", :platforms=>[:ruby_19, :jruby_19] +gem "mime-types", "< 3.0", platforms: [:ruby_19, :jruby_19] +gem "json", "< 2.0", platforms: [:ruby_19, :jruby_19] gem "capybara", "~> 2.15.0" -gem "addressable", "< 2.5.0", :platforms=>[:ruby_19, :jruby_19] -gem "nokogiri", "< 1.7.0", :platforms=>[:ruby_19, :jruby_19] +gem "addressable", "< 2.5.0", platforms: [:ruby_19, :jruby_19] +gem "nokogiri", "< 1.7.0", platforms: [:ruby_19, :jruby_19] -gemspec :path=>"../" \ No newline at end of file +gemspec path: "../" diff --git a/gemfiles/master.gemfile b/gemfiles/master.gemfile index 4c50ac0..12bdbbc 100644 --- a/gemfiles/master.gemfile +++ b/gemfiles/master.gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" -gem "mime-types", "< 3.0", :platforms=>[:ruby_19, :jruby_19] -gem "json", "< 2.0", :platforms=>[:ruby_19, :jruby_19] -gem "capybara", :github=>"jnicklas/capybara" +gem "mime-types", "< 3.0", platforms: [:ruby_19, :jruby_19] +gem "json", "< 2.0", platforms: [:ruby_19, :jruby_19] +gem "capybara", github: "jnicklas/capybara" -gemspec :path=>"../" \ No newline at end of file +gemspec path: "../"