Skip to content
This repository was archived by the owner on Feb 28, 2019. It is now read-only.

Commit d096ad7

Browse files
committed
Fix bug that resulted in inclusion in the package of the gwt compile output.
1 parent 23f07a6 commit d096ad7

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
### Unreleased
44

5+
* Fix bug that resulted in inclusion in the package of the gwt compile output.
6+
57
### [v1.17](https://github.com/react4j/react4j-widget/tree/v1.17) (2018-05-20)
68
[Full Changelog](https://github.com/react4j/react4j-widget/compare/v1.16...v1.17)
79

tasks/gwt.rake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ CONTENT
4848
dependencies += [dir]
4949
end
5050

51+
# Duplicate the assets as the following gwt task will add compile output to asset path
52+
# which we typically do NOT want to include in jar
53+
assets = project.assets.paths.dup
5154
if ENV['GWT'].nil? || ENV['GWT'] == project.name
5255
modules = modules_complete ? gwt_modules : gwt_modules.collect {|gwt_module| "#{gwt_module}Test"}
5356
modules.each do |m|
@@ -63,7 +66,7 @@ CONTENT
6366
j.include("#{dep}/*")
6467
end
6568
j.include(project._(:generated, 'processors/main/java/react4j')) if project.enable_annotation_processor?
66-
project.assets.paths.each do |path|
69+
assets.each do |path|
6770
j.include("#{path}/*")
6871
end
6972
j.include("#{project._(:source, :main, :java)}/*")

0 commit comments

Comments
 (0)