Merge pull request #181 from sciencehistory/rails_7.2

allow Rails 7.2

.github/workflows/ci.yml

@@ -45,6 +45,9 @@ jobs:
           - gemfile: rails_71
             ruby: '3.2'
 
+          - gemfile: rails_72
+            ruby: '3.3'
+
 
     name: test ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}
 

Appraisals

@@ -8,25 +8,12 @@ end
 
 appraise "rails-70" do
   gem "rails", "~> 7.0.0"
-
-  # sprockets-rails is generated into gemfile in Rails 7.0, where it
-  # was a gemspec dependency in previous rails. We'll just
-  # add it here for now. Used for testing cocoon integration,
-  # we are currently including cocoon via sprockets.
-  gem 'sprockets-rails', :require => 'sprockets/railtie'
 end
 
 appraise "rails-71" do
   gem "rails", "~> 7.1.0"
+end
 
-  # sprockets-rails is generated into gemfile in Rails 7.1, where it
-  # was a gemspec dependency in previous rails. We'll just
-  # add it here for now. Used for testing cocoon integration,
-  # we are currently including cocoon via sprockets.
-  gem 'sprockets-rails', :require => 'sprockets/railtie'
-
-  # need a custom branch of db-query-matchers until/unless it's updated
-  # to allow rails 7.1
-  # https://github.com/civiccc/db-query-matchers/pull/56
-  gem "db-query-matchers", github: "jrochkind/db-query-matchers", branch: "allow_rails_7.1"
+appraise "rails-72" do
+  gem "rails", "~> 7.2.0"
 end

CHANGES.md

@@ -12,6 +12,12 @@
 
 *
 
+## 2.15.0
+
+### Added
+
+* Allow Rails 7.2 in gemspec, no code changes required. https://github.com/sciencehistory/kithe/pull/181
+
 ## 2.14.0
 
 ### Added

Gemfile

@@ -20,6 +20,11 @@ group :development, :test do
   gem 'pry-byebug', '~> 3.6'
   # 6.3.0 and 6.4.0 have a bug https://github.com/thoughtbot/factory_bot_rails/issues/433
   gem 'factory_bot_rails', '~> 6.2', "!= 6.3.0", "!= 6.4.0"
-  # only used for current mechanism of testing working with cocoon JS
+
+
+  # sprockets-rails is generated into gemfile in Rails 7.0, where it
+  # was a gemspec dependency in previous rails. We'll just
+  # add it here because we need it for testing cocoon integration,
+  # and we are currently including cocoon via sprockets.
   gem "sprockets-rails"
 end

gemfiles/rails_70.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 7.0.0"
-gem "sprockets-rails", require: "sprockets/railtie"
 
 group :development, :test do
   gem "rspec-rails", ">= 5.0", "< 7"

gemfiles/rails_71.gemfile

@@ -3,8 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 7.1.0"
-gem "sprockets-rails", require: "sprockets/railtie"
-gem "db-query-matchers", branch: "allow_rails_7.1", git: "https://github.com/jrochkind/db-query-matchers.git"
 
 group :development, :test do
   gem "rspec-rails", ">= 5.0", "< 7"

gemfiles/rails_72.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.2.0"
+
+group :development, :test do
+  gem "rspec-rails", ">= 5.0", "< 7"
+  gem "rspec-mocks", ">= 3.12.1"
+  gem "pry-byebug", "~> 3.6"
+  gem "factory_bot_rails", "~> 6.2", "!= 6.3.0", "!= 6.4.0"
+  gem "sprockets-rails"
+end
+
+gemspec path: "../"

kithe.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.5'
 
-  s.add_dependency "rails", ">= 6.0", "< 7.2"
+  s.add_dependency "rails", ">= 6.0", "< 8.0"
   s.add_dependency "attr_json", "~> 2.0"
 
   s.add_dependency "simple_form", ">= 4.0", "< 6.0"

lib/kithe/version.rb

@@ -1,3 +1,3 @@
 module Kithe
-  VERSION = '2.14.0'
+  VERSION = '2.15.0'
 end