Merge 9bcaa27 into 3954b43

collectiveidea · Dec 9, 2020 · 928f088 · 928f088
2 parents 3954b43 + 9bcaa27
commit 928f088
Show file tree

Hide file tree

Showing 23 changed files with 108 additions and 37 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,9 +14,15 @@ jobs:
       matrix:
         ruby: [2.5, 2.6, 2.7, jruby]
         gemfile:
+          - gemfiles/mysql2/5-2.gemfile
+          - gemfiles/postgresql/5-2.gemfile
+          - gemfiles/sqlite3/5-2.gemfile
           - gemfiles/mysql2/6-0.gemfile
           - gemfiles/postgresql/6-0.gemfile
           - gemfiles/sqlite3/6-0.gemfile
+          - gemfiles/mysql2/6-1.gemfile
+          - gemfiles/postgresql/6-1.gemfile
+          - gemfiles/sqlite3/6-1.gemfile
         include:
           #
           # The future
@@ -36,18 +42,18 @@ jobs:
             gemfile: gemfiles/sqlite3/master.gemfile
           # MRI Ruby head
           - ruby: head
-            gemfile: gemfiles/mysql2/6-0.gemfile
+            gemfile: gemfiles/mysql2/6-1.gemfile
           - ruby: head
-            gemfile: gemfiles/postgresql/6-0.gemfile
+            gemfile: gemfiles/postgresql/6-1.gemfile
           - ruby: head
-            gemfile: gemfiles/sqlite3/6-0.gemfile
+            gemfile: gemfiles/sqlite3/6-1.gemfile
           # JRuby head
           - ruby: jruby-head
-            gemfile: gemfiles/mysql2/6-0.gemfile
+            gemfile: gemfiles/mysql2/6-1.gemfile
           - ruby: jruby-head
-            gemfile: gemfiles/postgresql/6-0.gemfile
+            gemfile: gemfiles/postgresql/6-1.gemfile
           - ruby: jruby-head
-            gemfile: gemfiles/sqlite3/6-0.gemfile
+            gemfile: gemfiles/sqlite3/6-1.gemfile
           #
           # The past
           #
@@ -98,13 +104,6 @@ jobs:
             gemfile: gemfiles/postgresql/5-1.gemfile
           - ruby: 2.5
             gemfile: gemfiles/sqlite3/5-1.gemfile
-          # While not yet EOL, 5.2 is only tested against up to ruby 2.5 https://github.com/rails/rails/blob/5-2-stable/.travis.yml
-          - ruby: 2.5
-            gemfile: gemfiles/mysql2/5-2.gemfile
-          - ruby: 2.5
-            gemfile: gemfiles/postgresql/5-2.gemfile
-          - ruby: 2.5
-            gemfile: gemfiles/sqlite3/5-2.gemfile
           #
           # The parallel dimension
           #

diff --git a/delayed_job_active_record.gemspec b/delayed_job_active_record.gemspec
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Gem::Specification.new do |spec|
-  spec.add_dependency "activerecord", [">= 3.0", "< 6.1"]
+  spec.add_dependency "activerecord", [">= 3.0", "< 6.2"]
   spec.add_dependency "delayed_job",  [">= 3.0", "< 5"]
   spec.authors        = ["Brian Ryckbost", "Matt Griffin", "Erik Michaels-Ober"]
   spec.description    = "ActiveRecord backend for Delayed::Job, originally authored by Tobias Lütke"

diff --git a/gemfiles/mysql2/4-2.gemfile b/gemfiles/mysql2/4-2.gemfile
@@ -10,7 +10,7 @@ group :test do
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "mysql2", ">= 0.3.13", "< 0.5"
+    gem "mysql2", [">= 0.3.13", "< 0.5"]
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/mysql2/5-0.gemfile b/gemfiles/mysql2/5-0.gemfile
@@ -10,7 +10,7 @@ group :test do
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "mysql2"
+    gem "mysql2", [">= 0.3.18", "< 0.6.0"]
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/mysql2/5-1.gemfile b/gemfiles/mysql2/5-1.gemfile
@@ -10,7 +10,7 @@ group :test do
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "mysql2"
+    gem "mysql2", [">= 0.3.18", "< 0.6.0"]
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/mysql2/5-2.gemfile b/gemfiles/mysql2/5-2.gemfile
@@ -10,7 +10,7 @@ group :test do
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "mysql2"
+    gem "mysql2", [">= 0.4.4", "< 0.6.0"]
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/mysql2/6-0.gemfile b/gemfiles/mysql2/6-0.gemfile
@@ -6,11 +6,11 @@ gem "rake"
 
 group :test do
   platforms :jruby do
-    gem "activerecord-jdbcmysql-adapter", ">= 60.0.rc1"
+    gem "activerecord-jdbcmysql-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "mysql2"
+    gem "mysql2", ">= 0.4.4"
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/mysql2/6-1.gemfile b/gemfiles/mysql2/6-1.gemfile
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "rake"
+
+group :test do
+  platforms :jruby do
+    # Remove github when 61.0 releases
+    gem "activerecord-jdbcmysql-adapter", github: "jruby/activerecord-jdbc-adapter"
+  end
+
+  platforms :ruby, :mswin, :mingw do
+    gem "mysql2", "~> 0.5"
+  end
+
+  gem "rspec", ">= 2.11"
+  gem "simplecov", ">= 0.20.0", require: false
+  gem "simplecov-lcov", ">= 0.8.0", require: false
+
+  gem "activerecord", "~> 6.1.0"
+end
+
+gemspec path: "../../"
diff --git a/gemfiles/mysql2/master.gemfile b/gemfiles/mysql2/master.gemfile
@@ -6,11 +6,11 @@ gem "rake"
 
 group :test do
   platforms :jruby do
-    gem "activerecord-jdbcmysql-adapter"
+    gem "activerecord-jdbcmysql-adapter", github: "jruby/activerecord-jdbc-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "mysql2"
+    gem "mysql2", "~> 0.5"
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/postgresql/4-2.gemfile b/gemfiles/postgresql/4-2.gemfile
@@ -10,7 +10,7 @@ group :test do
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "pg", "~> 0.18"
+    gem "pg", "~> 0.15"
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/postgresql/5-0.gemfile b/gemfiles/postgresql/5-0.gemfile
@@ -10,7 +10,7 @@ group :test do
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "pg", "~> 0.18"
+    gem "pg", [">= 0.18", "< 2.0"]
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/postgresql/5-1.gemfile b/gemfiles/postgresql/5-1.gemfile
@@ -10,7 +10,7 @@ group :test do
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "pg", "~> 0.18"
+    gem "pg", [">= 0.18", "< 2.0"]
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/postgresql/5-2.gemfile b/gemfiles/postgresql/5-2.gemfile
@@ -10,7 +10,7 @@ group :test do
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "pg", "~> 0.18"
+    gem "pg", [">= 0.18", "< 2.0"]
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/postgresql/6-0.gemfile b/gemfiles/postgresql/6-0.gemfile
@@ -6,11 +6,11 @@ gem "rake"
 
 group :test do
   platforms :jruby do
-    gem "activerecord-jdbcpostgresql-adapter", ">= 60.0.rc1"
+    gem "activerecord-jdbcpostgresql-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "pg", "~> 0.18"
+    gem "pg", [">= 0.18", "< 2.0"]
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/postgresql/6-1.gemfile b/gemfiles/postgresql/6-1.gemfile
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "rake"
+
+group :test do
+  platforms :jruby do
+    # Remove github when 61.0 releases
+    gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter"
+  end
+
+  platforms :ruby, :mswin, :mingw do
+    gem "pg", "~> 1.1"
+  end
+
+  gem "rspec", ">= 2.11"
+  gem "simplecov", ">= 0.20.0", require: false
+  gem "simplecov-lcov", ">= 0.8.0", require: false
+
+  gem "activerecord", "~> 6.1.0"
+end
+
+gemspec path: "../../"
diff --git a/gemfiles/postgresql/master.gemfile b/gemfiles/postgresql/master.gemfile
@@ -6,11 +6,11 @@ gem "rake"
 
 group :test do
   platforms :jruby do
-    gem "activerecord-jdbcpostgresql-adapter"
+    gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "pg", "~> 0.18"
+    gem "pg", "~> 1.1"
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/sqlite3/4-2.gemfile b/gemfiles/sqlite3/4-2.gemfile
@@ -10,7 +10,7 @@ group :test do
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "sqlite3", "< 1.4"
+    gem "sqlite3", "~> 1.3.6"
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/sqlite3/5-0.gemfile b/gemfiles/sqlite3/5-0.gemfile
@@ -10,7 +10,7 @@ group :test do
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "sqlite3", "< 1.4"
+    gem "sqlite3", "~> 1.3.6"
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/sqlite3/5-1.gemfile b/gemfiles/sqlite3/5-1.gemfile
@@ -10,7 +10,7 @@ group :test do
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "sqlite3", "< 1.4"
+    gem "sqlite3", ["~> 1.3", ">= 1.3.6"]
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/sqlite3/5-2.gemfile b/gemfiles/sqlite3/5-2.gemfile
@@ -10,7 +10,7 @@ group :test do
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "sqlite3", "< 1.4"
+    gem "sqlite3", ["~> 1.3", ">= 1.3.6"]
   end
 
   gem "rspec", ">= 2.11"

diff --git a/gemfiles/sqlite3/6-0.gemfile b/gemfiles/sqlite3/6-0.gemfile
@@ -6,7 +6,7 @@ gem "rake"
 
 group :test do
   platforms :jruby do
-    gem "activerecord-jdbcsqlite3-adapter", ">= 60.0.rc1"
+    gem "activerecord-jdbcsqlite3-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do

diff --git a/gemfiles/sqlite3/6-1.gemfile b/gemfiles/sqlite3/6-1.gemfile
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "rake"
+
+group :test do
+  platforms :jruby do
+    # Remove github when 61.0 releases
+    gem "activerecord-jdbcsqlite3-adapter", github: "jruby/activerecord-jdbc-adapter"
+  end
+
+  platforms :ruby, :mswin, :mingw do
+    gem "sqlite3", "~> 1.4"
+  end
+
+  gem "rspec", ">= 2.11"
+  gem "simplecov", ">= 0.20.0", require: false
+  gem "simplecov-lcov", ">= 0.8.0", require: false
+
+  gem "activerecord", "~> 6.1.0"
+end
+
+gemspec path: "../../"
diff --git a/gemfiles/sqlite3/master.gemfile b/gemfiles/sqlite3/master.gemfile
@@ -6,11 +6,11 @@ gem "rake"
 
 group :test do
   platforms :jruby do
-    gem "activerecord-jdbcsqlite3-adapter"
+    gem "activerecord-jdbcsqlite3-adapter", github: "jruby/activerecord-jdbc-adapter"
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "sqlite3"
+    gem "sqlite3", "~> 1.4"
   end
 
   gem "rspec", ">= 2.11"