Added more explicit type annotations (#2974)

Fixes CI. Pull request: #2974
com-lihaoyi · Jan 15, 2024 · 2f1fee8 · 2f1fee8
1 parent a9ac4d0
commit 2f1fee8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/scalalib/src/mill/scalalib/CrossModuleBase.scala b/scalalib/src/mill/scalalib/CrossModuleBase.scala
@@ -13,9 +13,11 @@ trait CrossModuleBase extends ScalaModule with Cross.Module[String] {
   protected def scalaVersionDirectoryNames: Seq[String] =
     ZincWorkerUtil.matchingVersions(crossScalaVersion)
 
-  def crossWrapperSegments = millModuleSegments.parts
-  override def artifactNameParts =
+  override def crossWrapperSegments: List[String] = millModuleSegments.parts
+
+  override def artifactNameParts: T[Seq[String]] =
     super.artifactNameParts().patch(crossWrapperSegments.size - 1, Nil, 1)
+
   implicit def crossSbtModuleResolver: Resolver[CrossModuleBase] =
     new Resolver[CrossModuleBase] {
       def resolve[V <: CrossModuleBase](c: Cross[V]): V = {

diff --git a/scalalib/src/mill/scalalib/CrossSbtModule.scala b/scalalib/src/mill/scalalib/CrossSbtModule.scala
@@ -6,7 +6,7 @@ import mill.scalalib.{CrossModuleBase, SbtModule}
 
 trait CrossSbtModule extends SbtModule with CrossModuleBase { outer =>
 
-  override def sources = T.sources {
+  override def sources: T[Seq[PathRef]] = T.sources {
     super.sources() ++ scalaVersionDirectoryNames.map(s =>
       PathRef(millSourcePath / "src" / "main" / s"scala-$s")
     )

diff --git a/scalalib/src/mill/scalalib/CrossScalaModule.scala b/scalalib/src/mill/scalalib/CrossScalaModule.scala
@@ -13,7 +13,7 @@ import mill.T
  * - src-2.12.3
  */
 trait CrossScalaModule extends ScalaModule with CrossModuleBase {
-  override def sources = T.sources {
+  override def sources: T[Seq[PathRef]] = T.sources {
     super.sources() ++
       scalaVersionDirectoryNames.map(s => PathRef(millSourcePath / s"src-$s"))
   }

diff --git a/scalalib/src/mill/scalalib/PlatformScalaModule.scala b/scalalib/src/mill/scalalib/PlatformScalaModule.scala
@@ -1,4 +1,5 @@
 package mill.scalalib
+
 import mill._
 import os.Path
 
@@ -25,13 +26,13 @@ trait PlatformScalaModule extends ScalaModule {
     .collect { case l: mill.define.Segment.Label => l.value }
     .last
 
-  override def sources = T.sources {
+  override def sources: T[Seq[PathRef]] = T.sources {
     super.sources().flatMap { source =>
       val platformPath =
         PathRef(source.path / _root_.os.up / s"${source.path.last}-${platformScalaSuffix}")
       Seq(source, platformPath)
     }
   }
 
-  override def artifactNameParts = super.artifactNameParts().dropRight(1)
+  override def artifactNameParts: T[Seq[String]] = super.artifactNameParts().dropRight(1)
 }