diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
index e6153b2..3adb287 100644
--- a/META-INF/plugin.xml
+++ b/META-INF/plugin.xml
@@ -18,9 +18,15 @@
Project home: https://github.com/ronniekk/intelliguard
]]>
- 0.10
+ 0.11
Ronnie Kolehmainen
0.11
+ Build for IDEA 13
+ Minimal tested version: 12.0.4
+ Fixed icon issue
+ Migrate from deprecated intellij openapi
+
diff --git a/intelliguard.iml b/intelliguard.iml
index 8213139..f0ce11f 100644
--- a/intelliguard.iml
+++ b/intelliguard.iml
@@ -7,8 +7,9 @@
-
+
+
diff --git a/src/com/github/intelliguard/generator/ProGuardGenerator.java b/src/com/github/intelliguard/generator/ProGuardGenerator.java
index 13f0f89..5defc83 100644
--- a/src/com/github/intelliguard/generator/ProGuardGenerator.java
+++ b/src/com/github/intelliguard/generator/ProGuardGenerator.java
@@ -19,8 +19,8 @@
import com.github.intelliguard.facet.GuardFacet;
import com.github.intelliguard.facet.GuardFacetConfiguration;
import com.github.intelliguard.model.Keeper;
+import com.intellij.openapi.roots.OrderEnumerator;
import com.intellij.util.PathsList;
-import com.intellij.openapi.roots.ProjectRootsTraversing;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VfsUtil;
@@ -48,7 +48,7 @@ public static String generatePro(@NotNull GuardFacet facet)
sb.append(MessageFormat.format(IN_JARS, escape(inFile)));
sb.append(MessageFormat.format(OUT_JARS, escape(outFile)));
- final PathsList dependenciesList = ProjectRootsTraversing.collectRoots(facet.getModule(), ProjectRootsTraversing.LIBRARIES_AND_JDK);
+ final PathsList dependenciesList = OrderEnumerator.orderEntries(facet.getModule()).withoutDepModules().withoutModuleSourceEntries().getPathsList();
final List externalDependencies = dependenciesList.getVirtualFiles();
for (VirtualFile dependencyJar : externalDependencies)
{
diff --git a/src/com/github/intelliguard/generator/YGuardGenerator.java b/src/com/github/intelliguard/generator/YGuardGenerator.java
index 16913ad..0b85886 100644
--- a/src/com/github/intelliguard/generator/YGuardGenerator.java
+++ b/src/com/github/intelliguard/generator/YGuardGenerator.java
@@ -19,9 +19,9 @@
import com.github.intelliguard.facet.GuardFacet;
import com.github.intelliguard.facet.GuardFacetConfiguration;
import com.github.intelliguard.model.Keeper;
+import com.intellij.openapi.roots.OrderEnumerator;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.roots.ProjectRootsTraversing;
import com.intellij.util.PathsList;
import java.text.MessageFormat;
@@ -57,7 +57,7 @@ public static String generateBuildXml(@NotNull GuardFacet facet)
sb.append(OPEN_YGUARD);
sb.append(MessageFormat.format(IN_OUT_PAIR, inFile, outFile));
- final PathsList dependenciesList = ProjectRootsTraversing.collectRoots(facet.getModule(), ProjectRootsTraversing.LIBRARIES_AND_JDK);
+ final PathsList dependenciesList = OrderEnumerator.orderEntries(facet.getModule()).withoutDepModules().withoutModuleSourceEntries().getPathsList();
final List externalDependencies = dependenciesList.getVirtualFiles();
if (!externalDependencies.isEmpty())
{
diff --git a/src/com/github/intelliguard/runner/JarTask.java b/src/com/github/intelliguard/runner/JarTask.java
index d6236fd..a779992 100644
--- a/src/com/github/intelliguard/runner/JarTask.java
+++ b/src/com/github/intelliguard/runner/JarTask.java
@@ -18,7 +18,7 @@
import com.intellij.openapi.module.Module;
import com.intellij.openapi.compiler.make.ManifestBuilder;
-import com.intellij.openapi.roots.ProjectRootsTraversing;
+import com.intellij.openapi.roots.OrderEnumerator;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.PathsList;
import com.github.intelliguard.model.JarConfig;
@@ -169,7 +169,8 @@ private Manifest createManifest(@Nullable Manifest manifest, @NotNull JarConfig
String libsPrefix = jarConfig.getLinkLibraries();
if (libsPrefix != null)
{
- PathsList dependenciesList = ProjectRootsTraversing.collectRoots(module, ProjectRootsTraversing.PROJECT_LIBRARIES);
+ PathsList dependenciesList = OrderEnumerator.orderEntries(module).withoutSdk().withoutLibraries().withoutDepModules().getSourcePathsList();
+// ProjectRootsTraversing.collectRoots(module, ProjectRootsTraversing.PROJECT_LIBRARIES);
List virtualFileList = dependenciesList.getVirtualFiles();
if (!virtualFileList.isEmpty())
{
diff --git a/src/com/github/intelliguard/ui/JarOptionsForm.java b/src/com/github/intelliguard/ui/JarOptionsForm.java
index 6718918..b9b3b3e 100644
--- a/src/com/github/intelliguard/ui/JarOptionsForm.java
+++ b/src/com/github/intelliguard/ui/JarOptionsForm.java
@@ -55,7 +55,7 @@ public class JarOptionsForm
private TextFieldWithBrowseButton obfuscatedJarPath;
private TextFieldWithBrowseButton mainClass;
private static final Icon FOLDER_ICON = IconLoader.getIcon("/nodes/folder.png");
- private static final Icon MODULE_ICON = IconLoader.getIcon("/nodes/ModuleClosed.png");
+ private static final Icon MODULE_ICON = IconLoader.getIcon("/nodes/moduleGroup.png");
private static final Icon JAR_ICON = IconLoader.getIcon("/fileTypes/archive.png");
public JarOptionsForm(@NotNull GuardFacet guardFacet)