Removed local copy of ModuleDescriptorReader by switching over to t…

…he one available in `ceylon-common`. Adjusted the build to include that copy into the ant JAR.
ceylon · Aug 20, 2015 · 43ed207 · 43ed207
1 parent 18c317d
commit 43ed207
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 154 deletions.
diff --git a/build.xml b/build.xml
@@ -187,6 +187,7 @@
             <include name="com/redhat/ceylon/launcher/**" />
             <include name="com/redhat/ceylon/common/*" />
             <include name="com/redhat/ceylon/common/config/*" />
+            <include name="com/redhat/ceylon/common/tools/ModuleWildcardsHelper.java" />
         </javac>
         <copy todir="${build.classes}">
             <fileset dir="${ceylonc.src}">

diff --git a/src/com/redhat/ceylon/ant/CeylonModuleDescriptorTask.java b/src/com/redhat/ceylon/ant/CeylonModuleDescriptorTask.java
@@ -25,8 +25,9 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 
-import com.redhat.ceylon.ant.ModuleDescriptorReader.NoSuchModuleException;
 import com.redhat.ceylon.common.Constants;
+import com.redhat.ceylon.common.ModuleDescriptorReader;
+import com.redhat.ceylon.common.ModuleDescriptorReader.NoSuchModuleException;
 import com.redhat.ceylon.launcher.CeylonClassLoader;
 import com.redhat.ceylon.launcher.ClassLoaderSetupException;
 

diff --git a/src/com/redhat/ceylon/ant/LazyHelper.java b/src/com/redhat/ceylon/ant/LazyHelper.java
@@ -30,8 +30,9 @@
 
 import org.apache.tools.ant.Project;
 
-import com.redhat.ceylon.ant.ModuleDescriptorReader.NoSuchModuleException;
 import com.redhat.ceylon.common.Constants;
+import com.redhat.ceylon.common.ModuleDescriptorReader;
+import com.redhat.ceylon.common.ModuleDescriptorReader.NoSuchModuleException;
 import com.redhat.ceylon.launcher.ClassLoaderSetupException;
 
 /**

diff --git a/src/com/redhat/ceylon/ant/ModuleDescriptorReader.java b/src/com/redhat/ceylon/ant/ModuleDescriptorReader.java
diff --git a/src/com/redhat/ceylon/ant/SourceModules.java b/src/com/redhat/ceylon/ant/SourceModules.java
@@ -31,8 +31,9 @@
 import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.types.FileSet;
 
-import com.redhat.ceylon.ant.ModuleDescriptorReader.NoSuchModuleException;
 import com.redhat.ceylon.common.Constants;
+import com.redhat.ceylon.common.ModuleDescriptorReader;
+import com.redhat.ceylon.common.ModuleDescriptorReader.NoSuchModuleException;
 import com.redhat.ceylon.launcher.CeylonClassLoader;
 import com.redhat.ceylon.launcher.ClassLoaderSetupException;