This is an automated email from the ASF dual-hosted git repository. benw pushed a commit to branch javax in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit 19732165c42a7df9a111c6ad13c2b01258bac366 Author: Ben Weidig <[email protected]> AuthorDate: Sat May 11 12:48:56 2024 +0200 TAP5-2777: upgrade google closure compiler to v20220502 --- tapestry-webresources/build.gradle | 2 +- .../apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tapestry-webresources/build.gradle b/tapestry-webresources/build.gradle index f573f2dc2..3e3226995 100644 --- a/tapestry-webresources/build.gradle +++ b/tapestry-webresources/build.gradle @@ -9,7 +9,7 @@ description = "Integration with WRO4J to perform runtime CoffeeScript compilatio dependencies { api project(":tapestry-core") testImplementation project(":tapestry-test") - api "com.google.javascript:closure-compiler-unshaded:v20200504" + api "com.google.javascript:closure-compiler-unshaded:v20220502" implementation "com.github.sommeri:less4j:1.12.0" compileOnly "com.google.auto.value:auto-value-annotations:1.9" 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 c3b268bcd..1fee97dd0 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 @@ -93,7 +93,8 @@ public class GoogleClosureMinimizer extends AbstractMinimizer compiler.disableThreads(); - SourceFile input = SourceFile.fromInputStream(resource.toString(), resource.openStream(), StandardCharsets.UTF_8); + String source = IOUtils.toString(resource.openStream(), StandardCharsets.UTF_8); + SourceFile input = SourceFile.fromCode(resource.toString(), source); List<SourceFile> inputs = Collections.singletonList(input);
