NIT: Reuse javaVersion method

- remove dot as github includes it into the clickable URL
- Move methods for downloading to Update.scala
- apply fmt

Author: MaciejG604

modules/cli/src/main/scala/scala/cli/commands/update/Update.scala

@@ -6,17 +6,19 @@ import com.github.plokhotnyuk.jsoniter_scala.core.*
 import com.github.plokhotnyuk.jsoniter_scala.macros.*
 import coursier.core
 
+import java.net.{HttpURLConnection, URL, URLConnection}
+import java.nio.charset.StandardCharsets
+
 import scala.build.Logger
 import scala.build.errors.CheckScalaCliVersionError
 import scala.build.internal.Constants.{ghName, ghOrg, version as scalaCliVersion}
 import scala.cli.CurrentParams
 import scala.cli.commands.shared.HelpGroup
 import scala.cli.commands.{CommandUtils, ScalaCommand, SpecificationLevel}
-import scala.cli.internal.ProcUtil
 import scala.cli.signing.shared.Secret
 import scala.cli.util.ArgHelpers.*
-import scala.util.Properties
 import scala.util.control.NonFatal
+import scala.util.{Properties, Try}
 
 object Update extends ScalaCommand[UpdateOptions] {
 
@@ -46,7 +48,7 @@ object Update extends ScalaCommand[UpdateOptions] {
         tokenOpt.toSeq.map(tk => "Authorization" -> s"token ${tk.value}")
 
     try {
-      val resp = ProcUtil.download(url, headers: _*)
+      val resp = download(url, headers: _*)
       readFromArray(resp)(releaseListCodec).filter(_.actualRelease)
         .maxByOption(_.version)
         .map(_.version.repr)
@@ -79,7 +81,7 @@ object Update extends ScalaCommand[UpdateOptions] {
     }
 
     val installationScript =
-      ProcUtil.downloadFile("https://scala-cli.virtuslab.org/get")
+      downloadFile("https://scala-cli.virtuslab.org/get")
 
     // format: off
     val res = os.proc(
@@ -188,4 +190,41 @@ object Update extends ScalaCommand[UpdateOptions] {
 
     classesDir.contains(binRepoDir)
   }
+
+  // from https://github.com/coursier/coursier/blob/7b7c2c312aea26e850f0cd2cf15e688d0777f819/modules/cache/jvm/src/main/scala/coursier/cache/CacheUrl.scala#L489-L497
+  private def closeConn(conn: URLConnection): Unit = {
+    Try(conn.getInputStream).toOption.filter(_ != null).foreach(_.close())
+    conn match {
+      case conn0: HttpURLConnection =>
+        Try(conn0.getErrorStream).toOption.filter(_ != null).foreach(_.close())
+        conn0.disconnect()
+      case _ =>
+    }
+  }
+
+  private def download(
+    url: String,
+    headers: (String, String)*
+  ): Array[Byte] = {
+    var conn: URLConnection = null
+    val url0                = new URL(url)
+    try {
+      conn = url0.openConnection()
+      for ((k, v) <- headers)
+        conn.setRequestProperty(k, v)
+      conn.getInputStream.readAllBytes()
+    }
+    catch {
+      case NonFatal(ex) =>
+        throw new RuntimeException(s"Error downloading $url: $ex", ex)
+    }
+    finally
+      if (conn != null)
+        closeConn(conn)
+  }
+
+  private def downloadFile(url: String): String = {
+    val data = download(url)
+    new String(data, StandardCharsets.UTF_8)
+  }
 }

modules/cli/src/main/scala/scala/cli/internal/ProcUtil.scala

@@ -35,43 +35,6 @@ object ProcUtil {
     usesSh
   }
 
-  // from https://github.com/coursier/coursier/blob/7b7c2c312aea26e850f0cd2cf15e688d0777f819/modules/cache/jvm/src/main/scala/coursier/cache/CacheUrl.scala#L489-L497
-  private def closeConn(conn: URLConnection): Unit = {
-    Try(conn.getInputStream).toOption.filter(_ != null).foreach(_.close())
-    conn match {
-      case conn0: HttpURLConnection =>
-        Try(conn0.getErrorStream).toOption.filter(_ != null).foreach(_.close())
-        conn0.disconnect()
-      case _ =>
-    }
-  }
-
-  def download(
-    url: String,
-    headers: (String, String)*
-  ): Array[Byte] = {
-    var conn: URLConnection = null
-    val url0                = new URL(url)
-    try {
-      conn = url0.openConnection()
-      for ((k, v) <- headers)
-        conn.setRequestProperty(k, v)
-      conn.getInputStream.readAllBytes()
-    }
-    catch {
-      case NonFatal(ex) =>
-        throw new RuntimeException(s"Error downloading $url: $ex", ex)
-    }
-    finally
-      if (conn != null)
-        closeConn(conn)
-  }
-
-  def downloadFile(url: String): String = {
-    val data = download(url)
-    new String(data, StandardCharsets.UTF_8)
-  }
-
   def forceKillProcess(process: Process, logger: Logger): Unit = {
     if (process.isAlive) {
       process.destroyForcibly()

modules/cli/src/test/scala/cli/tests/ScalafmtTest.scala

@@ -51,7 +51,7 @@ class ScalafmtTests extends munit.FunSuite {
       "scalafmt-x86_64-pc-win32.zip"
     )
     val errorMsg =
-      s"""scalafmt native images missing for v$scalaFmtVersion, make a release at https://github.com/VirtusLab/scalafmt-native-image.
+      s"""scalafmt native images missing for v$scalaFmtVersion, make a release at https://github.com/VirtusLab/scalafmt-native-image
          |Ensure that all expected assets are available in the release:
          |  ${expectedAssets.mkString(", ")}
          |for scalafmt-native-image under tag v$scalaFmtVersion.""".stripMargin
@@ -68,7 +68,7 @@ class ScalafmtTests extends munit.FunSuite {
     catch {
       case e: JsonReaderException => throw new Exception(s"Error reading $url", e)
       case e: Throwable => throw new Exception(
-          s"""Failed to check for the ScalaFmt native launcher assets: ${e.getMessage}.
+          s"""Failed to check for the ScalaFmt native launcher assets: ${e.getMessage}
              |
              |$errorMsg
              |""".stripMargin,

modules/core/src/main/scala/scala/build/internals/OsLibc.scala

@@ -100,16 +100,7 @@ object OsLibc {
     val ext     = if (Properties.isWin) ".exe" else ""
     val javaCmd = (javaHome / "bin" / s"java$ext").toString
 
-    val javaVersionOutput = os.proc(javaCmd, "-version").call(
-      cwd = os.pwd,
-      stdout = os.Pipe,
-      stderr = os.Pipe,
-      mergeErrIntoOut = true
-    ).out.trim()
-    val javaVersion = parseJavaVersion(javaVersionOutput).getOrElse {
-      throw new Exception(s"Could not parse java version from output: $javaVersionOutput")
-    }
-    (javaVersion, javaCmd)
+    (javaVersion(javaCmd), javaCmd)
   }
 
 }