Merge pull request #202 from eitoball/rails-6

Add Rails 6.0 support
bokmann · Apr 16, 2019 · ad9dbf9 · ad9dbf9
2 parents 8ffeaf3 + 3cb7bba
commit ad9dbf9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,21 +2,27 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.3.5
-  - 2.4.3
-  - 2.5.0
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.2
 gemfile:
   - Gemfile
   - gemfiles/rails-4.2.gemfile
   - gemfiles/rails-5.0.gemfile
   - gemfiles/rails-5.1.gemfile
   - gemfiles/rails-5.2.gemfile
+  - gemfiles/rails-6.0.gemfile
   - gemfiles/rails-master.gemfile
 matrix:
   include:
     - rvm: 2.2.9
       gemfile: gemfiles/rails-3.2.gemfile
+  exclude:
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails-6.0.gemfile
+    - rvm: 2.4.6
+      gemfile: gemfiles/rails-6.0.gemfile
   allow_failures:
-    - rvm: 2.5.0
     - gemfile: gemfiles/rails-master.gemfile
   fast_finish: true
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", "< 6.0"
+  gem.add_dependency "railties", ">= 3.2", "< 6.1"
 
   gem.add_development_dependency "activesupport"
   gem.add_development_dependency "sass-rails"

diff --git a/gemfiles/rails-6.0.gemfile b/gemfiles/rails-6.0.gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gemspec path: "../"
+gem "railties", ">= 6.0.0.beta3", "< 6.1"