You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by bo...@apache.org on 2011/02/21 05:04:40 UTC
svn commit: r1072844 - in /buildr/trunk: CHANGELOG
lib/buildr/core/application.rb rakelib/setup.rake
Author: boisvert
Date: Mon Feb 21 04:04:40 2011
New Revision: 1072844
URL: http://svn.apache.org/viewvc?rev=1072844&view=rev
Log:
BUILDR-570: Buildr does not work with Rubygems 1.5.x
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/core/application.rb
buildr/trunk/rakelib/setup.rake
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1072844&r1=1072843&r2=1072844&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Mon Feb 21 04:04:40 2011
@@ -41,6 +41,7 @@
* Fixed: BUILDR-562 WAR package isn't updated if files under src/main/webapp
are updated
* Fixed: BUILDR-569 Buildr fails under JRuby 1.6.0.RC1 due to read-only $? variable
+* Fixed: BUILDR-570 Buildr does not work with Rubygems 1.5.x
* Fixed: Scaladoc task would cause build to exit prematurely
1.4.4 (2010-11-16)
Modified: buildr/trunk/lib/buildr/core/application.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/application.rb?rev=1072844&r1=1072843&r2=1072844&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/application.rb (original)
+++ buildr/trunk/lib/buildr/core/application.rb Mon Feb 21 04:04:40 2011
@@ -38,9 +38,9 @@
require 'rake'
require 'highline/import'
-require 'rubygems/source_info_cache'
+require 'rubygems/source_info_cache' if Gem::VERSION =~ /1.[0-4]/
require 'buildr/core/util'
-Gem.autoload :SourceInfoCache, 'rubygems/source_info_cache'
+Gem.autoload :SourceInfoCache, 'rubygems/source_info_cache' if Gem::VERSION =~ /1.[0-4]/
# Gem::user_home is nice, but ENV['HOME'] lets you override from the environment.
Modified: buildr/trunk/rakelib/setup.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/setup.rake?rev=1072844&r1=1072843&r2=1072844&view=diff
==============================================================================
--- buildr/trunk/rakelib/setup.rake (original)
+++ buildr/trunk/rakelib/setup.rake Mon Feb 21 04:04:40 2011
@@ -15,7 +15,7 @@
require 'jruby' if RUBY_PLATFORM[/java/]
-require 'rubygems/source_info_cache'
+require 'rubygems/source_info_cache' if Gem::VERSION =~ /1.[0-4]/
RAKE_SUDO = case (ENV['RAKE_SUDO'] or 'false').strip.downcase
when 'yes', 'true'