Merge pull request #37 from zendesk/nony--rails-7-0

HeyNonster · web-flow · commit 7136344fc823 · 2022-11-21T09:44:03.000-05:00
Add support for Rails 7.0 &amp; Ruby 2.7
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,13 +10,19 @@ jobs:
         ruby-version:
           - '2.5'
           - '2.6'
+          - '2.7'
         gemfile:
           - rails4.2
           - rails5.0
           - rails5.1
           - rails5.2
           - rails6.0
           - rails6.1
+          - rails7.0
+        exclude:
+          - {ruby-version: '2.5', gemfile: rails7.0}
+          - {ruby-version: '2.6', gemfile: rails7.0}
+          - {ruby-version: '2.7', gemfile: rails4.2}
     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.7.0)
-      activerecord (>= 4.2.0, < 6.2)
+      activerecord (>= 4.2.0, < 7.1)
 
 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.7.0)
-      activerecord (>= 4.2.0, < 6.2)
+      activerecord (>= 4.2.0, < 7.1)
 
 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.7.0)
-      activerecord (>= 4.2.0, < 6.2)
+      activerecord (>= 4.2.0, < 7.1)
 
 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.7.0)
-      activerecord (>= 4.2.0, < 6.2)
+      activerecord (>= 4.2.0, < 7.1)
 
 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.7.0)
-      activerecord (>= 4.2.0, < 6.2)
+      activerecord (>= 4.2.0, < 7.1)
 
 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.7.0)
-      activerecord (>= 4.2.0, < 6.2)
+      activerecord (>= 4.2.0, < 7.1)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails6.1.gemfile.lock b/gemfiles/rails6.1.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.7.0)
-      activerecord (>= 4.2.0, < 6.2)
+      activerecord (>= 4.2.0, < 7.1)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails7.0.gemfile b/gemfiles/rails7.0.gemfile
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.0.0"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: "../"
diff --git a/gemfiles/rails7.0.gemfile.lock b/gemfiles/rails7.0.gemfile.lock
@@ -0,0 +1,51 @@
+PATH
+  remote: ..
+  specs:
+    migration_tools (1.7.0)
+      activerecord (>= 4.2.0, < 7.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activerecord (7.0.4)
+      activemodel (= 7.0.4)
+      activesupport (= 7.0.4)
+    activesupport (7.0.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    bump (0.10.0)
+    concurrent-ruby (1.1.10)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    mini_portile2 (2.8.0)
+    minitest (5.16.3)
+    minitest-rg (5.2.0)
+      minitest (~> 5.0)
+    mocha (2.0.2)
+      ruby2_keywords (>= 0.0.5)
+    rake (13.0.6)
+    ruby2_keywords (0.0.5)
+    sqlite3 (1.5.4)
+      mini_portile2 (~> 2.8.0)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 7.0.0)
+  bump
+  migration_tools!
+  minitest
+  minitest-rg
+  mocha
+  rake
+  sqlite3 (~> 1.4)
+
+BUNDLED WITH
+   2.3.25
diff --git a/migration_tools.gemspec b/migration_tools.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new "migration_tools", "1.7.0" do |s|
 
   s.required_ruby_version = '>= 2.5.0'
 
-  s.add_runtime_dependency "activerecord", '>= 4.2.0', '< 6.2'
+  s.add_runtime_dependency "activerecord", '>= 4.2.0', '< 7.1'
 
   s.add_development_dependency "rake"
   s.add_development_dependency "bump"
diff --git a/test/test_migration_tools.rb b/test/test_migration_tools.rb
@@ -128,7 +128,7 @@ def migration_proxy(m)
     end
   end
 
-  if ActiveRecord::VERSION::STRING >= "5.0.0"
+  if ActiveRecord.gem_version >= Gem::Version.new("5.0")
     require 'active_support/testing/stream'
     include ActiveSupport::Testing::Stream
   end
