Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll
2018-02-26 18:03:32 +01:00
25 changed files with 82 additions and 45 deletions

View File

@@ -27,6 +27,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.jar.Manifest;
import groovy.lang.Grab;
@@ -127,9 +128,10 @@ abstract class ArchiveCommand extends OptionParsingCommand {
+ this.type + " and at least one source file must be specified");
File output = new File((String) nonOptionArguments.remove(0));
Assert.isTrue(output.getName().toLowerCase().endsWith("." + this.type),
"The output '" + output + "' is not a " + this.type.toUpperCase()
+ " file.");
Assert.isTrue(
output.getName().toLowerCase(Locale.ENGLISH).endsWith("." + this.type),
"The output '" + output + "' is not a " + this.type.toUpperCase(
Locale.ENGLISH) + " file.");
deleteIfExists(output);
GroovyCompiler compiler = createCompiler(options);