NIT Fix miscellaneous warnings (#3913)

* NIT Fix miscellaneous warnings

* Update modules/cli/src/main/scala/scala/cli/commands/repl/Repl.scala

* Update modules/cli/src/main/scala/scala/cli/commands/publish/Ivy.scala

Author: Gedochao

build.mill.scala

@@ -917,7 +917,7 @@ trait Cli extends CrossSbtModule with ProtoBuildModule with CliLaunchers
   }
 
   override def scalacOptions: T[Seq[String]] = Task {
-    super.scalacOptions() ++ asyncScalacOptions(crossScalaVersion)
+    super.scalacOptions() ++ asyncScalacOptions(crossScalaVersion) ++ Seq("-deprecation")
   }
   override def javacOptions: T[Seq[String]] = Task {
     super.javacOptions() ++ Seq("--release", "16")

modules/build/src/main/java/scala/build/internal/Chdir.java

@@ -1,6 +1,6 @@
 package scala.build.internal;
 
-import coursier.jvm.ErrnoException;
+import coursier.exec.ErrnoException;
 
 public final class Chdir {
 

modules/build/src/main/java/scala/build/internal/ChdirGraalvm.java

@@ -5,8 +5,8 @@
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.headers.LibC;
-import coursier.jvm.ErrnoException;
-import coursier.jvm.GraalvmErrnoExtras;
+import coursier.exec.ErrnoException;
+import coursier.exec.GraalvmErrnoExtras;
 import org.graalvm.nativeimage.c.type.CTypeConversion;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;

modules/build/src/main/scala/scala/build/Build.scala

@@ -909,7 +909,6 @@ object Build {
     sources: Sources,
     generatedSources: Seq[GeneratedSource],
     options: BuildOptions,
-    compilerJvmVersionOpt: Option[Positioned[Int]],
     scope: Scope,
     logger: Logger,
     artifacts: Artifacts,
@@ -929,7 +928,13 @@ object Build {
 
     val scalaCompilerParamsOpt = artifacts.scalaOpt match {
       case Some(scalaArtifacts) =>
-        val params = value(options.scalaParams).getOrElse {
+        val params = value {
+          options.scalaParams match {
+            case Left(buildException) if maybeRecoverOnError(buildException).isEmpty =>
+              Right(None) // this will effectively try to fall back to a pure Java build
+            case otherwise => otherwise
+          }
+        }.getOrElse {
           sys.error(
             "Should not happen (inconsistency between Scala parameters in BuildOptions and ScalaArtifacts)"
           )
@@ -1051,7 +1056,7 @@ object Build {
       scalaCompiler = scalaCompilerParamsOpt,
       scalaJsOptions =
         if (options.platform.value == Platform.JS)
-          Some(value(options.scalaJsOptions.config(logger)))
+          Some(value(options.scalaJsOptions.config(logger, maybeRecoverOnError)))
         else None,
       scalaNativeOptions =
         if (options.platform.value == Platform.Native)
@@ -1074,7 +1079,6 @@ object Build {
     sources: Sources,
     generatedSources: Seq[GeneratedSource],
     options: BuildOptions,
-    compilerJvmVersionOpt: Option[Positioned[Int]],
     scope: Scope,
     compiler: ScalaCompiler,
     logger: Logger,
@@ -1115,7 +1119,6 @@ object Build {
           sources,
           generatedSources,
           options0,
-          compilerJvmVersionOpt,
           scope,
           logger,
           artifacts,
@@ -1168,17 +1171,16 @@ object Build {
         case Some(error) => value(Left(error))
       }
 
-    val (classesDir0, scalaParams, artifacts, project, projectChanged) = value {
+    val (classesDir0, scalaParams, artifacts, project, _) = value {
       prepareBuild(
-        inputs,
-        sources,
-        generatedSources,
-        options,
-        compiler.jvmVersion,
-        scope,
-        compiler,
-        logger,
-        buildClient
+        inputs = inputs,
+        sources = sources,
+        generatedSources = generatedSources,
+        options = options,
+        scope = scope,
+        compiler = compiler,
+        logger = logger,
+        buildClient = buildClient
       )
     }
 

modules/build/src/main/scala/scala/build/LocalRepo.scala

@@ -56,6 +56,7 @@ object LocalRepo {
     loader: ClassLoader = Thread.currentThread().getContextClassLoader
   ): Option[String] = {
     val archiveUrl = loader.getResource(resourcePath)
+    logger.debug(s"archive url: $archiveUrl")
 
     if archiveUrl == null then None
     else {
@@ -70,13 +71,15 @@ object LocalRepo {
         }
 
       val repoDir = baseDir / version
+      logger.debug(s"repo dir: $repoDir")
 
       if !os.exists(repoDir) then
         withLock((repoDir / os.up).toNIO, version) {
           // Post-lock validation: Recheck repository directory existence to handle
           // potential race conditions between initial check and lock acquisition
           if !os.exists(repoDir) then
             val tmpRepoDir = repoDir / os.up / s".$version.tmp"
+            logger.debug(s"tmp repo dir: $tmpRepoDir")
             os.remove.all(tmpRepoDir)
             using(archiveUrl.openStream()) { is =>
               using(WrappedZipInputStream.create(new BufferedInputStream(is))) { zis =>
@@ -87,6 +90,7 @@ object LocalRepo {
         }
 
       val repo = "ivy:" + repoDir.toNIO.toUri.toASCIIString + "/[defaultPattern]"
+      logger.debug(s"local repo (ivy): $repo")
       Some(repo)
     }
   }

modules/build/src/main/scala/scala/build/ReplArtifacts.scala

@@ -49,7 +49,6 @@ object ReplArtifacts {
     extraRepositories: Seq[Repository],
     logger: Logger,
     cache: FileCache[Task],
-    directories: Directories,
     addScalapy: Option[String]
   ): Either[BuildException, ReplArtifacts] = either {
     val scalapyDeps =

modules/build/src/main/scala/scala/build/ScalafixArtifacts.scala

@@ -5,13 +5,12 @@ import coursier.core.Repository
 import coursier.util.Task
 import dependency.*
 import org.apache.commons.compress.archivers.zip.ZipFile
-import os.Path
 
-import java.io.ByteArrayInputStream
+import java.io.{ByteArrayInputStream, IOException}
 import java.util.Properties
 
 import scala.build.EitherCps.{either, value}
-import scala.build.errors.BuildException
+import scala.build.errors.{BuildException, ScalafixPropertiesError}
 import scala.build.internal.Constants
 import scala.build.internal.CsLoggerUtil.*
 
@@ -98,7 +97,7 @@ object ScalafixArtifacts {
     extraRepositories: Seq[Repository],
     logger: Logger,
     cache: FileCache[Task]
-  ): Either[BuildException, Path] =
+  ): Either[BuildException, os.Path] =
     either {
       val scalafixInterfaces = dep"ch.epfl.scala:scalafix-interfaces:${Constants.scalafixVersion}"
 
@@ -123,22 +122,26 @@ object ScalafixArtifacts {
       )
     }
 
-  private def readScalafixProperties(jar: Path): Either[BuildException, String] = {
-    import scala.jdk.CollectionConverters.*
-    val zipFile = new ZipFile(jar.toNIO)
-    val entry   = zipFile.getEntries().asScala.find(entry =>
-      entry.getName() == "scalafix-interfaces.properties"
-    )
-    val out =
-      entry.toRight(new BuildException("Failed to found scalafix properties") {})
-        .map { entry =>
-          val stream = zipFile.getInputStream(entry)
-          val bytes  = stream.readAllBytes()
-          new String(bytes)
-        }
-    zipFile.close()
-    out
-  }
+  private def readScalafixProperties(jar: os.Path): Either[BuildException, String] =
+    try {
+      import scala.jdk.CollectionConverters.*
+      val zipFile = ZipFile.builder().setPath(jar.toNIO).get()
+      val entry   = zipFile.getEntries().asScala.find(entry =>
+        entry.getName == "scalafix-interfaces.properties"
+      )
+      val out =
+        entry.toRight(new ScalafixPropertiesError(path = jar))
+          .map { entry =>
+            val stream = zipFile.getInputStream(entry)
+            val bytes  = stream.readAllBytes()
+            new String(bytes)
+          }
+      zipFile.close()
+      out
+    }
+    catch {
+      case e: IOException => Left(new ScalafixPropertiesError(path = jar, cause = Some(e)))
+    }
 
   private def scalafixPropsKey(scalaVersion: String): Either[BuildException, String] = {
     val regex = "(\\d)\\.(\\d+).+".r

modules/build/src/main/scala/scala/build/bsp/BspImpl.scala

@@ -155,32 +155,30 @@ final class BspImpl(
 
     val (classesDir0Main, scalaParamsMain, artifactsMain, projectMain, buildChangedMain) = value {
       val res = Build.prepareBuild(
-        allInputs,
-        sourcesMain,
-        generatedSourcesMain,
-        options0Main,
-        None,
-        Scope.Main,
-        currentBloopSession.remoteServer,
-        persistentLogger,
-        localClient,
-        maybeRecoverOnError(Scope.Main)
+        inputs = allInputs,
+        sources = sourcesMain,
+        generatedSources = generatedSourcesMain,
+        options = options0Main,
+        scope = Scope.Main,
+        compiler = currentBloopSession.remoteServer,
+        logger = persistentLogger,
+        buildClient = localClient,
+        maybeRecoverOnError = maybeRecoverOnError(Scope.Main)
       )
       res.left.map((_, Scope.Main))
     }
 
     val (classesDir0Test, scalaParamsTest, artifactsTest, projectTest, buildChangedTest) = value {
       val res = Build.prepareBuild(
-        allInputs,
-        sourcesTest,
-        generatedSourcesTest,
-        options0Test,
-        None,
-        Scope.Test,
-        currentBloopSession.remoteServer,
-        persistentLogger,
-        localClient,
-        maybeRecoverOnError(Scope.Test)
+        inputs = allInputs,
+        sources = sourcesTest,
+        generatedSources = generatedSourcesTest,
+        options = options0Test,
+        scope = Scope.Test,
+        compiler = currentBloopSession.remoteServer,
+        logger = persistentLogger,
+        buildClient = localClient,
+        maybeRecoverOnError = maybeRecoverOnError(Scope.Test)
       )
       res.left.map((_, Scope.Test))
     }

modules/build/src/main/scala/scala/build/bsp/BspServer.scala

@@ -26,7 +26,7 @@ class BspServer(
     with JavaBuildServerForwardStubs
     with JvmBuildServerForwardStubs
     with HasGeneratedSourcesImpl {
-  private var client: Option[BuildClient] = None
+  private val client: Option[BuildClient] = None
 
   @volatile private var intelliJ: Boolean = presetIntelliJ
   def isIntelliJ: Boolean                 = intelliJ

modules/build/src/main/scala/scala/build/bsp/BuildServerProxy.scala

@@ -63,10 +63,12 @@ class BuildServerProxy(
   override def buildTargetScalacOptions(params: b.ScalacOptionsParams)
     : CompletableFuture[b.ScalacOptionsResult] = bspServer().buildTargetScalacOptions(params)
 
+  @deprecated
   override def buildTargetScalaTestClasses(params: b.ScalaTestClassesParams)
     : CompletableFuture[b.ScalaTestClassesResult] =
     bspServer().buildTargetScalaTestClasses(params)
 
+  @deprecated
   override def buildTargetScalaMainClasses(params: b.ScalaMainClassesParams)
     : CompletableFuture[b.ScalaMainClassesResult] =
     bspServer().buildTargetScalaMainClasses(params)