remove support for Rails 4.2+ in branch 0.x

pitr · Feb 1, 2016 · b63bfc2 · b63bfc2
1 parent 14c5ce2
commit b63bfc2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,8 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.2.2
   - jruby-19mode
-  - ruby-head
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - gemfile: gemfiles/rails_head.gemfile
 
 gemfile:
   - gemfiles/rails_3.gemfile
-  - gemfiles/rails_4.gemfile
-  - gemfiles/rails_head.gemfile
+  - gemfiles/rails_4.0.gemfile
+  - gemfiles/rails_4.1.gemfile
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.1.0"
-gem "slim"
+gem "slim-rails"
 gem "haml"
 gem "kramdown"
 

diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 Adds your HTML templates into Angular's `$templateCache` using Rails asset pipeline.
 
+**IMPORTANT**: for Rails 4.2+ use version 1.0+ of this gem. For Rails 3 - 4.1 use version 0.x
+
 It removes the need for AJAX calls to retrieve the templates (or for you to manually set them into the DOM).
 
 ## Usage

diff --git a/angular-rails-templates.gemspec b/angular-rails-templates.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "railties", ">= 3.1"
-  s.add_dependency "sprockets", "~> 2"
+  s.add_dependency "sprockets", "~> 2.0"
   s.add_dependency "tilt"
 
   s.add_development_dependency "minitest"

diff --git a/gemfiles/rails_4.gemfile → gemfiles/rails_4.0.gemfile b/gemfiles/rails_4.gemfile → gemfiles/rails_4.0.gemfile
@@ -1,9 +1,8 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 4.0.1"
+gem "rails", "~> 4.0.0"
 gem "slim-rails"
 gem "haml"
 gem "kramdown"
 
-
 gemspec :path => ".././"
diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+gem "slim-rails"
+gem "haml"
+gem "kramdown"
+
+gemspec :path => ".././"