summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortduehr <tduehr@gmail.com>2014-02-20 11:06:08 -0600
committertduehr <tduehr@gmail.com>2014-02-20 11:06:08 -0600
commitee370b5dacd9647a46e1bad06f9e5cbca47efb2a (patch)
treeae1f42207575bb87007b16d3940b2f243f7e32ea
parent0de9b5eb73d5869bedb3c3257ab94b49cde8aa5d (diff)
downloadffi-ee370b5dacd9647a46e1bad06f9e5cbca47efb2a.tar.gz
update Gemfile and .travis
-rw-r--r--.travis.yml4
-rw-r--r--Gemfile9
-rw-r--r--Gemfile.lock25
3 files changed, 9 insertions, 29 deletions
diff --git a/.travis.yml b/.travis.yml
index 9bb89ec..d15f371 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,12 @@ rvm:
- "1.9.3"
- "1.8.7"
- "2.0.0"
+ - "2.1.0"
- "ruby-head"
- "rbx-2.1.1"
+ - "rbx"
matrix:
allow_failures:
- rvm: "rbx-2.1.1"
+ - rvm: "rbx"
+ - rvm: "1.8.7"
diff --git a/Gemfile b/Gemfile
index 11a8240..8503e67 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
source 'https://rubygems.org'
-gem 'rake', '>= 0.9.2.2'
-gem 'rake-compiler', '>= 0.6.0'
-gem 'rspec', '>= 2.11.0'
-gem 'rubygems-tasks'
+gem 'rake', '~> 10.1'
+gem 'rake-compiler', '~> 0.9.2'
+gem 'rspec', '~> 2.14.1'
+gem 'rubygems-tasks', '~> 0.2.4', require: 'rubygems/tasks'
+gem "rubysl", "~> 2.0", platforms: 'rbx'
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index dc18608..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,25 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- diff-lcs (1.2.2)
- rake (10.0.4)
- rake-compiler (0.8.3)
- rake
- rspec (2.13.0)
- rspec-core (~> 2.13.0)
- rspec-expectations (~> 2.13.0)
- rspec-mocks (~> 2.13.0)
- rspec-core (2.13.1)
- rspec-expectations (2.13.0)
- diff-lcs (>= 1.1.3, < 2.0)
- rspec-mocks (2.13.1)
- rubygems-tasks (0.2.4)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- rake (>= 0.9.2.2)
- rake-compiler (>= 0.6.0)
- rspec (>= 2.11.0)
- rubygems-tasks