Merge pull request #198 from bokmann/rails-5.2-support

Rails 5.2 support
bokmann · Apr 10, 2018 · ce0a241 · ce0a241
2 parents abf7780 + 29e966b
commit ce0a241
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,18 +2,19 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.3.5
+  - 2.4.3
+  - 2.5.0
 gemfile:
   - Gemfile
   - gemfiles/rails-4.2.gemfile
   - gemfiles/rails-5.0.gemfile
   - gemfiles/rails-5.1.gemfile
+  - gemfiles/rails-5.2.gemfile
   - gemfiles/rails-master.gemfile
 matrix:
   include:
-    - rvm: 2.2.7
+    - rvm: 2.2.9
       gemfile: gemfiles/rails-3.2.gemfile
   allow_failures:
     - gemfile: gemfiles/rails-master.gemfile

diff --git a/font-awesome-rails.gemspec b/font-awesome-rails.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = FontAwesome::Rails::VERSION
 
-  gem.add_dependency "railties", ">= 3.2", "< 5.2"
+  gem.add_dependency "railties", ">= 3.2", "< 6.0"
 
   gem.add_development_dependency "activesupport"
   gem.add_development_dependency "sass-rails"

diff --git a/gemfiles/rails-5.0.gemfile b/gemfiles/rails-5.0.gemfile
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 gemspec path: "../"
-gem "railties", "~> 5.0.0.rc1"
+gem "railties", "~> 5.0.0"
diff --git a/gemfiles/rails-5.1.gemfile b/gemfiles/rails-5.1.gemfile
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 gemspec path: "../"
-gem "railties", "~> 5.1.x"
+gem "railties", "~> 5.1.0"
diff --git a/gemfiles/rails-5.2.gemfile b/gemfiles/rails-5.2.gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gemspec path: "../"
+gem "railties", "~> 5.2.0"