diff --git a/Appraisals b/Appraisals index 8dc04dbd6..b34a43f43 100644 --- a/Appraisals +++ b/Appraisals @@ -1,27 +1,20 @@ -appraise "rails-3.1" do - gem 'rails', '~> 3.1' - # Buggy sprockets can break tests under Ruby 2.0. Use a decent version. - # See https://github.com/sstephenson/sprockets/issues/352 - gem 'sprockets', '>= 2.2.2' -end - appraise "rails-3.2" do - gem 'rails', '~> 3.2' + gem 'rails', '~> 3.2.21' end appraise "rails-4.0" do - gem 'rails', '~> 4.0' + gem 'rails', '~> 4.0.13' end appraise "rails-4.0-with-therubyracer" do - gem 'rails', '~> 4.0' + gem 'rails', '~> 4.0.13' gem 'therubyracer', '0.12.0', :platform => :mri end appraise "rails-4.1" do - gem 'rails', '~> 4.1' + gem 'rails', '~> 4.1.10' end appraise "rails-4.2" do - gem 'rails', '~> 4.2' + gem 'rails', '~> 4.2.1' end diff --git a/README.md b/README.md index d57b2adbe..56d284a04 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ # react-rails -`react-rails` makes it easy to use [React](http://facebook.github.io/react/) and [JSX](http://facebook.github.io/react/docs/jsx-in-depth.html) in your Ruby on Rails (3.1+) application. `react-rails` can: +`react-rails` makes it easy to use [React](http://facebook.github.io/react/) and [JSX](http://facebook.github.io/react/docs/jsx-in-depth.html) in your Ruby on Rails (3.2+) application. `react-rails` can: - Provide [various `react` builds](#reactjs-builds) to your asset bundle - Transform [`.jsx` in the asset pipeline](#jsx) diff --git a/gemfiles/rails_3.1.gemfile b/gemfiles/rails_3.1.gemfile deleted file mode 100644 index c49049f55..000000000 --- a/gemfiles/rails_3.1.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "http://rubygems.org" - -gem "rails", "~> 3.1" -gem "sprockets", ">= 2.2.2" - -gemspec :path => "../" diff --git a/gemfiles/rails_3.2.gemfile b/gemfiles/rails_3.2.gemfile index 0b2047cf5..d9f2db1f8 100644 --- a/gemfiles/rails_3.2.gemfile +++ b/gemfiles/rails_3.2.gemfile @@ -2,6 +2,6 @@ source "http://rubygems.org" -gem "rails", "~> 3.2" +gem "rails", "~> 3.2.21" gemspec :path => "../" diff --git a/gemfiles/rails_4.0.gemfile b/gemfiles/rails_4.0.gemfile index a3fdee2c0..8417b9d48 100644 --- a/gemfiles/rails_4.0.gemfile +++ b/gemfiles/rails_4.0.gemfile @@ -2,6 +2,6 @@ source "http://rubygems.org" -gem "rails", "~> 4.0" +gem "rails", "~> 4.0.13" gemspec :path => "../" diff --git a/gemfiles/rails_4.0_with_therubyracer.gemfile b/gemfiles/rails_4.0_with_therubyracer.gemfile index a8f5be006..7a40d4bac 100644 --- a/gemfiles/rails_4.0_with_therubyracer.gemfile +++ b/gemfiles/rails_4.0_with_therubyracer.gemfile @@ -2,7 +2,7 @@ source "http://rubygems.org" -gem "rails", "~> 4.0" +gem "rails", "~> 4.0.13" gem "therubyracer", "0.12.0", :platform => :mri gemspec :path => "../" diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile index 1bb928d7b..8f55cb90e 100644 --- a/gemfiles/rails_4.1.gemfile +++ b/gemfiles/rails_4.1.gemfile @@ -2,6 +2,6 @@ source "http://rubygems.org" -gem "rails", "~> 4.1" +gem "rails", "~> 4.1.10" gemspec :path => "../" diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile index 23fe64d2b..2364ae718 100644 --- a/gemfiles/rails_4.2.gemfile +++ b/gemfiles/rails_4.2.gemfile @@ -2,6 +2,6 @@ source "http://rubygems.org" -gem "rails", "~> 4.2" +gem "rails", "~> 4.2.1" gemspec :path => "../" diff --git a/react-rails.gemspec b/react-rails.gemspec index 0e98a5cf3..6ea18ede3 100644 --- a/react-rails.gemspec +++ b/react-rails.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |s| s.add_dependency 'coffee-script-source', '~>1.8' s.add_dependency 'connection_pool' s.add_dependency 'execjs' - s.add_dependency 'rails', '>= 3.1' + s.add_dependency 'rails', '>= 3.2' s.add_dependency 'tilt' s.files = Dir[ diff --git a/test/dummy/config/initializers/secret_token.rb b/test/dummy/config/initializers/secret_token.rb index bbb0cf04a..5dea6d691 100644 --- a/test/dummy/config/initializers/secret_token.rb +++ b/test/dummy/config/initializers/secret_token.rb @@ -11,5 +11,5 @@ # if you're sharing your code publicly. Dummy::Application.config.secret_key_base = '43fa5672451bbd0a171668e625edc433eb00eeeb14c2606546e262e499ab853cfb532998d4809abe5019bf13888863e3a2c7d5cf7757de7a2b1fb50826d9874e' -# for rails 3.1 & 3.2 +# For Rails 3.2. Dummy::Application.config.secret_token = Dummy::Application.config.secret_key_base