# HG changeset patch # User Jaroslav Tulach # Date 1420832795 -3600 # Node ID 293838e7220148fc6e732bad875d93d88bf18044 # Parent d2a5a7a0e167890623c7c2cc22fd901c982fbca7 Always write down the JavaScript file in UTF-8 encoding diff -r d2a5a7a0e167 -r 293838e72201 rt/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/AheadOfTime.java --- a/rt/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/AheadOfTime.java Wed Jan 07 14:17:22 2015 +0100 +++ b/rt/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/AheadOfTime.java Fri Jan 09 20:46:35 2015 +0100 @@ -19,9 +19,11 @@ package org.apidesign.bck2brwsr.mojo; import java.io.File; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; @@ -135,7 +137,7 @@ c = c.addExported(e.replace('.', '/')); } } - FileWriter w = new FileWriter(mainJavaScript); + Writer w = new OutputStreamWriter(new FileOutputStream(mainJavaScript), "UTF-8"); c. obfuscation(obfuscation). generate(w); @@ -146,7 +148,7 @@ } try { - FileWriter w = new FileWriter(vm); + Writer w = new OutputStreamWriter(new FileOutputStream(vm), "UTF-8"); Bck2Brwsr.newCompiler(). obfuscation(obfuscation). standalone(false). @@ -198,7 +200,7 @@ throw new MojoExecutionException("Not generating " + js + " and no precompiled version found!"); } getLog().info("Generating " + js); - FileWriter w = new FileWriter(js); + Writer w = new OutputStreamWriter(new FileOutputStream(js), "UTF-8"); Bck2Brwsr c = Bck2BrwsrJars.configureFrom(null, a.getFile(), loader); c. obfuscation(obfuscation). diff -r d2a5a7a0e167 -r 293838e72201 rt/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/Java2JavaScript.java --- a/rt/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/Java2JavaScript.java Wed Jan 07 14:17:22 2015 +0100 +++ b/rt/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/Java2JavaScript.java Fri Jan 09 20:46:35 2015 +0100 @@ -20,8 +20,10 @@ import org.apache.maven.plugin.AbstractMojo; import java.io.File; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; @@ -107,7 +109,7 @@ try { URLClassLoader url = buildClassLoader(classes, prj.getArtifacts()); - FileWriter w = new FileWriter(javascript); + Writer w = new OutputStreamWriter(new FileOutputStream(javascript), "UTF-8"); Bck2Brwsr c = Bck2Brwsr.newCompiler(). obfuscation(obfuscation). resources(url, ignoreBootClassPath). diff -r d2a5a7a0e167 -r 293838e72201 rt/vm/src/main/java/org/apidesign/vm4brwsr/Main.java --- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/Main.java Wed Jan 07 14:17:22 2015 +0100 +++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/Main.java Fri Jan 09 20:46:35 2015 +0100 @@ -19,8 +19,9 @@ import java.io.BufferedWriter; import java.io.File; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; import java.io.Writer; import java.net.URI; import java.net.URISyntaxException; @@ -104,7 +105,7 @@ System.exit(0); } - try (Writer w = new BufferedWriter(new FileWriter(gt))) { + try (Writer w = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(gt), "UTF-8"))) { Bck2Brwsr c = Bck2Brwsr.newCompiler(). obfuscation(obfLevel). addRootClasses(classes.toArray()). diff -r d2a5a7a0e167 -r 293838e72201 rt/vm/src/test/java/org/apidesign/vm4brwsr/TestVM.java --- a/rt/vm/src/test/java/org/apidesign/vm4brwsr/TestVM.java Wed Jan 07 14:17:22 2015 +0100 +++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/TestVM.java Fri Jan 09 20:46:35 2015 +0100 @@ -19,9 +19,11 @@ import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; import java.net.URL; import java.util.ArrayList; import java.util.Arrays; @@ -258,7 +260,7 @@ static StringBuilder dumpJS(CharSequence sb) throws IOException { File f = File.createTempFile("execution", ".js"); - FileWriter w = new FileWriter(f); + Writer w = new OutputStreamWriter(new FileOutputStream(f), "UTF-8"); w.append(sb); w.close(); return new StringBuilder(f.getPath()); diff -r d2a5a7a0e167 -r 293838e72201 rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/Bck2BrwsrCase.java --- a/rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/Bck2BrwsrCase.java Wed Jan 07 14:17:22 2015 +0100 +++ b/rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/Bck2BrwsrCase.java Fri Jan 09 20:46:35 2015 +0100 @@ -19,9 +19,11 @@ import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -130,7 +132,7 @@ } static void dumpJS(StringBuilder sb, Bck2BrwsrCase c) throws IOException { File f = File.createTempFile(c.m.getName(), ".js"); - try (final FileWriter w = new FileWriter(f)) { + try (final Writer w = new OutputStreamWriter(new FileOutputStream(f), "UTF-8")) { w.append(c.l.toString()); } sb.append("Path: ").append(f.getPath());