WIP

ThomasKoppensteiner · Nov 13, 2020 · 0e41e59 · 0e41e59
1 parent 13965b1
commit 0e41e59
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 2,641 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@ _yardoc
 .bundle
 .config
 .idea/
+.java-version
+.ruby-env
 .ruby-version
 .rvmrc
 .yardoc

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -2,3 +2,15 @@ require:
   - rubocop-rspec
   - rt_rubocop_defaults
 inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.5
+
+Lint/DuplicateBranch:
+  Enabled: true
+
+Lint/EmptyClass:
+  Enabled: true
+
+Style/NilLambda:
+  Enabled: true
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,10 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.7.0
-  - 2.6.5
-  - 2.5.7
-  - 2.4.9
-  - jruby-9.2.10.0
+  - 2.7.2
+  - 2.6.6
+  - 2.5.8
+  - jruby-9.2.13.0
   - jruby-9.1.17.0
   # - truffleruby # https://github.com/oracle/truffleruby/issues/1398
 jdk:
@@ -19,16 +18,13 @@ env:
 
 matrix:
   exclude:
-    - rvm: 2.7.0
+    - rvm: 2.7.2
       env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
-    - rvm: 2.6.5
+    - rvm: 2.6.6
       env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
-    - rvm: 2.5.7
-      env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
-    - rvm: 2.4.9
+    - rvm: 2.5.8
       env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
   allow_failures:
-    - rvm: 2.4.9
     - rvm: truffleruby
     - env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
 services:

diff --git a/sidekiq-undertaker.gemspec b/sidekiq-undertaker.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
     "build_status_uri" => "https://travis-ci.org/ThomasKoppensteiner/sidekiq-undertaker"
   }
 
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", ">= 1.17", "<3"
   spec.add_development_dependency "rake", "~> 13.0"
 
-  spec.add_development_dependency "approvals", "~> 0.0", ">= 0.0.24"
+  spec.add_development_dependency "approvals", "~> 0.0.24"
   spec.add_development_dependency "mock_redis", "~> 0.19"
   spec.add_development_dependency "pry", "~> 0.12"
   spec.add_development_dependency "rack-test", "~> 1.1"
@@ -52,5 +52,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sinatra", "~> 2.0"
   spec.add_development_dependency "timecop", "~> 0.9"
 
-  spec.add_runtime_dependency "sidekiq", ">= 5.2", "< 7"
+  spec.add_runtime_dependency "sidekiq", "~> 6"
 end
diff --git a/...ge_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv5.approved.txt b/...ge_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv5.approved.txt
diff --git a/...ge_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt b/...ge_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
@@ -9,7 +9,7 @@
 
 
     <link href="/sidekiq/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
-    <link href="/sidekiq/stylesheets/application-dark.css" media="screen" rel="stylesheet" type="text/css" />
+    <link href="/sidekiq/stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
 
 
     <link rel="shortcut icon" type="image/ico" href="/sidekiq/images/favicon.ico" />