Skip to content

Commit

Permalink
Minor compilation improvements (#3512)
Browse files Browse the repository at this point in the history
Drop `Core` implementation (replacement for IR) as it (sadly) looks increasingly
unlikely this effort will be continued. Also, it heavily relies
on implicits which increases some compilation time (~1sec from `clean`)

Related to https://www.pivotaltracker.com/story/show/182359029
  • Loading branch information
hubertp authored Jun 7, 2022
1 parent a382e0c commit b1db359
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 5,352 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@
builtins from method signatures][3454]
- [Avoid needless concatenations of warning/error messages][3465]
- [Lazy evaluation of RHS argument for || and &&][3492]
- [Drop Core implementation of IR][3512]

[3227]: https://github.com/enso-org/enso/pull/3227
[3248]: https://github.com/enso-org/enso/pull/3248
Expand All @@ -257,6 +258,7 @@
[3492]: https://github.com/enso-org/enso/pull/3492
[3493]: https://github.com/enso-org/enso/pull/3493
[3505]: https://github.com/enso-org/enso/pull/3505
[3512]: https://github.com/enso-org/enso/pull/3512

# Enso 2.0.0-alpha.18 (2021-10-12)

Expand Down
28 changes: 0 additions & 28 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ bootstrap := {}
lazy val enso = (project in file("."))
.settings(version := "0.1")
.aggregate(
`core-definition`,
`interpreter-dsl`,
`json-rpc-server-test`,
`json-rpc-server`,
Expand Down Expand Up @@ -938,30 +937,6 @@ lazy val testkit = project
)
)

lazy val `core-definition` = (project in file("lib/scala/core-definition"))
.configs(Benchmark)
.settings(
version := "0.1",
inConfig(Compile)(truffleRunOptionsSettings),
inConfig(Benchmark)(Defaults.testSettings),
Test / parallelExecution := false,
Test / logBuffered := false,
scalacOptions += "-Ymacro-annotations",
libraryDependencies ++= jmh ++ Seq(
"com.chuusai" %% "shapeless" % shapelessVersion,
"org.scalacheck" %% "scalacheck" % scalacheckVersion % Test,
"org.scalactic" %% "scalactic" % scalacticVersion % Test,
"org.scalatest" %% "scalatest" % scalatestVersion % Test,
"org.typelevel" %% "cats-core" % catsVersion,
"com.github.julien-truffaut" %% "monocle-core" % monocleVersion
),
addCompilerPlugin(
"org.typelevel" %% "kind-projector" % kindProjectorVersion cross CrossVersion.full
)
)
.dependsOn(graph)
.dependsOn(syntax.jvm)

lazy val searcher = project
.in(file("lib/scala/searcher"))
.configs(Test)
Expand Down Expand Up @@ -1222,15 +1197,12 @@ lazy val runtime = (project in file("engine/runtime"))
"com.novocode" % "junit-interface" % "0.11" % Test exclude ("junit", "junit-dep")
),
// Note [Unmanaged Classpath]
Compile / unmanagedClasspath += (`core-definition` / Compile / packageBin).value,
Test / unmanagedClasspath += (`core-definition` / Compile / packageBin).value,
Test / unmanagedClasspath += (baseDirectory.value / ".." / ".." / "app" / "gui" / "view" / "graph-editor" / "src" / "builtin" / "visualization" / "native" / "inc"),
Compile / compile / compileInputs := (Compile / compile / compileInputs)
.dependsOn(CopyTruffleJAR.preCompileTask)
.value,
Compile / compile := FixInstrumentsGeneration.patchedCompile
.dependsOn(FixInstrumentsGeneration.preCompileTask)
.dependsOn(`core-definition` / Compile / packageBin)
.value,
// Note [Classpath Separation]
Test / javaOptions ++= Seq(
Expand Down
Loading

0 comments on commit b1db359

Please sign in to comment.