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 2015/11/26 23:18:10 UTC
buildr git commit: BUILDR-709 - Fix "Exception in jacoco.rb
[TypeError : can't convert Array into String]". Submitted By Ross Mahony.
Repository: buildr
Updated Branches:
refs/heads/master 491e6a48a -> 4e2461623
BUILDR-709 - Fix "Exception in jacoco.rb [TypeError : can't convert Array into String]". Submitted By Ross Mahony.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/4e246162
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/4e246162
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/4e246162
Branch: refs/heads/master
Commit: 4e24616239d8c455f51e1b2058c3e83060731511
Parents: 491e6a4
Author: Peter Donald <pe...@realityforge.org>
Authored: Fri Nov 27 09:18:02 2015 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Fri Nov 27 09:18:02 2015 +1100
----------------------------------------------------------------------
CHANGELOG | 2 ++
addon/buildr/jacoco.rb | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/4e246162/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index d1545de..c64baa7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
1.4.24 (Pending)
+* Fixed: BUILDR-709 - Fix "Exception in jacoco.rb [TypeError : can't convert Array into
+ String]". Submitted By Ross Mahony.
* Added: Define the 'activate_jruby_facet' addon that activates the jruby facet in
generated IDEA project modules.
* Change: Update the Intellij IDEA plugin to support marking directories as generated.
http://git-wip-us.apache.org/repos/asf/buildr/blob/4e246162/addon/buildr/jacoco.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/jacoco.rb b/addon/buildr/jacoco.rb
index e02acec..fbb0b0a 100644
--- a/addon/buildr/jacoco.rb
+++ b/addon/buildr/jacoco.rb
@@ -138,7 +138,7 @@ module Buildr
options << "excludes=#{project.jacoco.excludes.join(':')}" unless project.jacoco.excludes.empty?
agent_config = "-javaagent:#{agent_jar}=#{options.join(',')}"
- project.test.options[:java_args] = (project.test.options[:java_args] || []) + [agent_config]
+ project.test.options[:java_args] = ([project.test.options[:java_args]] || []) + [agent_config]
end
namespace 'jacoco' do
if project.jacoco.generate_xml?