Merge branch 'master' into bump-zinc

1 files changed, 9 insertions, 7 deletions

diff --git a/scalalib/api/src/mill/scalalib/api/ZincWorkerApi.scala b/scalalib/api/src/ZincWorkerApi.scala
index c5230ec5..d42be9f3 100644
--- a/scalalib/api/src/mill/scalalib/api/ZincWorkerApi.scala
+++ b/scalalib/api/src/ZincWorkerApi.scala
@@ -3,14 +3,16 @@ package mill.scalalib.api
 import mill.api.Loose.Agg
 import mill.api.PathRef
 import mill.api.JsonFormatters._
-
+object ZincWorkerApi{
+  type Ctx = mill.api.Ctx.Dest with mill.api.Ctx.Log with mill.api.Ctx.Home
+}
 trait ZincWorkerApi {
   /** Compile a Java-only project */
   def compileJava(upstreamCompileOutput: Seq[CompilationResult],
                   sources: Agg[os.Path],
                   compileClasspath: Agg[os.Path],
                   javacOptions: Seq[String])
-                 (implicit ctx: mill.api.Ctx): mill.api.Result[CompilationResult]
+                 (implicit ctx: ZincWorkerApi.Ctx): mill.api.Result[CompilationResult]
 
   /** Compile a mixed Scala/Java or Scala-only project */
   def compileMixed(upstreamCompileOutput: Seq[CompilationResult],
@@ -18,21 +20,21 @@ trait ZincWorkerApi {
                    compileClasspath: Agg[os.Path],
                    javacOptions: Seq[String],
                    scalaVersion: String,
+                   scalaOrganization: String,
                    scalacOptions: Seq[String],
-                   compilerBridgeSources: os.Path,
                    compilerClasspath: Agg[os.Path],
                    scalacPluginClasspath: Agg[os.Path])
-                  (implicit ctx: mill.api.Ctx): mill.api.Result[CompilationResult]
+                  (implicit ctx: ZincWorkerApi.Ctx): mill.api.Result[CompilationResult]
 
   def discoverMainClasses(compilationResult: CompilationResult)
-                         (implicit ctx: mill.api.Ctx): Seq[String]
+                         (implicit ctx: ZincWorkerApi.Ctx): Seq[String]
 
   def docJar(scalaVersion: String,
-             compilerBridgeSources: os.Path,
+             scalaOrganization: String,
              compilerClasspath: Agg[os.Path],
              scalacPluginClasspath: Agg[os.Path],
              args: Seq[String])
-            (implicit ctx: mill.api.Ctx): Boolean
+            (implicit ctx: ZincWorkerApi.Ctx): Boolean
 }