Merge pull request #231 from kpumuk/rails-7

Getting ready for Rails 7
kpumuk · Sep 23, 2021 · 60ebf51 · 60ebf51
2 parents 2e91d82 + 5e6dcf7
commit 60ebf51
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -256,6 +256,20 @@ jobs:
     working_directory: ~/meta-tags/ruby27-rails-6.1.4
     steps: *shared_build_steps
 
+  build-ruby27-rails-7_0_0_alpha2:
+    parameters:
+      is_main_build:
+        type: boolean
+        default: false
+    docker:
+      - image: circleci/ruby:2.7
+        environment:
+          RAILS_VERSION: 7.0.0.alpha2
+          ENABLE_CODE_COVERAGE: 1
+          NO_STEEP: 1
+    working_directory: ~/meta-tags/ruby27-rails-7.0.0.alpha2
+    steps: *shared_build_steps
+
   build-ruby30-rails-6_0_4:
     parameters:
       is_main_build:
@@ -284,6 +298,20 @@ jobs:
     working_directory: ~/meta-tags/ruby30-rails-6.1.4
     steps: *shared_build_steps
 
+  build-ruby30-rails-7_0_0_alpha2:
+    parameters:
+      is_main_build:
+        type: boolean
+        default: false
+    docker:
+      - image: circleci/ruby:3.0
+        environment:
+          RAILS_VERSION: 7.0.0.alpha2
+          ENABLE_CODE_COVERAGE: 1
+          NO_STEEP: 1
+    working_directory: ~/meta-tags/ruby30-rails-7.0.0.alpha2
+    steps: *shared_build_steps
+
 
   upload-coverage:
     docker:
@@ -348,12 +376,18 @@ workflows:
       - build-ruby27-rails-6_1_4:
           is_main_build: false
 
+      - build-ruby27-rails-7_0_0_alpha2:
+          is_main_build: false
+
       - build-ruby30-rails-6_0_4:
           is_main_build: false
 
       - build-ruby30-rails-6_1_4:
           is_main_build: true
 
+      - build-ruby30-rails-7_0_0_alpha2:
+          is_main_build: false
+
 
       - upload-coverage:
           requires:
@@ -386,7 +420,11 @@ workflows:
 
             - build-ruby27-rails-6_1_4
 
+            - build-ruby27-rails-7_0_0_alpha2
+
             - build-ruby30-rails-6_0_4
 
             - build-ruby30-rails-6_1_4
 
+            - build-ruby30-rails-7_0_0_alpha2
+
diff --git a/.circleci/config.yml.erb b/.circleci/config.yml.erb
@@ -21,10 +21,12 @@
     ['2.7', '5.2.6'],
     ['2.7', '6.0.4'],
     ['2.7', '6.1.4'],
+    ['2.7', '7.0.0.alpha2'],
 
     # 3.0
     ['3.0', '6.0.4'],
     ['3.0', '6.1.4', true],
+    ['3.0', '7.0.0.alpha2'],
   ]
 
   main_build = builds.find { |_, _, is_main_build| is_main_build }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.16.0 (September 24, 2021) [☰](https://github.com/kpumuk/meta-tags/compare/v2.15.0...v2.16.0)
+
+Changes:
+
+- Updated maximum dependency specified in gemspec (Getting Ready for Rails 7)
+- Added RBS type definitions.
+
 ## 2.15.0 (August 2, 2021) [☰](https://github.com/kpumuk/meta-tags/compare/v2.14.0...v2.15.0)
 
 Changes:

diff --git a/lib/meta_tags/version.rb b/lib/meta_tags/version.rb
@@ -2,6 +2,6 @@
 
 module MetaTags
   # Gem version.
-  VERSION = '2.15.0'
+  VERSION = '2.16.0'
   public_constant :VERSION
 end
diff --git a/meta-tags.gemspec b/meta-tags.gemspec
@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "actionpack", ">= 3.2.0", "< 6.2"
+  spec.add_dependency "actionpack", ">= 3.2.0", "< 7.1"
 
-  spec.add_development_dependency "railties", ">= 3.2.0", "< 6.2"
+  spec.add_development_dependency "railties", ">= 3.2.0", "< 7.1"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.10.0"
   spec.add_development_dependency "rspec-html-matchers", "~> 0.9.1"