Skip to content

Commit 1e7ce6e

Browse files
szeigerszeiger
authored
Merge pull request scala#4851 from soc/SI-9560-scaladoc-json-dep
SI-9560 Remove dependency on parser-combinators/json
2 parents b681232 + dc326cd commit 1e7ce6e

File tree

16 files changed

+116
-93
lines changed

16 files changed

+116
-93
lines changed

‎build.sbt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
import VersionUtil._
5757

5858
// Scala dependencies:
59-
val scalaParserCombinatorsDep = scalaDep("org.scala-lang.modules", "scala-parser-combinators")
6059
val scalaSwingDep = scalaDep("org.scala-lang.modules", "scala-swing")
6160
val scalaXmlDep = scalaDep("org.scala-lang.modules", "scala-xml")
61+
val scalaParserCombinatorsDep = scalaDep("org.scala-lang.modules", "scala-parser-combinators")
6262
val partestDep = scalaDep("org.scala-lang.modules", "scala-partest", versionProp = "partest")
6363

6464
// Non-Scala dependencies:
@@ -398,7 +398,7 @@ lazy val compiler = configureAsSubproject(project)
398398
description := "Scala Compiler",
399399
libraryDependencies ++= Seq(antDep, asmDep),
400400
// These are only needed for the POM:
401-
libraryDependencies ++= Seq(scalaXmlDep, scalaParserCombinatorsDep, jlineDep % "optional"),
401+
libraryDependencies ++= Seq(scalaXmlDep, jlineDep % "optional"),
402402
// this a way to make sure that classes from interactive and scaladoc projects
403403
// end up in compiler jar (that's what Ant build does)
404404
// we need to use LocalProject references (with strings) to deal with mutual recursion
@@ -427,7 +427,6 @@ lazy val compiler = configureAsSubproject(project)
427427
Osgi.headers ++= Seq(
428428
"Import-Package" -> ("jline.*;resolution:=optional," +
429429
"org.apache.tools.ant.*;resolution:=optional," +
430-
"scala.util.parsing.*;version=\"${range;[====,====];"+versionNumber("scala-parser-combinators")+"}\";resolution:=optional," +
431430
"scala.xml.*;version=\"${range;[====,====];"+versionNumber("scala-xml")+"}\";resolution:=optional," +
432431
"scala.*;version=\"${range;[==,=+);${ver}}\"," +
433432
"*"),
@@ -521,7 +520,7 @@ lazy val scaladoc = configureAsSubproject(project)
521520
.settings(
522521
name := "scala-compiler-doc",
523522
description := "Scala Documentation Generator",
524-
libraryDependencies ++= Seq(scalaXmlDep, scalaParserCombinatorsDep, partestDep),
523+
libraryDependencies ++= Seq(scalaXmlDep, partestDep),
525524
includeFilter in unmanagedResources in Compile := "*.html" | "*.css" | "*.gif" | "*.png" | "*.js" | "*.txt" | "*.svg" | "*.eot" | "*.woff" | "*.ttf"
526525
)
527526
.dependsOn(compiler)

‎build.xml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ TODO:
367367

368368
<propertyForCrossedArtifact name="scala-parser-combinators" jar="org.scala-lang.modules:scala-parser-combinators"/>
369369
<propertyForCrossedArtifact name="scala-xml" jar="org.scala-lang.modules:scala-xml"/>
370-
<propertyForCrossedArtifact name="scala-swing" jar="org.scala-lang.modules:scala-swing"/>
370+
<propertyForCrossedArtifact name="scala-swing" jar="org.scala-lang.modules:scala-swing"/>
371371

372372
<!-- BND support -->
373373
<typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" />
@@ -791,7 +791,6 @@ TODO:
791791
<path id="pack.bin.tool.path">
792792
<pathelement location="${library.jar}"/>
793793
<pathelement location="${xml.jar}"/>
794-
<pathelement location="${parser-combinators.jar}"/>
795794
<pathelement location="${reflect.jar}"/>
796795
<pathelement location="${compiler.jar}"/>
797796
<!-- TODO modularize compiler: <pathelement location="${scaladoc.jar}"/> -->
@@ -804,7 +803,9 @@ TODO:
804803
<fileset dir="${build-quick.dir}/classes/library"/>
805804
</path>
806805

807-
<path id="pack.repl-jline.files"> <fileset dir="${build-quick.dir}/classes/repl-jline"/> </path>
806+
<path id="pack.repl-jline.files">
807+
<fileset dir="${build-quick.dir}/classes/repl-jline"/>
808+
</path>
808809

809810
<path id="pack.compiler.files">
810811
<fileset dir="${build-quick.dir}/classes/compiler"/>
@@ -913,16 +914,14 @@ TODO:
913914
<!-- partest's dependencies, which marks most of its dependencies as provided,
914915
(but not scala-library, so we filter that one out...)
915916
so we provide them: scala-[library/reflect/compiler], scalap built here,
916-
scala-xml, scala-parser-combinators via external-modules-nocore,
917-
as part of `partest.classpath` -->
917+
scala-xml via external-modules-nocore, as part of `partest.classpath` -->
918918
<restrict>
919919
<path refid="partest.classpath"/>
920920
<rsel:not><rsel:or>
921921
<rsel:name name="scala-library*.jar"/>
922922
</rsel:or></rsel:not>
923923
</restrict>
924924
<pathelement location="${scala-xml}"/>
925-
<pathelement location="${scala-parser-combinators}"/>
926925
<!-- <pathelement location="${scala-swing}"/> -->
927926

928927
<!-- partest classes specific to the core compiler build -->
@@ -1278,8 +1277,6 @@ TODO:
12781277
<include name="${interactive.jar}"/>
12791278
<include name="${scaladoc.jar}"/>
12801279
-->
1281-
1282-
<file name="${parser-combinators.jar}"/>
12831280
<file name="${xml.jar}"/>
12841281
<file name="${swing.jar}"/>
12851282
</filelist>

‎dbuild-meta.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@
4848
"extension" : "jar",
4949
"name" : "scala-xml",
5050
"organization" : "org.scala-lang.modules"
51-
},
52-
{
53-
"extension" : "jar",
54-
"name" : "scala-parser-combinators",
55-
"organization" : "org.scala-lang.modules"
5651
}
5752
],
5853
"name" : "scala-compiler",

‎src/build/bnd/scala-compiler.bnd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ Bundle-Version: ${ver}
55
Export-Package: *;version=${ver}
66
Import-Package: jline.*;resolution:=optional, \
77
org.apache.tools.ant.*;resolution:=optional, \
8-
scala.util.parsing.*;version="${range;[====,====];@PARSER_COMBINATORS_VERSION@}";resolution:=optional, \
98
scala.xml.*;version="${range;[====,====];@XML_VERSION@}";resolution:=optional, \
109
scala.*;version="${range;[==,=+);${ver}}", \
1110
*

‎src/build/dbuild-meta-json-gen.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ val meta =
2323
Project("scala-compiler", "org.scala-lang",
2424
Seq(ProjectRef("scala-compiler", "org.scala-lang")),
2525
Seq(ProjectRef("scala-reflect", "org.scala-lang"),
26-
ProjectRef("scala-xml", "org.scala-lang.modules"),
27-
ProjectRef("scala-parser-combinators", "org.scala-lang.modules")
26+
ProjectRef("scala-xml", "org.scala-lang.modules")
2827
)),
2928

3029
// Project("scala-repl", "org.scala-lang",
@@ -37,7 +36,7 @@ val meta =
3736

3837
// Project("scaladoc", "org.scala-lang",
3938
// Seq(ProjectRef("scaladoc", "org.scala-lang")),
40-
// Seq(ProjectRef("scala-compiler", "org.scala-lang"),ProjectRef("scala-partest", "org.scala-lang"), ProjectRef("scala-xml", "org.scala-lang"), ProjectRef("scala-parser-combinators", "org.scala-lang"))),
39+
// Seq(ProjectRef("scala-compiler", "org.scala-lang"),ProjectRef("scala-partest", "org.scala-lang"), ProjectRef("scala-xml", "org.scala-lang"))),
4140

4241
Project("scalap", "org.scala-lang",
4342
Seq(ProjectRef("scalap", "org.scala-lang")),

‎src/build/maven/scala-compiler-doc-pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@
3939
<artifactId>scala-xml_@SCALA_BINARY_VERSION@</artifactId>
4040
<version>@XML_VERSION@</version>
4141
</dependency>
42-
<dependency>
43-
<groupId>org.scala-lang.modules</groupId>
44-
<artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId>
45-
<version>@PARSER_COMBINATORS_VERSION@</version>
46-
</dependency>
4742
</dependencies>
4843
<developers>
4944
<developer>

‎src/build/maven/scala-compiler-pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@
4545
<artifactId>scala-xml_@SCALA_BINARY_VERSION@</artifactId>
4646
<version>@XML_VERSION@</version>
4747
</dependency>
48-
<dependency> <!-- for scala-compiler-doc -->
49-
<groupId>org.scala-lang.modules</groupId>
50-
<artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId>
51-
<version>@PARSER_COMBINATORS_VERSION@</version>
52-
</dependency>
5348
<dependency> <!-- for scala-compiler-repl; once it moves there, make it required -->
5449
<groupId>jline</groupId>
5550
<artifactId>jline</artifactId>

‎src/eclipse/interactive/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="interactive"/>
4-
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.0.4-scala-3.jar"/>
4+
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.1.0-scala-1.jar"/>
55
<classpathentry combineaccessrules="false" kind="src" path="/scaladoc"/>
66
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
77
<classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/>

‎src/eclipse/partest/.classpath

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="partest-extras"/>
4-
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.0.4-scala-3.jar"/>
4+
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.1.0-scala-1.jar"/>
55
<classpathentry combineaccessrules="false" kind="src" path="/repl"/>
66
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/partest/diffutils-1.3.0.jar"/>
77
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/partest/test-interface-1.0.jar"/>
88
<classpathentry kind="var" path="SCALA_BASEDIR/lib/ant/ant.jar"/>
99
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
1010
<classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/>
1111
<classpathentry combineaccessrules="false" kind="src" path="/scala-library"/>
12-
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/partest/scala-partest_2.12.0-M4-1.0.14.jar"/>
12+
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/partest/scala-partest_2.12.0-M5-1.0.17.jar"/>
1313
<classpathentry kind="output" path="build-quick-partest-extras"/>
1414
</classpath>

‎src/eclipse/repl/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="repl"/>
4-
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.0.4-scala-3.jar"/>
4+
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.1.0-scala-1.jar"/>
55
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/repl/jline-2.14.1.jar"/>
66
<classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/>
77
<classpathentry combineaccessrules="false" kind="src" path="/scala-library"/>

‎src/eclipse/scala-compiler/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/reflect"/>
55
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/scala-library"/>
66
<classpathentry kind="var" path="SCALA_BASEDIR/lib/ant/ant.jar"/>
7-
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.0.4-scala-3.jar"/>
7+
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.1.0-scala-1.jar"/>
88
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
99
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
1010
<classpathentry kind="output" path="build-quick-compiler"/>

‎src/eclipse/scaladoc/.classpath

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<classpath>
33
<classpathentry kind="src" path="scaladoc"/>
44
<classpathentry kind="var" path="SCALA_BASEDIR/lib/ant/ant.jar"/>
5-
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.0.4-scala-3.jar"/>
5+
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.1.0-scala-1.jar"/>
66
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
77
<classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/>
88
<classpathentry combineaccessrules="false" kind="src" path="/scala-library"/>
9-
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-xml_2.12.0-M4-1.0.5.jar"/>
10-
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-parser-combinators_2.12.0-M4-1.0.4.jar"/>
11-
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/partest/scala-partest_2.12.0-M4-1.0.14.jar"/>
9+
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-xml_2.12.0-M5-1.0.5.jar"/>
10+
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/partest/scala-partest_2.12.0-M5-1.0.17.jar"/>
1211
<classpathentry kind="output" path="build-quick-scaladoc"/>
1312
</classpath>

‎src/eclipse/test-junit/.classpath

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="test-junit"/>
4-
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.0.4-scala-3.jar"/>
4+
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.1.0-scala-1.jar"/>
55
<classpathentry kind="var" path="SCALA_BASEDIR/lib/ant/ant.jar"/>
66
<classpathentry combineaccessrules="false" kind="src" path="/reflect"/>
77
<classpathentry combineaccessrules="false" kind="src" path="/scala-library"/>
@@ -10,7 +10,7 @@
1010
<classpathentry combineaccessrules="false" kind="src" path="/repl"/>
1111
<classpathentry combineaccessrules="false" kind="src" path="/partest-extras"/>
1212
<classpathentry combineaccessrules="false" kind="src" path="/scaladoc"/>
13-
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-xml_2.12.0-M4-1.0.5.jar"/>
13+
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-xml_2.12.0-M5-1.0.5.jar"/>
1414
<classpathentry kind="var" path="SCALA_BASEDIR/build/deps/junit/jol-core-0.5.jar"/>
1515
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
1616
<classpathentry kind="output" path="build-test-junit"/>

0 commit comments

Comments
 (0)