Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c0eb517

Browse files
committed
remove unnecessary compilerOptionsExporter project
moved to project/GenerateDocsData.scala - https://github.com/scala/scala/blob/ce084abea830c317b1b734b977c5e770121450e7/project/GenerateDocsData.scala - 25ac337
1 parent ce084ab commit c0eb517

File tree

3 files changed

+1
-54
lines changed

3 files changed

+1
-54
lines changed

build.sbt

+1-19
Original file line numberDiff line numberDiff line change
@@ -395,23 +395,6 @@ lazy val reflect = configureAsSubproject(project)
395395
)
396396
.dependsOn(library)
397397

398-
lazy val compilerOptionsExporter = Project("compilerOptionsExporter", file(".") / "src" / "compilerOptionsExporter")
399-
.dependsOn(compiler, reflect, library)
400-
.settings(clearSourceAndResourceDirectories)
401-
.settings(commonSettings)
402-
.settings(disableDocs)
403-
.settings(skip in publish := true)
404-
.settings(
405-
libraryDependencies ++= Seq(
406-
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.7",
407-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.7",
408-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.7",
409-
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % "2.9.7"
410-
// TODO: implement without Scala dependency. Not available when STARR has a new binary verison.
411-
// "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.7"
412-
)
413-
)
414-
415398
lazy val compiler = configureAsSubproject(project)
416399
.settings(generatePropertiesFileSettings)
417400
.settings(generateBuildCharacterFileSettings)
@@ -972,7 +955,7 @@ lazy val root: Project = (project in file("."))
972955
},
973956
setIncOptions
974957
)
975-
.aggregate(library, reflect, compiler, compilerOptionsExporter, interactive, repl, replFrontend,
958+
.aggregate(library, reflect, compiler, interactive, repl, replFrontend,
976959
scaladoc, scalap, partest, junit, scalaDist).settings(
977960
sources in Compile := Seq.empty,
978961
onLoadMessage := """|*** Welcome to the sbt build definition for Scala! ***
@@ -1164,7 +1147,6 @@ intellij := {
11641147
moduleDeps(scaladoc).value,
11651148
moduleDeps(scalap).value,
11661149
moduleDeps(testP).value,
1167-
moduleDeps(compilerOptionsExporter).value
11681150
)
11691151
}
11701152

src/intellij/compilerOptionsExporter.iml.SAMPLE

-21
This file was deleted.

src/intellij/scala.ipr.SAMPLE

-14
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@
173173
<modules>
174174
<module filepath="$PROJECT_DIR$/benchmarks.iml" fileurl="file://$PROJECT_DIR$/benchmarks.iml"/>
175175
<module filepath="$PROJECT_DIR$/compiler.iml" fileurl="file://$PROJECT_DIR$/compiler.iml"/>
176-
<module filepath="$PROJECT_DIR$/compilerOptionsExporter.iml" fileurl="file://$PROJECT_DIR$/compilerOptionsExporter.iml"/>
177176
<module filepath="$PROJECT_DIR$/interactive.iml" fileurl="file://$PROJECT_DIR$/interactive.iml"/>
178177
<module filepath="$PROJECT_DIR$/junit.iml" fileurl="file://$PROJECT_DIR$/junit.iml"/>
179178
<module filepath="$PROJECT_DIR$/library.iml" fileurl="file://$PROJECT_DIR$/library.iml"/>
@@ -231,19 +230,6 @@
231230
<JAVADOC />
232231
<SOURCES />
233232
</library>
234-
<library name="compilerOptionsExporter-deps">
235-
<CLASSES>
236-
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles/scala-asm-7.0.0-scala-1.jar!/" />
237-
<root url="jar://$USER_HOME$/.ivy2/cache/jline/jline/jars/jline-2.14.6.jar!/" />
238-
<root url="jar://$USER_HOME$/.ivy2/cache/com.fasterxml.jackson.core/jackson-core/bundles/jackson-core-2.9.7.jar!/" />
239-
<root url="jar://$USER_HOME$/.ivy2/cache/com.fasterxml.jackson.core/jackson-annotations/bundles/jackson-annotations-2.9.7.jar!/" />
240-
<root url="jar://$USER_HOME$/.ivy2/cache/com.fasterxml.jackson.core/jackson-databind/bundles/jackson-databind-2.9.7.jar!/" />
241-
<root url="jar://$USER_HOME$/.ivy2/cache/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/bundles/jackson-dataformat-yaml-2.9.7.jar!/" />
242-
<root url="jar://$USER_HOME$/.ivy2/cache/org.yaml/snakeyaml/bundles/snakeyaml-1.23.jar!/" />
243-
</CLASSES>
244-
<JAVADOC />
245-
<SOURCES />
246-
</library>
247233
<library name="interactive-deps">
248234
<CLASSES>
249235
<root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles/scala-asm-7.0.0-scala-1.jar!/" />

0 commit comments

Comments
 (0)