Skip to content
This repository has been archived by the owner on Aug 20, 2024. It is now read-only.

Update commons-text to 1.12.0 #2685

Open
wants to merge 1 commit into
base: 1.6.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ lazy val firrtlSettings = Seq(
"com.github.scopt" %% "scopt" % "3.7.1",
"net.jcazevedo" %% "moultingyaml" % "0.4.2",
"org.json4s" %% "json4s-native" % "4.0.6",
"org.apache.commons" % "commons-text" % "1.10.0",
"org.apache.commons" % "commons-text" % "1.12.0",
"io.github.alexarchambault" %% "data-class" % "0.2.5",
"com.lihaoyi" %% "os-lib" % "0.8.1"
),
Expand Down
30 changes: 15 additions & 15 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class firrtlCrossModule(val crossScalaVersion: String)
ivy"com.github.scopt::scopt:3.7.1",
ivy"net.jcazevedo::moultingyaml:0.4.2",
ivy"org.json4s::json4s-native:4.0.6",
ivy"org.apache.commons:commons-text:1.10.0",
ivy"org.apache.commons:commons-text:1.12.0",
ivy"io.github.alexarchambault::data-class:0.2.5",
ivy"org.antlr:antlr4-runtime:$antlr4Version",
ivy"com.google.protobuf:protobuf-java:$protocVersion",
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
Loading