svn commit: r1559423 - in /buildr/trunk: CHANGELOG addon/buildr/gwt.rb

[do...@apache.org]

Author: donaldp
Date: Sat Jan 18 21:33:03 2014
New Revision: 1559423

URL: http://svn.apache.org/r1559423
Log:
Include the compiled classes on path for GWT addon to ensure the GWT compiler can load annotations.

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/addon/buildr/gwt.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1559423&r1=1559422&r2=1559423&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Sat Jan 18 21:33:03 2014
@@ -1,4 +1,6 @@
 1.4.16 (Pending)
+* Fixed:  Include the compiled classes on path for GWT addon to
+          ensure the GWT compiler can load annotations.
 * Change: Derive the GWT version from build settings if not
           explicitly specified by GWT addon.
 * Change: Support prefixing the version generated by the

Modified: buildr/trunk/addon/buildr/gwt.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/gwt.rb?rev=1559423&r1=1559422&r2=1559423&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/gwt.rb (original)
+++ buildr/trunk/addon/buildr/gwt.rb Sat Jan 18 21:33:03 2014
@@ -102,7 +102,7 @@ module Buildr
       def gwt(module_names, options = {})
         output_key = options[:output_key] || project.id
         output_dir = project._(:target, :generated, :gwt, output_key)
-        artifacts = (project.compile.sources + project.resources.sources).collect do |a|
+        artifacts = ([project.compile.target] + project.compile.sources + project.resources.sources).collect do |a|
           a.is_a?(String) ? file(a) : a
         end
         dependencies = options[:dependencies] ? artifacts(options[:dependencies]) : (project.compile.dependencies + [project.compile.target]).collect do |dep|