Fix GWT addon to explicitly add gwt-dev artifact to gwt compile path now that the bug that allowed unintended sharing has been fixed.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/787ae30a Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/787ae30a Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/787ae30a Branch: refs/heads/master Commit: 787ae30a3a67e5578910a6fd6a281e4f19a7661c Parents: 87e1b97 Author: Peter Donald <[email protected]> Authored: Sat Aug 15 09:44:25 2015 +1000 Committer: Peter Donald <[email protected]> Committed: Sat Aug 15 09:44:25 2015 +1000 ---------------------------------------------------------------------- CHANGELOG | 2 ++ addon/buildr/gwt.rb | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/787ae30a/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 67a690f..9c6abad 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ 1.4.24 (Pending) * Change: Update the default GWT version used in the GWT addon to the latest release 2.7.0. +* Fixed: Fix GWT addon to explicitly add gwt-dev artifact to gwt compile path now that + the bug that allowed unintended sharing has been fixed. * Fixed: Fix bug in IDEA module generation that resulted in dependencies in IDEA module using shared references to compile dependencies. * Change: Update the checkstyle addon to use checkstyle 6.7. http://git-wip-us.apache.org/repos/asf/buildr/blob/787ae30a/addon/buildr/gwt.rb ---------------------------------------------------------------------- diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb index 8b14949..d939958 100644 --- a/addon/buildr/gwt.rb +++ b/addon/buildr/gwt.rb @@ -127,22 +127,22 @@ module Buildr version = gwt_detect_version(dependencies) || Buildr::GWT.version - if project.iml? - existing_deps = project.compile.dependencies.collect do |d| - a = artifact(d) - a.invoke if a.is_a?(Buildr::Artifact) - a.to_s - end - Buildr::GWT.dependencies(version).each do |d| - a = artifact(d) - a.invoke if a.respond_to?(:invoke) - project.iml.main_dependencies << a.to_s unless existing_deps.include?(a.to_s) - end + additional_gwt_deps = [] + existing_deps = project.compile.dependencies.collect do |d| + a = artifact(d) + a.invoke if a.is_a?(Buildr::Artifact) + a.to_s + end + Buildr::GWT.dependencies(version).each do |d| + a = artifact(d) + a.invoke if a.respond_to?(:invoke) + project.iml.main_dependencies << a.to_s unless !project.iml? || existing_deps.include?(a.to_s) + additional_gwt_deps << a end task = project.file(output_dir) do Buildr::GWT.gwtc_main(module_names, - (dependencies + artifacts).flatten.compact, + (dependencies + artifacts + additional_gwt_deps).flatten.compact, output_dir, unit_cache_dir, {:version => version}.merge(options))
