Add ruby2 support and maintain ruby 1.9 compatibility

reubenjs · Dec 21, 2013 · c8c49cc · c8c49cc
1 parent 4815d2c
commit c8c49cc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
 
 env:
   - DB=mysql

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -339,7 +339,6 @@ DEPENDENCIES
   premailer
   prototype-rails
   pry-rails
-  psych (~> 1)
   quiet_assets
   rails (~> 3.2.12)
   rails3-jquery-autocomplete

diff --git a/fat_free_crm.gemspec b/fat_free_crm.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'responds_to_parent',  '>= 1.1.0'
   gem.add_dependency 'rails3-jquery-autocomplete'
   gem.add_dependency 'valium'
-  gem.add_dependency 'psych', '~> 1'
+  gem.add_dependency 'psych', '~> 1'        if RUBY_VERSION.to_f < 2.0
 
   # FatFreeCRM has released it's own versions of the following gems:
   #-----------------------------------------------------------------