diff options
Diffstat (limited to 'scalalib/src')
| -rw-r--r-- | scalalib/src/mill/scalalib/PublishModule.scala | 4 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala | 2 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/ScalaWorkerApi.scala | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/scalalib/src/mill/scalalib/PublishModule.scala b/scalalib/src/mill/scalalib/PublishModule.scala index e6c88b01..8f52eb6a 100644 --- a/scalalib/src/mill/scalalib/PublishModule.scala +++ b/scalalib/src/mill/scalalib/PublishModule.scala @@ -97,7 +97,7 @@ object PublishModule extends ExternalModule{ def publishAll(sonatypeCreds: String, gpgPassphrase: String, - publishArtifacts: mill.main.MagicScopt.Tasks[PublishModule.PublishData], + publishArtifacts: mill.main.Tasks[PublishModule.PublishData], sonatypeUri: String = "https://oss.sonatype.org/service/local", sonatypeSnapshotUri: String = "https://oss.sonatype.org/content/repositories/snapshots", release: Boolean = false) = T.command{ @@ -116,7 +116,7 @@ object PublishModule extends ExternalModule{ ) } - implicit def millScoptTargetReads[T] = new mill.main.TargetScopt[T]() + implicit def millScoptTargetReads[T] = new mill.main.Tasks.Scopt[T]() def millDiscover: mill.define.Discover[this.type] = mill.define.Discover[this.type] }
\ No newline at end of file diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index 12123ef8..6548aad4 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -307,7 +307,7 @@ trait TestModule extends ScalaModule with TaskModule { def testLocal(args: String*) = T.command{ val outputPath = T.ctx().dest/"out.json" - mill.scalalib.ScalaWorkerApi.scalaWorker().apply( + mill.scalalib.ScalaWorkerApi.scalaWorker().runTests( TestRunner.framework(testFramework()), runClasspath().map(_.path), Agg(compile().classes.path), diff --git a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala index e66864af..b01409c1 100644 --- a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala +++ b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala @@ -58,9 +58,9 @@ trait ScalaWorkerApi { upstreamCompileOutput: Seq[CompilationResult]) (implicit ctx: mill.util.Ctx): mill.eval.Result[CompilationResult] - def apply(frameworkInstance: ClassLoader => sbt.testing.Framework, - entireClasspath: Agg[Path], - testClassfilePath: Agg[Path], - args: Seq[String]) - (implicit ctx: mill.util.Ctx.Log): (String, Seq[Result]) + def runTests(frameworkInstance: ClassLoader => sbt.testing.Framework, + entireClasspath: Agg[Path], + testClassfilePath: Agg[Path], + args: Seq[String]) + (implicit ctx: mill.util.Ctx.Log): (String, Seq[Result]) } |