Merge 81f5945 into f83a1a4

.github/workflows/prs.yml

@@ -22,10 +22,12 @@ jobs:
         - '2.5'
         - '2.7'
         - '3.0'
+        - '3.1'
         activerecord:
         - '5.2'
         - '6.0'
         - '6.1'
+        - '7.0'
         db:
         - mysql2
         - sqlite3
@@ -35,6 +37,10 @@ jobs:
         exclude:
         - ruby: '3.0'
           activerecord: '5.2'
+        - ruby: '3.1'
+          activerecord: '5.2'
+        - ruby: '2.5'
+          activerecord: '7.0'
         - db: skip
           dbversion: skip
         include:
@@ -62,6 +68,10 @@ jobs:
           activerecord: '6.1'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
         - ruby: '3.0'
           activerecord: '6.0'
           db: postgresql
@@ -70,6 +80,22 @@ jobs:
           activerecord: '6.1'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
     env:
       BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}/Gemfile.${{ matrix.db }}"
       MYSQL_DB_HOST: 127.0.0.1

README.md

@@ -232,22 +232,28 @@ SchemaMonkey is tested on:
 * ruby **2.7** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 * ruby **2.7** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 * ruby **2.7** with activerecord **6.1**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **2.7** with activerecord **7.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 * ruby **3.0** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 * ruby **3.0** with activerecord **6.1**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.0** with activerecord **7.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.1** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.1** with activerecord **6.1**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.1** with activerecord **7.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
 ## Release Notes
 
-* 3.0.1 -- Use modware 1.0.1
-* 3.0.0 -- updated to support ruby 2.5+ only and rails 5.2 through 6.1
-* 2.1.6 -- stricter dependency on modware
-* 2.1.5 -- Remove dependency on its-it :(  #12
-* 2.1.4 -- Loosen dependency to allow AR 5.0, and include it in the test matrix
-* 2.1.3 -- Guard against multiple insertion of modules.
-* 2.1.2 -- Insert self earlier; don't wait for connection adapter to be instantiated.  Fixes #6 re `db:schema:load`
-* 2.1.1 -- Bug fix: don't choke if a module contains a BasicObject const
-* 2.1.0 -- First version to support all of schema_plus's needs for the 1.8.7 -> 2.0 upgrade
+* **3.0.2** -- Add AR 7.0 and Ruby 3.1
+* **3.0.1** -- Use modware 1.0.1
+* **3.0.0** -- updated to support ruby 2.5+ only and rails 5.2 through 6.1
+* **2.1.6** -- stricter dependency on modware
+* **2.1.5** -- Remove dependency on its-it :(  #12
+* **2.1.4** -- Loosen dependency to allow AR 5.0, and include it in the test matrix
+* **2.1.3** -- Guard against multiple insertion of modules.
+* **2.1.2** -- Insert self earlier; don't wait for connection adapter to be instantiated.  Fixes #6 re `db:schema:load`
+* **2.1.1** -- Bug fix: don't choke if a module contains a BasicObject const
+* **2.1.0** -- First version to support all of schema_plus's needs for the 1.8.7 -> 2.0 upgrade
 
 
 ## Development & Testing

gemfiles/activerecord-7.0/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 7.0", "< 7.1"

gemfiles/activerecord-7.0/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

gemfiles/activerecord-7.0/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

gemfiles/activerecord-7.0/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

lib/schema_monkey/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SchemaMonkey
-  VERSION = "3.0.1"
+  VERSION = "3.0.2.beta.1"
 end

schema_dev.yml

@@ -2,10 +2,12 @@ ruby:
   - 2.5
   - 2.7
   - 3.0
+  - 3.1
 activerecord:
   - 5.2
   - 6.0
   - 6.1
+  - 7.0
 db:
   - mysql2
   - sqlite3

schema_monkey.gemspec

@@ -22,11 +22,11 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.5.0"
 
   spec.add_dependency "activerecord", ">= 5.2"
-  spec.add_dependency "modware", "~> 1.0.1"
+  spec.add_dependency "modware", "~> 1.0.2"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-given", "~> 3.6"
-  spec.add_development_dependency "schema_dev", "~> 4.1"
+  spec.add_development_dependency "schema_dev", "~> 4.2.beta.1"
 end

spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start unless SimpleCov.running
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))