Merge pull request #166 from rails/reinstate-rails-7.0-support

Reinstate rails 7.0 support

Author: djmb

.github/workflows/main.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version: ["3.0", "3.1", "3.2", "3.3"]
-        gemfile: [ rails_7_1, rails_main ]
+        gemfile: [ rails_7, rails_7_1, rails_main ]
         database: [sqlite, postgres, mysql]
         exclude:
         - ruby-version: "3.0"

Appraisals

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+appraise "rails-7" do
+  gem "railties", github: "rails/rails", branch: "7-0-stable"
+end
+
 appraise "rails-7-1" do
   gem "railties", github: "rails/rails", branch: "7-1-stable"
 end

Gemfile.lock

@@ -2,9 +2,9 @@ PATH
   remote: .
   specs:
     solid_cache (0.5.3)
-      activejob (>= 7.1)
-      activerecord (>= 7.1)
-      railties (>= 7.1)
+      activejob (>= 7)
+      activerecord (>= 7)
+      railties (>= 7)
 
 GEM
   remote: https://rubygems.org/
@@ -76,6 +76,7 @@ GEM
     minitest (5.22.2)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
+    msgpack (1.7.2)
     mutex_m (0.2.0)
     mysql2 (0.5.5)
     nokogiri (1.16.2-arm64-darwin)
@@ -184,6 +185,7 @@ DEPENDENCIES
   appraisal
   debug
   mocha
+  msgpack
   mysql2
   pg
   rubocop (>= 1.25.1)

gemfiles/rails_7.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3"
+gem "mysql2"
+gem "pg"
+gem "sprockets-rails"
+gem "appraisal"
+gem "railties", branch: "7-0-stable", git: "https://github.com/rails/rails.git"
+
+group :rubocop do
+  gem "rubocop", ">= 1.25.1", require: false
+  gem "rubocop-minitest", require: false
+  gem "rubocop-packaging", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "rubocop-md", require: false
+end
+
+gemspec path: "../"

gemfiles/rails_7.gemfile.lock

@@ -0,0 +1,198 @@
+GIT
+  remote: https://github.com/rails/rails.git
+  revision: 45afb81bdeb7c74a3182b961cc2a9ca30dbb47e3
+  branch: 7-0-stable
+  specs:
+    actionpack (7.0.8)
+      actionview (= 7.0.8)
+      activesupport (= 7.0.8)
+      racc
+      rack (~> 2.0, >= 2.2.4)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (7.0.8)
+      activesupport (= 7.0.8)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.0.8)
+      activesupport (= 7.0.8)
+      globalid (>= 0.3.6)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activerecord (7.0.8)
+      activemodel (= 7.0.8)
+      activesupport (= 7.0.8)
+    activesupport (7.0.8)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    railties (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+
+PATH
+  remote: ..
+  specs:
+    solid_cache (0.5.3)
+      activejob (>= 7)
+      activerecord (>= 7)
+      railties (>= 7)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.5)
+    builder (3.2.4)
+    concurrent-ruby (1.2.3)
+    crass (1.0.6)
+    debug (1.9.1)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
+    drb (2.2.0)
+      ruby2_keywords
+    erubi (1.12.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    io-console (0.7.1)
+    irb (1.11.1)
+      rdoc
+      reline (>= 0.4.2)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    method_source (1.0.0)
+    minitest (5.21.1)
+    mocha (2.1.0)
+      ruby2_keywords (>= 0.0.5)
+    msgpack (1.7.2)
+    mutex_m (0.2.0)
+    mysql2 (0.5.5)
+    nokogiri (1.16.0-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.0-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.0-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.24.0)
+    parser (3.3.0.4)
+      ast (~> 2.4.1)
+      racc
+    pg (1.5.4)
+    psych (5.1.2)
+      stringio
+    racc (1.7.3)
+    rack (2.2.8)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    rainbow (3.1.1)
+    rake (13.1.0)
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.0)
+    reline (0.4.2)
+      io-console (~> 0.5)
+    rexml (3.2.6)
+    rubocop (1.60.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-md (1.2.2)
+      rubocop (>= 1.0)
+    rubocop-minitest (0.34.4)
+      rubocop (>= 1.39, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-packaging (0.5.2)
+      rubocop (>= 1.33, < 2.0)
+    rubocop-performance (1.20.2)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-rails (2.23.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sprockets (4.2.1)
+      concurrent-ruby (~> 1.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.7.0-arm64-darwin)
+    sqlite3 (1.7.0-x86_64-darwin)
+    sqlite3 (1.7.0-x86_64-linux)
+    stringio (3.1.0)
+    thor (1.3.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+    zeitwerk (2.6.12)
+
+PLATFORMS
+  arm64-darwin-21
+  arm64-darwin-22
+  arm64-darwin-23
+  x86_64-darwin-20
+  x86_64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal
+  debug
+  mocha
+  msgpack
+  mysql2
+  pg
+  railties!
+  rubocop (>= 1.25.1)
+  rubocop-md
+  rubocop-minitest
+  rubocop-packaging
+  rubocop-performance
+  rubocop-rails
+  solid_cache!
+  sprockets-rails
+  sqlite3
+
+BUNDLED WITH
+   2.3.26

gemfiles/rails_7_1.gemfile.lock

@@ -51,9 +51,9 @@ PATH
   remote: ..
   specs:
     solid_cache (0.5.3)
-      activejob (>= 7.1)
-      activerecord (>= 7.1)
-      railties (>= 7.1)
+      activejob (>= 7)
+      activerecord (>= 7)
+      railties (>= 7)
 
 GEM
   remote: https://rubygems.org/
@@ -91,6 +91,7 @@ GEM
     minitest (5.21.1)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
+    msgpack (1.7.2)
     mutex_m (0.2.0)
     mysql2 (0.5.5)
     nokogiri (1.16.0-arm64-darwin)
@@ -191,6 +192,7 @@ DEPENDENCIES
   appraisal
   debug
   mocha
+  msgpack
   mysql2
   pg
   railties!

gemfiles/rails_main.gemfile.lock

@@ -51,9 +51,9 @@ PATH
   remote: ..
   specs:
     solid_cache (0.5.3)
-      activejob (>= 7.1)
-      activerecord (>= 7.1)
-      railties (>= 7.1)
+      activejob (>= 7)
+      activerecord (>= 7)
+      railties (>= 7)
 
 GEM
   remote: https://rubygems.org/
@@ -90,6 +90,7 @@ GEM
     minitest (5.21.2)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
+    msgpack (1.7.2)
     mysql2 (0.5.5)
     nokogiri (1.16.2-arm64-darwin)
       racc (~> 1.4)
@@ -190,6 +191,7 @@ DEPENDENCIES
   appraisal
   debug
   mocha
+  msgpack
   mysql2
   pg
   railties!

solid_cache.gemspec

@@ -24,10 +24,11 @@ Gem::Specification.new do |spec|
     Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
   end
 
-  rails_version = ">= 7.1"
+  rails_version = ">= 7"
   spec.add_dependency "activerecord", rails_version
   spec.add_dependency "activejob", rails_version
   spec.add_dependency "railties", rails_version
   spec.add_development_dependency "debug"
   spec.add_development_dependency "mocha"
+  spec.add_development_dependency "msgpack"
 end