Merge branch 'master' into patch-1

pitr · Aug 4, 2022 · d4b2c7c · d4b2c7c
2 parents 88fcd94 + b4e3ed6
commit d4b2c7c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,8 +19,6 @@ jobs:
           - 2.7
           - 2.6
         gemfile:
-          #- rails_4.2.gemfile
-          #- rails_4.2_sprockets4.gemfile
           - rails_5.0.gemfile
           - rails_5.0_sprockets4.gemfile
           - rails_5.2.gemfile

diff --git a/angular-rails-templates.gemspec b/angular-rails-templates.gemspec
@@ -16,12 +16,13 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
-  s.add_dependency "railties", ">= 4.2", "< 7.1"
+  s.add_dependency "railties", ">= 5.0", "< 7.1"
   s.add_dependency "sprockets", ">= 3.0", '< 5'
   s.add_dependency "sprockets-rails"
   s.add_dependency "tilt"
 
-  s.add_development_dependency "minitest"
+  # There is a deprecation warning indicating the build will fail with Minitest 6
+  s.add_development_dependency "minitest", '< 6'
   s.add_development_dependency "capybara"
   s.add_development_dependency "uglifier"
 end
diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile
diff --git a/gemfiles/rails_4.2_sprockets4.gemfile b/gemfiles/rails_4.2_sprockets4.gemfile