Merge pull request #189 from cgriego/steveh-rails7

Support Rails 7.0
cgriego · Dec 16, 2021 · e5590ed · e5590ed
2 parents c2068d9 + e9ed53d
commit e5590ed
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 7 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -35,6 +35,7 @@ jobs:
         - gemfiles/rails_5_1.gemfile
         - gemfiles/rails_5_2.gemfile
         - gemfiles/rails_6_0.gemfile
+        - gemfiles/rails_6_1.gemfile
         - Gemfile
         - gemfiles/rails_head.gemfile
         exclude:
@@ -52,6 +53,8 @@ jobs:
           gemfile: gemfiles/rails_5_2.gemfile
         - ruby: 1.9.2
           gemfile: gemfiles/rails_6_0.gemfile
+        - ruby: 1.9.2
+          gemfile: gemfiles/rails_6_1.gemfile
         - ruby: 1.9.2
           gemfile: Gemfile
         - ruby: 1.9.2
@@ -64,6 +67,8 @@ jobs:
           gemfile: gemfiles/rails_5_2.gemfile
         - ruby: 1.9.3
           gemfile: gemfiles/rails_6_0.gemfile
+        - ruby: 1.9.3
+          gemfile: gemfiles/rails_6_1.gemfile
         - ruby: 1.9.3
           gemfile: Gemfile
         - ruby: 1.9.3
@@ -76,6 +81,8 @@ jobs:
           gemfile: gemfiles/rails_5_2.gemfile
         - ruby: 2.0.0
           gemfile: gemfiles/rails_6_0.gemfile
+        - ruby: 2.0.0
+          gemfile: gemfiles/rails_6_1.gemfile
         - ruby: 2.0.0
           gemfile: Gemfile
         - ruby: 2.0.0
@@ -88,34 +95,50 @@ jobs:
           gemfile: gemfiles/rails_5_2.gemfile
         - ruby: 2.1.9
           gemfile: gemfiles/rails_6_0.gemfile
+        - ruby: 2.1.9
+          gemfile: gemfiles/rails_6_1.gemfile
         - ruby: 2.1.9
           gemfile: Gemfile
         - ruby: 2.1.9
           gemfile: gemfiles/rails_head.gemfile
         - ruby: 2.2.10
           gemfile: gemfiles/rails_6_0.gemfile
+        - ruby: 2.2.10
+          gemfile: gemfiles/rails_6_1.gemfile
         - ruby: 2.2.10
           gemfile: Gemfile
         - ruby: 2.2.10
           gemfile: gemfiles/rails_head.gemfile
         - ruby: 2.3.8
           gemfile: gemfiles/rails_6_0.gemfile
+        - ruby: 2.3.8
+          gemfile: gemfiles/rails_6_1.gemfile
         - ruby: 2.3.8
           gemfile: Gemfile
         - ruby: 2.3.8
           gemfile: gemfiles/rails_head.gemfile
         - ruby: 2.4.10
           gemfile: gemfiles/rails_6_0.gemfile
+        - ruby: 2.4.10
+          gemfile: gemfiles/rails_6_1.gemfile
         - ruby: 2.4.10
           gemfile: Gemfile
         - ruby: 2.4.10
           gemfile: gemfiles/rails_head.gemfile
         - ruby: 2.5.9
           gemfile: gemfiles/rails_3_0.gemfile
+        - ruby: 2.5.9
+          gemfile: gemfiles/rails_6_1.gemfile
+        - ruby: 2.5.9
+          gemfile: Gemfile
         - ruby: 2.5.9
           gemfile: gemfiles/rails_head.gemfile
         - ruby: 2.6.8
           gemfile: gemfiles/rails_3_0.gemfile
+        - ruby: 2.6.8
+          gemfile: gemfiles/rails_6_1.gemfile
+        - ruby: 2.6.8
+          gemfile: Gemfile
         - ruby: 2.6.8
           gemfile: gemfiles/rails_head.gemfile
         - ruby: 2.7.4

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# ActiveAttr 0.15.3 (December 16, 2021)
+
+* ActiveAttr now supports Rails 7.0 (Steve Hoeksema)
+
 # ActiveAttr 0.15.3 (April 12, 2021)
 
 * #185 Fixed ReDoS vulnerability in BooleanTypecaster#call (ねず)

diff --git a/Gemfile b/Gemfile
@@ -2,9 +2,9 @@ source "https://rubygems.org"
 
 gemspec :development_group => :test
 
-gem "activemodel",   "~> 6.1.0"
-gem "activesupport", "~> 6.1.0"
-gem "actionpack",    "~> 6.1.0"
+gem "activemodel",   "~> 7.0.0"
+gem "activesupport", "~> 7.0.0"
+gem "actionpack",    "~> 7.0.0"
 gem "activemodel-serializers-xml", :group => :test
 gem "rexml", :group => :test
 gem "protected_attributes_continued", :group => :test

diff --git a/active_attr.gemspec b/active_attr.gemspec
@@ -22,9 +22,9 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.1.0"
 
-  gem.add_runtime_dependency "actionpack",    ">= 3.0.2", "< 7.0"
-  gem.add_runtime_dependency "activemodel",   ">= 3.0.2", "< 7.0"
-  gem.add_runtime_dependency "activesupport", ">= 3.0.2", "< 7.0"
+  gem.add_runtime_dependency "actionpack",    ">= 3.0.2", "< 7.1"
+  gem.add_runtime_dependency "activemodel",   ">= 3.0.2", "< 7.1"
+  gem.add_runtime_dependency "activesupport", ">= 3.0.2", "< 7.1"
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "factory_bot",  "< 5.0"

diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+gemspec :development_group => :test, :path => ".."
+
+gem "activemodel",   "~> 6.1.0"
+gem "activesupport", "~> 6.1.0"
+gem "actionpack",    "~> 6.1.0"
+gem "activemodel-serializers-xml", :group => :test
+gem "rexml", :group => :test
+gem "protected_attributes_continued", :group => :test
diff --git a/lib/active_attr/version.rb b/lib/active_attr/version.rb
@@ -1,5 +1,5 @@
 module ActiveAttr
   # Complete version string
   # @since 0.1.0
-  VERSION = "0.15.3"
+  VERSION = "0.15.4"
 end