diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml index ab6fa1a..7d68c8d 100644 --- a/META-INF/plugin.xml +++ b/META-INF/plugin.xml @@ -1,39 +1,38 @@ - pl.cmil.wuff.plugin - Wuff IntelliJ Plugin - 0.1.0 - Michal Ćmil + pl.cmil.wuff.plugin + Wuff IntelliJ Plugin + 0.1.0 + Michal Ćmil - - - + - - + + + + + - - - + - + + + - - - + + + - - - - - - - + + + \ No newline at end of file diff --git a/src/pl/cmil/wuff/plugin/EquinoxJavaCommandLineState.java b/src/pl/cmil/wuff/plugin/EquinoxJavaCommandLineState.java index 836169f..cb36d3a 100644 --- a/src/pl/cmil/wuff/plugin/EquinoxJavaCommandLineState.java +++ b/src/pl/cmil/wuff/plugin/EquinoxJavaCommandLineState.java @@ -13,6 +13,8 @@ import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.vfs.VirtualFile; import org.apache.tools.ant.taskdefs.Jar; +import org.apache.tools.ant.taskdefs.Zip; +import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; import org.jetbrains.annotations.NotNull; @@ -96,6 +98,7 @@ private void rebuildModuleJar(Module module) throws ExecutionException { if (isProjectPrebuiltByGradle(manifestFile)) { Jar moduleJar = new Jar(); + moduleJar.setDuplicate((Zip.Duplicate) Zip.Duplicate.getInstance(Zip.Duplicate.class, "preserve")); moduleJar.setProject(new org.apache.tools.ant.Project()); moduleJar.setManifest(manifestFile); @@ -118,9 +121,9 @@ private void rebuildModuleJar(Module module) throws ExecutionException { } private void addDirectoryToJar(Jar moduleJar, File dir) { - FileSet classSet = new FileSet(); - classSet.setDir(dir); - moduleJar.addFileset(classSet); + FileSet fileSet = new FileSet(); + fileSet.setDir(dir); + moduleJar.addFileset(fileSet); } private boolean isProjectPrebuiltByGradle(File manifestFile) {