diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-07 07:24:47 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-07 09:04:55 -0700 |
commit | 3e43a5f3b56ed65ec9ce0d68b28033b71da5a06f (patch) | |
tree | a39394ea100eca1bafb551c793075e475a26ddd3 /scalalib/src/mill/scalalib/ScalaModule.scala | |
parent | 953321ead7b278912529ef34b50e403d1e533c05 (diff) | |
download | mill-3e43a5f3b56ed65ec9ce0d68b28033b71da5a06f.tar.gz mill-3e43a5f3b56ed65ec9ce0d68b28033b71da5a06f.tar.bz2 mill-3e43a5f3b56ed65ec9ce0d68b28033b71da5a06f.zip |
First unit tests for `JavaModule`
Diffstat (limited to 'scalalib/src/mill/scalalib/ScalaModule.scala')
-rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index 6997c368..b3013d57 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -27,7 +27,7 @@ trait ScalaModule extends JavaModule { outer => } def scalaVersion: T[String] - def scalaWorker: ScalaWorkerModule = mill.scalalib.ScalaWorkerModule + override def finalMainClassOpt: T[Either[String, String]] = T{ mainClass() match{ @@ -81,6 +81,18 @@ trait ScalaModule extends JavaModule { outer => T.task{scalaCompilerIvyDeps(scalaVersion()) ++ scalaRuntimeIvyDeps(scalaVersion())} )() } + override def compileClasspath = T{ + transitiveLocalClasspath() ++ + resources() ++ + unmanagedClasspath() ++ + resolveDeps(T.task{compileIvyDeps() ++ scalaLibraryIvyDeps() ++ transitiveIvyDeps()})() + } + + override def upstreamAssemblyClasspath = T{ + transitiveLocalClasspath() ++ + unmanagedClasspath() ++ + resolveDeps(T.task{runIvyDeps() ++ scalaLibraryIvyDeps() ++ transitiveIvyDeps()})() + } override def compile: T[CompilationResult] = T.persistent{ scalaWorker.worker().compileScala( @@ -96,6 +108,17 @@ trait ScalaModule extends JavaModule { outer => ) } + override def ivyDepsTree(inverse: Boolean = false) = T.command { + val (flattened, resolution) = Lib.resolveDependenciesMetadata( + repositories, scalaVersion(), ivyDeps(), platformSuffix(), Some(mapDependencies) + ) + + println(coursier.util.Print.dependencyTree(flattened, resolution, + printExclusions = false, reverse = inverse)) + + Result.Success() + } + override def docJar = T { val outDir = T.ctx().dest @@ -134,6 +157,17 @@ trait ScalaModule extends JavaModule { outer => } } + override def resolveDeps(deps: Task[Agg[Dep]], sources: Boolean = false) = T.task{ + resolveDependencies( + repositories, + scalaVersion(), + deps(), + platformSuffix(), + sources, + mapDependencies = Some(mapDependencies) + ) + } + def ammoniteReplClasspath = T{ localClasspath() ++ transitiveLocalClasspath() ++ |