From dc326cd8213ef15cb7647dddfc5144ae47b01b5e Mon Sep 17 00:00:00 2001
From: Simon Ochsenreither <simon@ochsenreither.de>
Date: Thu, 19 Nov 2015 19:32:19 +0100
Subject: SI-9560 Remove dependency on parser-combinators/json

Also update a few example IDE files for Eclipse and IntelliJ.

This drops the dependency by integrating the bare minimum functionality
to keep things working.
---
 build.xml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 6b2c9ade0d..7c6f525c1c 100644
--- a/build.xml
+++ b/build.xml
@@ -367,7 +367,7 @@ TODO:
 
       <propertyForCrossedArtifact name="scala-parser-combinators" jar="org.scala-lang.modules:scala-parser-combinators"/>
       <propertyForCrossedArtifact name="scala-xml"                jar="org.scala-lang.modules:scala-xml"/>
-      <propertyForCrossedArtifact name="scala-swing"                 jar="org.scala-lang.modules:scala-swing"/>
+      <propertyForCrossedArtifact name="scala-swing"              jar="org.scala-lang.modules:scala-swing"/>
 
       <!-- BND support -->
       <typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" />
@@ -791,7 +791,6 @@ TODO:
     <path id="pack.bin.tool.path">
       <pathelement location="${library.jar}"/>
       <pathelement location="${xml.jar}"/>
-      <pathelement location="${parser-combinators.jar}"/>
       <pathelement location="${reflect.jar}"/>
       <pathelement location="${compiler.jar}"/>
       <!-- TODO modularize compiler: <pathelement location="${scaladoc.jar}"/> -->
@@ -804,7 +803,9 @@ TODO:
       <fileset dir="${build-quick.dir}/classes/library"/>
     </path>
 
-    <path id="pack.repl-jline.files">    <fileset dir="${build-quick.dir}/classes/repl-jline"/> </path>
+    <path id="pack.repl-jline.files">
+      <fileset dir="${build-quick.dir}/classes/repl-jline"/>
+    </path>
 
     <path id="pack.compiler.files">
       <fileset dir="${build-quick.dir}/classes/compiler"/>
@@ -913,8 +914,7 @@ TODO:
       <!-- partest's dependencies, which marks most of its dependencies as provided,
            (but not scala-library, so we filter that one out...)
            so we provide them: scala-[library/reflect/compiler], scalap built here,
-           scala-xml, scala-parser-combinators via external-modules-nocore,
-           as part of `partest.classpath` -->
+           scala-xml via external-modules-nocore, as part of `partest.classpath` -->
       <restrict>
         <path refid="partest.classpath"/>
         <rsel:not><rsel:or>
@@ -922,7 +922,6 @@ TODO:
         </rsel:or></rsel:not>
       </restrict>
       <pathelement location="${scala-xml}"/>
-      <pathelement location="${scala-parser-combinators}"/>
       <!-- <pathelement location="${scala-swing}"/> -->
 
       <!-- partest classes specific to the core compiler build -->
@@ -1278,8 +1277,6 @@ TODO:
             <include name="${interactive.jar}"/>
             <include name="${scaladoc.jar}"/>
             -->
-
-          <file name="${parser-combinators.jar}"/>
           <file name="${xml.jar}"/>
           <file name="${swing.jar}"/>
         </filelist>
-- 
cgit v1.2.3