diff options
author | julianmichael <julianjohnmichael@gmail.com> | 2018-04-07 15:38:02 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-08 05:01:12 -0700 |
commit | 3eb623542a664c1a924d4cad4ee1cdaef8581f8c (patch) | |
tree | 1683b3f43e81aed6603e4e01d952d78f21075259 | |
parent | f0e7dcefb312d9e64f2aedca867f940aebe5d59c (diff) | |
download | mill-3eb623542a664c1a924d4cad4ee1cdaef8581f8c.tar.gz mill-3eb623542a664c1a924d4cad4ee1cdaef8581f8c.tar.bz2 mill-3eb623542a664c1a924d4cad4ee1cdaef8581f8c.zip |
Fix #282 by passing plugins as arguments to scaladoc
Plus a couple tests to sanity check.
-rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala | 3 | ||||
-rw-r--r-- | scalalib/test/resources/hello-world-macros/core/src/Main.scala | 5 | ||||
-rw-r--r-- | scalalib/test/src/mill/scalalib/HelloWorldTests.scala | 32 |
3 files changed, 39 insertions, 1 deletions
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index 816e2077..b98f248e 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -129,7 +129,8 @@ trait ScalaModule extends JavaModule { outer => if p.isFile } yield p.toNIO.toString - val options = Seq("-d", javadocDir.toNIO.toString, "-usejavacp") + val pluginOptions = scalacPluginClasspath().map(pluginPathRef => s"-Xplugin:${pluginPathRef.path}") + val options = Seq("-d", javadocDir.toNIO.toString, "-usejavacp") ++ pluginOptions if (files.nonEmpty) subprocess( "scala.tools.nsc.ScalaDoc", diff --git a/scalalib/test/resources/hello-world-macros/core/src/Main.scala b/scalalib/test/resources/hello-world-macros/core/src/Main.scala new file mode 100644 index 00000000..20924a60 --- /dev/null +++ b/scalalib/test/resources/hello-world-macros/core/src/Main.scala @@ -0,0 +1,5 @@ +import monocle.macros._ +@Lenses case class Foo(bar: String) +object Main extends App { + println(Foo.bar.get(Foo("bar"))) +} diff --git a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala index 21589766..597f9f67 100644 --- a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala +++ b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala @@ -116,6 +116,20 @@ object HelloWorldTests extends TestSuite { ) } } + + object HelloWorldMacros extends HelloBase{ + object core extends ScalaModule { + def scalaVersion = "2.11.8" + + def ivyDeps = Agg( + ivy"com.github.julien-truffaut::monocle-macro::1.4.0" + ) + def scalacPluginIvyDeps = super.scalacPluginIvyDeps() ++ Agg( + ivy"org.scalamacros:::paradise:2.1.0" + ) + } + } + val resourcePath = pwd / 'scalalib / 'test / 'resources / "hello-world" def jarMainClass(jar: JarFile): Option[String] = { @@ -475,5 +489,23 @@ object HelloWorldTests extends TestSuite { ) } } + 'macros - { + // make sure macros are applied when compiling/running + 'runMain - workspaceTest( + HelloWorldMacros, + resourcePath = pwd / 'scalalib / 'test / 'resources / "hello-world-macros" + ){ eval => + val Right((_, evalCount)) = eval.apply(HelloWorldMacros.core.runMain("Main")) + assert(evalCount > 0) + } + // make sure macros are applied when compiling during scaladoc generation + 'docJar - workspaceTest( + HelloWorldMacros, + resourcePath = pwd / 'scalalib / 'test / 'resources / "hello-world-macros" + ){ eval => + val Right((_, evalCount)) = eval.apply(HelloWorldMacros.core.docJar) + assert(evalCount > 0) + } + } } } |