jeweler2

Conflicts: Gemfile.lock
martinpoljak · Feb 19, 2012 · 8b93d1e · 8b93d1e
1 parent 1ed0d3c
commit 8b93d1e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 41 deletions.
diff --git a/Gemfile b/Gemfile
@@ -11,5 +11,5 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "bundler", ">= 1.0.0"
-  gem "jeweler", ">= 1.5.2"
+  gem "jeweler2", ">= 2.0.0"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/Rakefile b/Rakefile
@@ -11,7 +11,7 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rake'
-require 'jeweler'
+require 'jeweler2'
 
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options