ivy4r 0.9.4 → 0.9.5

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.9.5 / 2009-12-01
+
+* Bugfix for manifest handling in packages. The custom set manifest informations are not lost,
+  ivy informations for manifest are merged into the configured manifest.
+
 === 0.9.4 / 2009-12-01
 
 * ivy.deps for buildr supports three argument types:

data/lib/buildr/ivy_extension.rb

@@ -548,7 +548,7 @@ For more configuration options see IvyConfig.
           pkgs.each do |pkg|
             name = "#{pkg.name}manifest"
             task = project.task name => project.ivy.file_project.task('ivy:resolve') do
-              pkg.with :manifest => project.manifest.merge(project.ivy.manifest)
+              pkg.with :manifest => pkg.manifest.merge(project.manifest.merge(project.ivy.manifest))
               info "Adding manifest entries to package '#{pkg.name}'"
             end
             project.task :build => task

data/lib/ivy4r.rb

@@ -35,7 +35,7 @@ is
   }
 =end
 class Ivy4r
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 
   # Set the ant home directory to load ant classes from if no custom __antwrap__ is provided
   # and the default provided ant version 1.7.1 should not be used.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ivy4r
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
   - Klaas Prause