You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2017/10/30 11:15:18 UTC
buildr git commit: Remove unnecessary block parameters
Repository: buildr
Updated Branches:
refs/heads/master b6a894a65 -> 36996ac87
Remove unnecessary block parameters
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/36996ac8
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/36996ac8
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/36996ac8
Branch: refs/heads/master
Commit: 36996ac8738427c68c589a978503683461a95553
Parents: b6a894a
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Oct 30 22:14:49 2017 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Oct 30 22:14:49 2017 +1100
----------------------------------------------------------------------
addon/buildr/jacoco.rb | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/36996ac8/addon/buildr/jacoco.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/jacoco.rb b/addon/buildr/jacoco.rb
index a4b5e56..805fbea 100644
--- a/addon/buildr/jacoco.rb
+++ b/addon/buildr/jacoco.rb
@@ -146,21 +146,21 @@ module Buildr
desc 'Generate JaCoCo reports.'
task 'reports' do
Buildr.ant 'jacoco' do |ant|
- ant.taskdef(:resource => 'org/jacoco/ant/antlib.xml') do |ant|
+ ant.taskdef(:resource => 'org/jacoco/ant/antlib.xml') do
ant.classpath :path => Buildr.artifacts(Buildr::JaCoCo.ant_spec).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
end
- ant.report do |ant|
- ant.executiondata do |ant|
+ ant.report do
+ ant.executiondata do
ant.file :file => project.jacoco.destfile
end
- ant.structure(:name => project.name) do |ant|
+ ant.structure(:name => project.name) do
if project.compile.target
- ant.classfiles do |ant|
+ ant.classfiles do
ant.fileset :dir => project.compile.target
end
end
- ant.sourcefiles(:encoding => 'UTF-8') do |ant|
+ ant.sourcefiles(:encoding => 'UTF-8') do
project.compile.sources.each do |path|
ant.fileset :dir => path.to_s
end
@@ -179,24 +179,24 @@ module Buildr
namespace 'jacoco' do
desc 'Generate JaCoCo reports.'
task 'report' do
- Buildr.ant 'jacoco' do |ant|
- ant.taskdef(:resource => 'org/jacoco/ant/antlib.xml') do |ant|
+ Buildr.ant('jacoco') do |ant|
+ ant.taskdef(:resource => 'org/jacoco/ant/antlib.xml') do
ant.classpath :path => Buildr.artifacts(Buildr::JaCoCo.ant_spec).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
end
- ant.report do |ant|
- ant.executiondata do |ant|
+ ant.report do
+ ant.executiondata do
Buildr.projects.select{|p|p.jacoco.enabled?}.each do |project|
ant.fileset :file=>project.jacoco.destfile if File.exist?(project.jacoco.destfile)
end
end
- ant.structure(:name => 'Jacoco Report') do |ant|
- ant.classfiles do |ant|
+ ant.structure(:name => 'Jacoco Report') do
+ ant.classfiles do
Buildr.projects.select{|p|p.jacoco.enabled?}.map(&:compile).map(&:target).flatten.map(&:to_s).each do |src|
ant.fileset :dir=>src.to_s if File.exist?(src)
end
end
- ant.sourcefiles(:encoding => 'UTF-8') do |ant|
+ ant.sourcefiles(:encoding => 'UTF-8') do
Buildr.projects.select{|p|p.jacoco.enabled?}.map(&:compile).map(&:sources).flatten.map(&:to_s).each do |src|
ant.fileset :dir=>src.to_s if File.exist?(src)
end