diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-03 23:45:37 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-03 23:45:37 -0800 |
| commit | f3ea6a59233a05792df49ede660c904c67f6c684 (patch) | |
| tree | b32938668f63c81576dcf575fb30c2845bcf3fc7 | |
| parent | 3980cdc6cde53865d77ea4961c6264c11b15a73a (diff) | |
| download | mill-f3ea6a59233a05792df49ede660c904c67f6c684.tar.gz mill-f3ea6a59233a05792df49ede660c904c67f6c684.tar.bz2 mill-f3ea6a59233a05792df49ede660c904c67f6c684.zip | |
Fix GenIdea tests
| -rw-r--r-- | scalalib/src/mill/scalalib/GenIdea.scala | 10 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scalalib/src/mill/scalalib/GenIdea.scala b/scalalib/src/mill/scalalib/GenIdea.scala index 15057101..eb04cf1c 100644 --- a/scalalib/src/mill/scalalib/GenIdea.scala +++ b/scalalib/src/mill/scalalib/GenIdea.scala @@ -106,10 +106,10 @@ object GenIdea { val moduleFiles = resolved.map{ case (path, resolvedDeps, mod) => val Seq( - resoucesPathRefs: Loose.Agg[PathRef], - sourcesPathRef: Loose.Agg[PathRef], - generatedSourcePathRefs: Loose.Agg[PathRef], - allSourcesPathRefs: Loose.Agg[PathRef] + resourcesPathRefs: Seq[PathRef], + sourcesPathRef: Seq[PathRef], + generatedSourcePathRefs: Seq[PathRef], + allSourcesPathRefs: Seq[PathRef] ) = evaluator.evaluate(Agg(mod.resources, mod.sources, mod.generatedSources, mod.allSources)).values val generatedSourcePaths = generatedSourcePathRefs.map(_.path) @@ -121,7 +121,7 @@ object GenIdea { ) val elem = moduleXmlTemplate( - Strict.Agg.from(resoucesPathRefs.map(_.path)), + Strict.Agg.from(resourcesPathRefs.map(_.path)), Strict.Agg.from(normalSourcePaths), Strict.Agg.from(generatedSourcePaths), paths.out, diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index 03e27596..01f0d7ac 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -128,7 +128,7 @@ trait ScalaModule extends mill.Module with TaskModule { outer => def sources = T.sources{ millSourcePath / 'src } def resources = T.sources{ millSourcePath / 'resources } - def generatedSources = T { Agg.empty[PathRef] } + def generatedSources = T.sources() def allSources = T{ sources() ++ generatedSources() } def compile: T[CompilationResult] = T.persistent{ |