BUILDR-570: Buildr does not work with Rubygems 1.5.x
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1072844 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGELOG b/CHANGELOG
index dcd634e..da2b3d4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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)
diff --git a/lib/buildr/core/application.rb b/lib/buildr/core/application.rb
index 360bf7f..59c02f5 100644
--- a/lib/buildr/core/application.rb
+++ b/lib/buildr/core/application.rb
@@ -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.
diff --git a/rakelib/setup.rake b/rakelib/setup.rake
index 5b3f6bf..c1cd4a0 100644
--- a/rakelib/setup.rake
+++ b/rakelib/setup.rake
@@ -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'
