Merge pull request #58 from egaiter/upstream

Fixed build issues
constantcontact · Jun 22, 2016 · 70459c4 · 70459c4
2 parents a3da5da + 3e693c0
commit 70459c4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 .ruby-*
 .yardoc
 *.gem
+Gemfile.lock
diff --git a/.travis.yml b/.travis.yml
@@ -5,4 +5,6 @@ rvm:
   - 1.9.3
   - 1.9.2
   - jruby-19mode
+before_install:
+  - gem update bundler
 #script: rspec spec
diff --git a/Gemfile b/Gemfile
@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in constantcontact.gemspec
 gemspec
-gem 'rake'
+gem 'rake', '~>10.1'
diff --git a/Gemfile.lock b/Gemfile.lock