Merge pull request #111 from ckipp01/update/mill-scalafix-0.3.2

Update mill-scalafix to 0.3.2
ckipp01 · Jan 9, 2024 · 54e20e5 · 54e20e5
2 parents 4f34299 + dd992dd
commit 54e20e5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/build.sc b/build.sc
@@ -1,4 +1,4 @@
-import $ivy.`com.goyeau::mill-scalafix::0.3.1`
+import $ivy.`com.goyeau::mill-scalafix::0.3.2`
 import $ivy.`io.chris-kipp::mill-ci-release::0.1.9`
 
 import mill._

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
@@ -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
@@ -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
@@ -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
@@ -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 {