lib/active_support/vendor.rb in activesupport-2.2.3 vs lib/active_support/vendor.rb in activesupport-2.3.2

@@ -4,31 +4,26 @@
 begin
   gem 'builder', '~> 2.1.2'
 rescue Gem::LoadError
   $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2"
 end
+require 'builder'
 
 begin
-  gem 'xml-simple', '~> 1.0.11'
+  gem 'memcache-client', '>= 1.6.5'
 rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/xml-simple-1.0.11"
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.6.5"
 end
 
 begin
-  gem 'memcache-client', '>= 1.5.1'
-rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.5.1"
-end
-
-begin
   gem 'tzinfo', '~> 0.3.12'
 rescue Gem::LoadError
   $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.12"
 end
 
 # TODO I18n gem has not been released yet
 # begin
-#   gem 'i18n', '~> 0.0.1'
+#   gem 'i18n', '~> 0.1.3'
 # rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.0.1"
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.1.3/lib"
   require 'i18n'
-# end
\ No newline at end of file
+# end