From 10979f94afc85d744feaa1411754959468f8c97c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 May 2024 14:21:02 +0000 Subject: [PATCH] Update os-lib to 0.10.1 --- build.sbt | 2 +- build.sc | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.sbt b/build.sbt index e6290b05e4..e12d2d2a79 100644 --- a/build.sbt +++ b/build.sbt @@ -36,7 +36,7 @@ lazy val firrtlSettings = Seq( "org.json4s" %% "json4s-native" % "4.0.6", "org.apache.commons" % "commons-text" % "1.10.0", "io.github.alexarchambault" %% "data-class" % "0.2.5", - "com.lihaoyi" %% "os-lib" % "0.8.1" + "com.lihaoyi" %% "os-lib" % "0.10.1" ), // macros for the data-class library libraryDependencies ++= { diff --git a/build.sc b/build.sc index 52cd6cfd8b..fba53888af 100644 --- a/build.sc +++ b/build.sc @@ -53,7 +53,7 @@ class firrtlCrossModule(val crossScalaVersion: String) ivy"io.github.alexarchambault::data-class:0.2.5", ivy"org.antlr:antlr4-runtime:$antlr4Version", ivy"com.google.protobuf:protobuf-java:$protocVersion", - ivy"com.lihaoyi::os-lib:0.8.1" + ivy"com.lihaoyi::os-lib:0.10.1" ) ++ { if (majorVersion == 13) Agg(ivy"org.scala-lang.modules::scala-parallel-collections:1.0.4") @@ -123,7 +123,7 @@ class firrtlCrossModule(val crossScalaVersion: String) // get version from antlr4/antlr version output val systemAntlr4Version = os.proc(f).call(check = false).out.text().trim match { case versionPattern(v) => v - case _ => "0.0.0" + case _ => "0.0.0" } val systemAntlr4Path = os.Path(os.proc("bash", "-c", s"command -v $f").call().out.text().trim) if (checkSystemAntlr4Version) @@ -134,12 +134,12 @@ class firrtlCrossModule(val crossScalaVersion: String) else None else - // Perform a cursory version check, avoid using antlr2 - // check if system antlr4 version is greater than 4.0.0 - if (versionCompare(systemAntlr4Version, "4.0.0") >= 0) - Some(systemAntlr4Path) - else - None + // Perform a cursory version check, avoid using antlr2 + // check if system antlr4 version is greater than 4.0.0 + if (versionCompare(systemAntlr4Version, "4.0.0") >= 0) + Some(systemAntlr4Path) + else + None } catch { case _: IOException => None @@ -221,7 +221,7 @@ class firrtlCrossModule(val crossScalaVersion: String) // get version from protoc version output val systemProtocVersion = os.proc("protoc", "--version").call(check = false).out.text().trim match { case versionPattern(v) => v - case _ => "0.0.0" + case _ => "0.0.0" } val systemProtocPath = os.Path(os.proc("bash", "-c", "command -v protoc").call().out.text().trim) if (checkSystemProtocVersion) @@ -232,12 +232,12 @@ class firrtlCrossModule(val crossScalaVersion: String) else None else - // Perform a cursory version check - // check if system protoc version is greater than 3.0.0 - if (versionCompare(systemProtocVersion, "3.0.0") >= 0) - Some(systemProtocPath) - else - None + // Perform a cursory version check + // check if system protoc version is greater than 3.0.0 + if (versionCompare(systemProtocVersion, "3.0.0") >= 0) + Some(systemProtocPath) + else + None } catch { case _: IOException => None