Skip to content

Commit 850acbc

Browse files
Address compilation warnings
1 parent 92f1a85 commit 850acbc

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

modules/cli/src/main/scala/scala/cli/commands/InstallHome.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ object InstallHome extends ScalaCommand[InstallHomeOptions] {
5353
val newScalaCliBinPath = os.Path(options.scalaCliBinaryPath, os.pwd)
5454

5555
val newVersion: String =
56-
os.proc(newScalaCliBinPath, "version").call(cwd = os.pwd).out.text.trim
56+
os.proc(newScalaCliBinPath, "version").call(cwd = os.pwd).out.text().trim
5757

5858
// Backward compatibility - previous versions not have the `--version` parameter
5959
val oldVersion: String = Try {
60-
os.proc(binDirPath / options.binaryName, "version").call(cwd = os.pwd).out.text.trim
60+
os.proc(binDirPath / options.binaryName, "version").call(cwd = os.pwd).out.text().trim
6161
}.toOption.getOrElse("0.0.0")
6262

6363
if (os.exists(binDirPath))

modules/integration/src/test/scala/scala/cli/integration/InstallHomeTests.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ class InstallHomeTests extends munit.FunSuite {
4747
) = {
4848
// format: off
4949
val cmdInstallVersion = Seq[os.Shellable](
50-
TestUtil.cli, "install-home",
51-
"--env",
52-
"--scala-cli-binary-path", binVersion ,
53-
"--binary-name", dummyScalaCliBinName,
50+
TestUtil.cli, "install-home",
51+
"--env",
52+
"--scala-cli-binary-path", binVersion,
53+
"--binary-name", dummyScalaCliBinName,
5454
"--bin-dir", binDirPath
5555
) ++ (if(force) Seq[os.Shellable]("--force") else Seq.empty)
5656
// format: on
@@ -80,7 +80,7 @@ class InstallHomeTests extends munit.FunSuite {
8080
val v1Install = os.proc(binDirPath / dummyScalaCliBinName).call(
8181
cwd = root,
8282
stdin = os.Inherit
83-
).out.text.trim
83+
).out.text().trim
8484
expect(v1Install == firstVersion)
8585

8686
// update to 2 version
@@ -89,7 +89,7 @@ class InstallHomeTests extends munit.FunSuite {
8989
val v2Update = os.proc(binDirPath / dummyScalaCliBinName).call(
9090
cwd = root,
9191
stdin = os.Inherit
92-
).out.text.trim
92+
).out.text().trim
9393
expect(v2Update == secondVersion)
9494

9595
// downgrade to 1 version with force
@@ -98,7 +98,7 @@ class InstallHomeTests extends munit.FunSuite {
9898
val v1Downgrade = os.proc(binDirPath / dummyScalaCliBinName).call(
9999
cwd = root,
100100
stdin = os.Inherit
101-
).out.text.trim
101+
).out.text().trim
102102
expect(v1Downgrade == firstVersion)
103103
}
104104
}

modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
134134
cwd = root,
135135
check = false,
136136
stderr = os.Pipe
137-
).err.text.trim
137+
).err.text().trim
138138
expect(output.startsWith("scala-cli: invalid option:"))
139139
}
140140
}
@@ -1109,7 +1109,7 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
11091109
inputs.fromRoot { root =>
11101110
val p =
11111111
os.proc(TestUtil.cli, "main0.sc", "f.sc", "--", "20").call(cwd = root)
1112-
val res = p.out.text.trim
1112+
val res = p.out.text().trim
11131113
expect(res == "202020")
11141114
}
11151115
}
@@ -1121,7 +1121,7 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
11211121
)
11221122
inputs.fromRoot { root =>
11231123
val p = os.proc(TestUtil.cli, "f.sc", "--", "16").call(cwd = root)
1124-
expect(p.out.text.trim == "16")
1124+
expect(p.out.text().trim == "16")
11251125
}
11261126
}
11271127

0 commit comments

Comments
 (0)