Merge pull request #33 from zendesk/bquorning.add-ar-6-1

bquorning · web-flow · commit 5fbc87649a95 · 2021-09-15T16:02:53.000+02:00
Add compatibility with ActiveRecord 6.1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,9 +17,12 @@ jobs:
           - rails5.1
           - rails5.2
           - rails6.0
+          - rails6.1
         exclude:
           - ruby-version: 2.4
             gemfile: rails6.0
+          - ruby-version: 2.4
+            gemfile: rails6.1
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     migration_tools (1.6.0)
-      activerecord (>= 4.2.0, < 6.1)
+      activerecord (>= 4.2.0, < 6.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails4.2.gemfile.lock b/gemfiles/rails4.2.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.6.0)
-      activerecord (>= 4.2.0, < 6.1)
+      activerecord (>= 4.2.0, < 6.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails5.0.gemfile.lock b/gemfiles/rails5.0.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.6.0)
-      activerecord (>= 4.2.0, < 6.1)
+      activerecord (>= 4.2.0, < 6.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails5.1.gemfile.lock b/gemfiles/rails5.1.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.6.0)
-      activerecord (>= 4.2.0, < 6.1)
+      activerecord (>= 4.2.0, < 6.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails5.2.gemfile.lock b/gemfiles/rails5.2.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.6.0)
-      activerecord (>= 4.2.0, < 6.1)
+      activerecord (>= 4.2.0, < 6.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails6.0.gemfile.lock b/gemfiles/rails6.0.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.6.0)
-      activerecord (>= 4.2.0, < 6.1)
+      activerecord (>= 4.2.0, < 6.2)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails6.1.gemfile b/gemfiles/rails6.1.gemfile
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.1.0"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: "../"
diff --git a/gemfiles/rails6.1.gemfile.lock b/gemfiles/rails6.1.gemfile.lock
@@ -0,0 +1,53 @@
+PATH
+  remote: ..
+  specs:
+    migration_tools (1.6.0)
+      activerecord (>= 4.2.0, < 6.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    bump (0.10.0)
+    concurrent-ruby (1.1.9)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.4)
+    minitest-rg (5.2.0)
+      minitest (~> 5.0)
+    mocha (1.13.0)
+    rake (13.0.6)
+    sqlite3 (1.4.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    wwtd (1.4.1)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  x86_64-darwin-19
+  x86_64-darwin-20
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 6.1.0)
+  bump
+  migration_tools!
+  minitest
+  minitest-rg
+  mocha
+  rake
+  sqlite3 (~> 1.4)
+  wwtd
+
+BUNDLED WITH
+   2.2.27
diff --git a/migration_tools.gemspec b/migration_tools.gemspec
@@ -7,7 +7,7 @@ Gem::Specification.new "migration_tools", "1.6.0" do |s|
   s.files = `git ls-files lib`.split("\n")
   s.license = "Apache-2.0"
 
-  s.add_runtime_dependency "activerecord", '>= 4.2.0', '< 6.1'
+  s.add_runtime_dependency "activerecord", '>= 4.2.0', '< 6.2'
 
   s.add_development_dependency "rake"
   s.add_development_dependency "bump"
