From dd992ddbfa5f54bab675060dc0d9cfd279110517 Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Tue, 9 Jan 2024 10:27:59 +0100 Subject: [PATCH] fix: run scalafix now that the explicit types rule is working --- plugin/src-mill0.10/io/kipp/mill/ci/release/Eval.scala | 3 ++- plugin/src-mill0.11/io/kipp/mill/ci/release/Eval.scala | 2 +- plugin/src/io/kipp/mill/ci/release/CiReleaseModule.scala | 3 ++- plugin/src/io/kipp/mill/ci/release/Env.scala | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugin/src-mill0.10/io/kipp/mill/ci/release/Eval.scala b/plugin/src-mill0.10/io/kipp/mill/ci/release/Eval.scala index 4e1ebd6..97f3685 100644 --- a/plugin/src-mill0.10/io/kipp/mill/ci/release/Eval.scala +++ b/plugin/src-mill0.10/io/kipp/mill/ci/release/Eval.scala @@ -4,6 +4,7 @@ import mill.eval.Evaluator private[release] object Eval { - def evalOrThrow(ev: Evaluator) = Evaluator.evalOrThrow(ev) + def evalOrThrow(ev: Evaluator): Evaluator.EvalOrThrow = + Evaluator.evalOrThrow(ev) } diff --git a/plugin/src-mill0.11/io/kipp/mill/ci/release/Eval.scala b/plugin/src-mill0.11/io/kipp/mill/ci/release/Eval.scala index a3917ca..3100d98 100644 --- a/plugin/src-mill0.11/io/kipp/mill/ci/release/Eval.scala +++ b/plugin/src-mill0.11/io/kipp/mill/ci/release/Eval.scala @@ -4,6 +4,6 @@ import mill.eval.Evaluator private[release] object Eval { - def evalOrThrow(ev: Evaluator) = ev.evalOrThrow() + def evalOrThrow(ev: Evaluator): Evaluator.EvalOrThrow = ev.evalOrThrow() } diff --git a/plugin/src/io/kipp/mill/ci/release/CiReleaseModule.scala b/plugin/src/io/kipp/mill/ci/release/CiReleaseModule.scala index 5e72509..a1a26b7 100644 --- a/plugin/src/io/kipp/mill/ci/release/CiReleaseModule.scala +++ b/plugin/src/io/kipp/mill/ci/release/CiReleaseModule.scala @@ -3,6 +3,7 @@ package io.kipp.mill.ci.release import de.tobiasroeser.mill.vcs.version.VcsVersion import mill._ import mill.api.Result +import mill.define.Command import mill.define.ExternalModule import mill.define.Task import mill.eval.Evaluator @@ -58,7 +59,7 @@ object ReleaseModule extends ExternalModule { * pass in anything. It also sets up your gpg stuff and grabs the necessary * env variables to publish to sonatype for you. */ - def publishAll(ev: Evaluator) = T.command { + def publishAll(ev: Evaluator): Command[Unit] = T.command { val log = T.log setupGpg()() val env = envTask() diff --git a/plugin/src/io/kipp/mill/ci/release/Env.scala b/plugin/src/io/kipp/mill/ci/release/Env.scala index 6e423e7..952a9fa 100644 --- a/plugin/src/io/kipp/mill/ci/release/Env.scala +++ b/plugin/src/io/kipp/mill/ci/release/Env.scala @@ -23,7 +23,7 @@ private[release] final case class Env( /** Sonatype creds in the format that Mill uses */ - val sonatypeCreds = s"${sonatypeUser}:${sonatypePassword}" + val sonatypeCreds: String = s"${sonatypeUser}:${sonatypePassword}" } object Env {