diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5f444b..b75e6cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,8 +25,12 @@ jobs: - rails_5.2_sprockets4.gemfile - rails_6.0.gemfile - rails_6.1.gemfile + - rails_7.0.gemfile #- rails_head.gemfile #- rails_head_sprockets4.gemfile + exclude: + - gemfile: rails_7.0.gemfile + ruby: 2.6 env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }} AWS_REGION: us-east1 diff --git a/README.md b/README.md index 9c79d5d..c78d9ef 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Adds your HTML templates into Angular's `$templateCache` using Rails asset pipel Branch | Build Status ------------|--------- -master | [![Build Status](https://travis-ci.org/pitr/angular-rails-templates.png?branch=master)](https://travis-ci.org/pitr/angular-rails-templates) +master | [![Build Status](https://github.com/pitr/angular-rails-templates/workflows/build/badge.svg)](https://github.com/pitr/angular-rails-templates) 0-x-stable | [![Build Status](https://travis-ci.org/pitr/angular-rails-templates.png?branch=0-x-stable)](https://travis-ci.org/pitr/angular-rails-templates) It removes the need for AJAX calls to retrieve the templates (or for you to manually set them into the DOM). diff --git a/angular-rails-templates.gemspec b/angular-rails-templates.gemspec index 0755a7d..ee69e65 100644 --- a/angular-rails-templates.gemspec +++ b/angular-rails-templates.gemspec @@ -16,8 +16,9 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] - s.add_dependency "railties", ">= 5.0", "< 7" + s.add_dependency "railties", ">= 5.0", "< 7.1" s.add_dependency "sprockets", ">= 3.0", '< 5' + s.add_dependency "sprockets-rails" s.add_dependency "tilt" # There is a deprecation warning indicating the build will fail with Minitest 6 diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile new file mode 100644 index 0000000..f2072e0 --- /dev/null +++ b/gemfiles/rails_7.0.gemfile @@ -0,0 +1,10 @@ +source "https://rubygems.org" + +gem "rails", "~> 7.0.2" +gem "slim-rails" +gem "haml" +gem "kramdown" + +gem 'coveralls', require: false + +gemspec :path => ".././" diff --git a/lib/angular-rails-templates/version.rb b/lib/angular-rails-templates/version.rb index dee2367..dacb26d 100644 --- a/lib/angular-rails-templates/version.rb +++ b/lib/angular-rails-templates/version.rb @@ -1,3 +1,3 @@ module AngularRailsTemplates - VERSION = '1.1.0' + VERSION = '1.2.0' end