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/02/21 22:30:48 UTC
[1/6] buildr git commit: Whitespace
Repository: buildr
Updated Branches:
refs/heads/master 75e72a94f -> e4a98ae56
Whitespace
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/11053e76
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/11053e76
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/11053e76
Branch: refs/heads/master
Commit: 11053e764a2c40e4e3cc865dff56e91042cdcb25
Parents: 75e72a9
Author: Peter Donald <pe...@realityforge.org>
Authored: Wed Feb 22 09:25:07 2017 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Wed Feb 22 09:25:07 2017 +1100
----------------------------------------------------------------------
addon/buildr/gwt.rb | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/11053e76/addon/buildr/gwt.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb
index 4de3cc1..f584d36 100644
--- a/addon/buildr/gwt.rb
+++ b/addon/buildr/gwt.rb
@@ -15,7 +15,6 @@
module Buildr
module GWT
-
class << self
def version=(version)
[3/6] buildr git commit: Avoid bug in gwt 2.8.0 that does not
recognize OBFUSCATED style but that is the default so omit it if it matches
that value
Posted by do...@apache.org.
Avoid bug in gwt 2.8.0 that does not recognize OBFUSCATED style but that is the default so omit it if it matches that value
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/b362aade
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/b362aade
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/b362aade
Branch: refs/heads/master
Commit: b362aade8ca73382f4bbaf85d2551b2f3b0ed052
Parents: 66ec0fb
Author: Peter Donald <pe...@realityforge.org>
Authored: Wed Feb 22 09:26:27 2017 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Wed Feb 22 09:26:27 2017 +1100
----------------------------------------------------------------------
addon/buildr/gwt.rb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/b362aade/addon/buildr/gwt.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb
index dcf975c..7f44de2 100644
--- a/addon/buildr/gwt.rb
+++ b/addon/buildr/gwt.rb
@@ -54,8 +54,10 @@ module Buildr
args << log_level
end
args << '-strict'
- args << '-style'
- args << style
+ unless style == 'OBFUSCATED'
+ args << '-style'
+ args << style
+ end
args << '-localWorkers'
args << workers
args << '-war'
[4/6] buildr git commit: Add support for gwt 2.8.0 to gwt addon.
Posted by do...@apache.org.
Add support for gwt 2.8.0 to gwt addon.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/2db829fa
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/2db829fa
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/2db829fa
Branch: refs/heads/master
Commit: 2db829fabca8b78db6abc9087ccb02315b385233
Parents: b362aad
Author: Peter Donald <pe...@realityforge.org>
Authored: Wed Feb 22 09:27:25 2017 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Wed Feb 22 09:27:25 2017 +1100
----------------------------------------------------------------------
CHANGELOG | 1 +
addon/buildr/gwt.rb | 44 +++++++++++++++++++++++++++++++++++++++++---
2 files changed, 42 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/2db829fa/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index d8acda9..7285d46 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
1.5.1 (Pending)
+* Change: Add support for gwt 2.8.0 to gwt addon.
* Change: Remove orderedhash gem.
* Change: Update jruby-openssl to 0.9.17
* Change: Move hoe to the development dependencies
http://git-wip-us.apache.org/repos/asf/buildr/blob/2db829fa/addon/buildr/gwt.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb
index 7f44de2..9684add 100644
--- a/addon/buildr/gwt.rb
+++ b/addon/buildr/gwt.rb
@@ -22,7 +22,7 @@ module Buildr
end
def version
- @version || Buildr.settings.build['gwt'] || '2.7.0'
+ @version || Buildr.settings.build['gwt'] || '2.8.0'
end
# The specs for requirements
@@ -33,11 +33,49 @@ module Buildr
gwt_dev_jar = "com.google.gwt:gwt-dev:jar:#{v}"
if v <= '2.6.1'
[gwt_dev_jar] + validation_deps
- else
+ elsif v == '2.7.0'
[
gwt_dev_jar,
'org.ow2.asm:asm:jar:5.0.3'
] + validation_deps
+ elsif v == '2.8.0'
+ %w(
+ com.google.jsinterop:jsinterop-annotations:jar:1.0.1
+ com.google.jsinterop:jsinterop-annotations:jar:sources:1.0.1
+ org.w3c.css:sac:jar:1.3
+ com.google.gwt:gwt-dev:jar:2.8.0
+ com.google.gwt:gwt-user:jar:2.8.0
+ com.google.code.gson:gson:jar:2.6.2
+ org.ow2.asm:asm:jar:5.0.3
+ org.ow2.asm:asm-util:jar:5.0.3
+ org.ow2.asm:asm-tree:jar:5.0.3
+ org.ow2.asm:asm-commons:jar:5.0.3
+ colt:colt:jar:1.2.0
+ ant:ant:jar:1.6.5
+ commons-collections:commons-collections:jar:3.2.2
+ commons-io:commons-io:jar:2.4
+ com.ibm.icu:icu4j:jar:50.1.1
+ tapestry:tapestry:jar:4.0.2
+
+ javax.annotation:javax.annotation-api:jar:1.2
+ javax.servlet:javax.servlet-api:jar:3.1.0
+ org.eclipse.jetty:jetty-annotations:jar:9.2.14.v20151106
+ org.eclipse.jetty:jetty-continuation:jar:9.2.14.v20151106
+ org.eclipse.jetty:jetty-http:jar:9.2.14.v20151106
+ org.eclipse.jetty:jetty-io:jar:9.2.14.v20151106
+ org.eclipse.jetty:jetty-jndi:jar:9.2.14.v20151106
+ org.eclipse.jetty:jetty-plus:jar:9.2.14.v20151106
+ org.eclipse.jetty:jetty-security:jar:9.2.14.v20151106
+ org.eclipse.jetty:jetty-server:jar:9.2.14.v20151106
+ org.eclipse.jetty:jetty-servlet:jar:9.2.14.v20151106
+ org.eclipse.jetty:jetty-servlets:jar:9.2.14.v20151106
+ org.eclipse.jetty:jetty-util:jar:9.2.14.v20151106
+ org.eclipse.jetty:jetty-webapp:jar:9.2.14.v20151106
+ org.eclipse.jetty:jetty-xml:jar:9.2.14.v20151106
+ org.eclipse.jetty.toolchain:jetty-schemas:jar:3.1.M0
+ ) + validation_deps
+ else
+ raise "Unknown GWT version #{v}"
end
end
@@ -72,7 +110,7 @@ module Buildr
args << '-draftCompile'
end
- if options[:enable_closure_compiler].nil? || options[:enable_closure_compiler]
+ if options[:enable_closure_compiler] && options[:version] == '2.7.0'
args << '-XenableClosureCompiler'
end
[6/6] buildr git commit: Add css2gss task to gwt addon to support
conveting from deprecated css syntax to modern gss syntax.
Posted by do...@apache.org.
Add css2gss task to gwt addon to support conveting from deprecated css syntax to modern gss syntax.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/e4a98ae5
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/e4a98ae5
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/e4a98ae5
Branch: refs/heads/master
Commit: e4a98ae56ba113f1cc58bd9ba66d48860eac7761
Parents: 68d2eed
Author: Peter Donald <pe...@realityforge.org>
Authored: Wed Feb 22 09:30:42 2017 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Wed Feb 22 09:30:42 2017 +1100
----------------------------------------------------------------------
CHANGELOG | 1 +
addon/buildr/gwt.rb | 15 +++++++++++++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/e4a98ae5/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 5ba6c06..6badc42 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
1.5.1 (Pending)
+* Change: Add css2gss task to gwt addon to support conveting from deprecated css syntax to modern gss syntax.
* Change: Add support for gwt 2.8.0 to gwt addon.
* Change: Remove orderedhash gem.
* Change: Update jruby-openssl to 0.9.17
http://git-wip-us.apache.org/repos/asf/buildr/blob/e4a98ae5/addon/buildr/gwt.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb
index 9684add..fb3bc42 100644
--- a/addon/buildr/gwt.rb
+++ b/addon/buildr/gwt.rb
@@ -145,11 +145,26 @@ module Buildr
Java::Commands.java 'com.google.gwt.dev.codeserver.CodeServer', *(args + [{:classpath => cp, :properties => properties, :java_args => java_args, :pathing_jar => false}])
end
+
+ def gwt_css2gss(filenames, options = {})
+ cp = Buildr.artifacts(self.dependencies(options[:version])).each(&:invoke).map(&:to_s)
+ properties = options[:properties] ? options[:properties].dup : {}
+ java_args = options[:java_args] ? options[:java_args].dup : {}
+ Java::Commands.java 'com.google.gwt.resources.converter.Css2Gss', *([filenames] + [{ :classpath => cp, :properties => properties, :java_args => java_args, :pathing_jar => false }])
+ end
end
module ProjectExtension
include Extension
+ first_time do
+ desc 'Run C22 to GSS converter. Set css files via environment variable CSS_FILES'
+ task('css2gss') do
+ raise 'Please specify css files or directory via variable CSS_FILES' unless ENV['CSS_FILES']
+ Buildr::GWT.gwt_css2gss(ENV['CSS_FILES'].to_s.split(' '))
+ end
+ end
+
def gwt(module_names, options = {})
p = options[:target_project]
target_project = p.nil? ? project : p.is_a?(String) ? project(p) : p
[2/6] buildr git commit: Remove invalid trailing ,
Posted by do...@apache.org.
Remove invalid trailing ,
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/66ec0fb4
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/66ec0fb4
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/66ec0fb4
Branch: refs/heads/master
Commit: 66ec0fb48b33789236f16839bf8cbd2634d02deb
Parents: 11053e7
Author: Peter Donald <pe...@realityforge.org>
Authored: Wed Feb 22 09:25:28 2017 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Wed Feb 22 09:25:28 2017 +1100
----------------------------------------------------------------------
addon/buildr/gwt.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/66ec0fb4/addon/buildr/gwt.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb
index f584d36..dcf975c 100644
--- a/addon/buildr/gwt.rb
+++ b/addon/buildr/gwt.rb
@@ -44,7 +44,7 @@ module Buildr
def gwtc_main(modules, source_artifacts, output_dir, unit_cache_dir, options = {})
base_dependencies = self.dependencies(options[:version])
cp = Buildr.artifacts(base_dependencies).each(&:invoke).map(&:to_s) + Buildr.artifacts(source_artifacts).each(&:invoke).map(&:to_s)
- style = options[:style] || 'OBFUSCATED,' # 'PRETTY', 'DETAILED'
+ style = options[:style] || 'OBFUSCATED' # 'PRETTY', 'DETAILED'
log_level = options[:log_level] # ERROR, WARN, INFO, TRACE, DEBUG, SPAM, or ALL
workers = options[:workers] || 2
[5/6] buildr git commit: Spelling
Posted by do...@apache.org.
Spelling
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/68d2eedd
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/68d2eedd
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/68d2eedd
Branch: refs/heads/master
Commit: 68d2eedd960073c6edec3a1b7452dc9d01fe8b7f
Parents: 2db829f
Author: Peter Donald <pe...@realityforge.org>
Authored: Wed Feb 22 09:28:23 2017 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Wed Feb 22 09:28:23 2017 +1100
----------------------------------------------------------------------
CHANGELOG | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/68d2eedd/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 7285d46..5ba6c06 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -64,7 +64,7 @@
* Change: Update the custom_pom addon to generate poms with exclusions section that excludes
all transitive dependencies. This is required as buildr dependencies are not
transitive while Maven's dependencies are transitive by default.
-* Change: Remove the BND aqute maven repository, as it was decomissioned. Use Maven Central instead.
+* Change: Remove the BND aqute maven repository, as it was decommissioned. Use Maven Central instead.
1.4.25 (2016-04-18)
* Change: BUILDR-712 Update jruby-openssl dependency version or support a range of versions