upgrade closure compiler
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/bdea53ea Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/bdea53ea Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/bdea53ea Branch: refs/heads/master Commit: bdea53ea9fe0eb6cc552e06613f4a9c2afb9ad41 Parents: e547c9c Author: Jochen Kemnade <[email protected]> Authored: Tue Apr 19 14:50:28 2016 +0200 Committer: Jochen Kemnade <[email protected]> Committed: Tue Apr 19 14:50:28 2016 +0200 ---------------------------------------------------------------------- tapestry-webresources/build.gradle | 2 +- .../internal/webresources/GoogleClosureMinimizer.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/bdea53ea/tapestry-webresources/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-webresources/build.gradle b/tapestry-webresources/build.gradle index fa34969..052d6d1 100644 --- a/tapestry-webresources/build.gradle +++ b/tapestry-webresources/build.gradle @@ -3,7 +3,7 @@ description = "Integration with WRO4J to perform runtime CoffeeScript compilatio dependencies { compile project(":tapestry-core") compile "com.github.sommeri:less4j:1.12.0" - compile "com.google.javascript:closure-compiler:v20131014" + compile "com.google.javascript:closure-compiler:v20160315" compile "org.mozilla:rhino:1.7.7.1" testCompile project(":tapestry-runner") http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/bdea53ea/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java index e3102ac..ee318aa 100644 --- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java +++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java @@ -28,6 +28,8 @@ import org.slf4j.Logger; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; import java.util.logging.Level; @@ -39,7 +41,7 @@ import java.util.logging.Level; public class GoogleClosureMinimizer extends AbstractMinimizer { - private final static String OUTPUT_CHARSET = "utf-8"; + private final static Charset OUTPUT_CHARSET = StandardCharsets.UTF_8; private final List<SourceFile> EXTERNS = Collections.emptyList(); @@ -83,7 +85,7 @@ public class GoogleClosureMinimizer extends AbstractMinimizer compiler.disableThreads(); - SourceFile input = SourceFile.fromInputStream(resource.toString(), resource.openStream()); + SourceFile input = SourceFile.fromInputStream(resource.toString(), resource.openStream(), StandardCharsets.UTF_8); List<SourceFile> inputs = Collections.singletonList(input);
