diff --git a/.gitignore b/.gitignore index 6494369..da91d7c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ # Appraisals *.gemfile.lock +/gemfiles/.bundle diff --git a/Appraisals b/Appraisals index 569bf00..32e1e98 100644 --- a/Appraisals +++ b/Appraisals @@ -5,3 +5,8 @@ end appraise "rails-6-1" do gem "rails", "6.1.4" end + +appraise "rails-7" do + gem "rails", "7.0.4" + gem "sprockets-rails", "3.4.2" +end diff --git a/CHANGELOG.md b/CHANGELOG.md index 45c0e5d..04e3f60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ _none_ +## 2.1.1 (2022-09-21) + +**Changes** +* Support Rails 7 + ## 2.1.0 (2022-02-10) **Changes** diff --git a/Gemfile b/Gemfile index 39ebf6f..bef852e 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,3 @@ source "https://rubygems.org" # Specify your gem's dependencies in nulogy_graphql_api.gemspec gemspec - -gem "rake", "~> 13.0" -gem "rspec", "~> 3.9" diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile index 2af2f46..ab7af82 100644 --- a/gemfiles/rails_6.gemfile +++ b/gemfiles/rails_6.gemfile @@ -2,8 +2,6 @@ source "https://rubygems.org" -gem "rake", "~> 13.0" -gem "rspec", "~> 3.9" gem "rails", "6.0.3.7" gemspec path: "../" diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile index b5bb5c8..2c17297 100644 --- a/gemfiles/rails_6_1.gemfile +++ b/gemfiles/rails_6_1.gemfile @@ -2,8 +2,6 @@ source "https://rubygems.org" -gem "rake", "~> 13.0" -gem "rspec", "~> 3.9" gem "rails", "6.1.4" gemspec path: "../" diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile new file mode 100644 index 0000000..f349e2b --- /dev/null +++ b/gemfiles/rails_7.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "7.0.4" +gem "sprockets-rails", "3.4.2" + +gemspec path: "../" diff --git a/lib/nulogy_graphql_api/version.rb b/lib/nulogy_graphql_api/version.rb index e9140c3..db31e3a 100644 --- a/lib/nulogy_graphql_api/version.rb +++ b/lib/nulogy_graphql_api/version.rb @@ -1,3 +1,3 @@ module NulogyGraphqlApi - VERSION = "2.1.0" + VERSION = "2.1.1" end diff --git a/nulogy_graphql_api.gemspec b/nulogy_graphql_api.gemspec index 0fd0375..512b456 100644 --- a/nulogy_graphql_api.gemspec +++ b/nulogy_graphql_api.gemspec @@ -30,11 +30,12 @@ Gem::Specification.new do |spec| spec.add_dependency "graphql", "~> 2.0" spec.add_dependency "graphql-schema_comparator", "~> 1.0" - spec.add_dependency "rails", ">= 6.0", "< 7.0" + spec.add_dependency "rails", ">= 6.0", "< 8.0" spec.add_dependency "rainbow", "~> 3.0" spec.add_development_dependency "appraisal", "~> 2.4" spec.add_development_dependency "rake", "~> 13.0" + spec.add_development_dependency "rspec", "~> 3.9" spec.add_development_dependency "rspec-rails", "~> 5.1" spec.add_development_dependency "rubocop", "~> 1.25" spec.add_development_dependency "rubocop-performance", "~> 1.13" diff --git a/spec/dummy/app/graphql/query_type.rb b/spec/dummy/app/graphql/fake_query.rb similarity index 100% rename from spec/dummy/app/graphql/query_type.rb rename to spec/dummy/app/graphql/fake_query.rb diff --git a/spec/dummy/app/graphql/schema.rb b/spec/dummy/app/graphql/fake_schema.rb similarity index 100% rename from spec/dummy/app/graphql/schema.rb rename to spec/dummy/app/graphql/fake_schema.rb