diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2016-08-09 18:42:54 +0200 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2016-08-19 15:37:33 +0200 |
| commit | 5cd1d51c3cb44b2c9b2c1abd433da50a00e5219e (patch) | |
| tree | 2f87a0e18b2c44cce28a2b424f2b3b1e97ac1732 /project/Build.scala | |
| parent | 079e3db0f157ee6eae9e8a34b3bbf7a75cdaa929 (diff) | |
| download | dotty-5cd1d51c3cb44b2c9b2c1abd433da50a00e5219e.tar.gz dotty-5cd1d51c3cb44b2c9b2c1abd433da50a00e5219e.tar.bz2 dotty-5cd1d51c3cb44b2c9b2c1abd433da50a00e5219e.zip | |
Remove client from dottydoc - no more Scala.JS deps!
Diffstat (limited to 'project/Build.scala')
| -rw-r--r-- | project/Build.scala | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/project/Build.scala b/project/Build.scala index ca7916701..fa6ebc37e 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -264,29 +264,17 @@ object DottyInjectedPlugin extends AutoPlugin { ). settings(publishing) - lazy val dottydoc = crossProject.in(file("dottydoc")) - .jsSettings( - libraryDependencies ++= Seq( - "org.scala-js" %%% "scalajs-dom" % "0.9.0", - "com.lihaoyi" %%% "scalatags" % "0.5.5" - ) - ) - - lazy val dottydocJS = dottydoc.js.dependsOn(dotty).settings( - scalaSource in Compile := baseDirectory.value / "src" - ) - - lazy val dottydocJVM = dottydoc.jvm.dependsOn(dotty).settings( - resources in Compile += (fastOptJS in (dottydocJS, Compile)).value.data, + lazy val dottydoc = project.in(file("dottydoc")).dependsOn(dotty).settings( + //resources in Compile += (fastOptJS in (dottydocJS, Compile)).value.data, resourceDirectory in Compile := baseDirectory.value / "resources", scalaSource in Compile := baseDirectory.value / "src", + javaSource in Compile := baseDirectory.value / "src", scalaSource in Test := baseDirectory.value / "test", javaSource in Test := baseDirectory.value / "test", libraryDependencies ++= Seq( - "org.scala-js" % "scalajs-dom_sjs0.6_2.11" % "0.9.0", - "com.lihaoyi" %% "scalatags" % "0.5.5", - "com.novocode" % "junit-interface" % "0.11" % "test" + "com.novocode" % "junit-interface" % "0.11" % "test", + "com.github.spullara.mustache.java" % "compiler" % "0.9.3" ), // enable improved incremental compilation algorithm @@ -323,7 +311,7 @@ object DottyInjectedPlugin extends AutoPlugin { ("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: fullpath } - ) + ).settings(publishing) /** A sandbox to play with the Scala.js back-end of dotty. * |