Skip to content

Commit 5b481bd

Browse files
authored
Merge pull request #3366 from Gedochao/update/using_directives-1.1.3
Improve deprecation warnings for commas with whitespace used as using directive value separators
2 parents e333726 + 94c5fe2 commit 5b481bd

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,16 @@ class RunTestsDefault extends RunTestDefinitions
115115
) {
116116
val inputPath = os.rel / "example.sc"
117117
TestInputs(inputPath ->
118-
"""//> using options -Werror, -Wconf:cat=deprecation:e
118+
"""//> using options -Werror, -Wconf:cat=deprecation:e, -Wconf:cat=unused:e
119119
|println("Deprecation warnings should have been printed")
120120
|""".stripMargin)
121121
.fromRoot { root =>
122122
val res = os.proc(TestUtil.cli, "run", extraOptions, inputPath)
123123
.call(cwd = root, stderr = os.Pipe)
124-
val err = res.err.trim()
125-
expect(err.contains("Use of commas as separators is deprecated"))
124+
val err = res.err.trim()
125+
val expectedWarning = "Use of commas as separators is deprecated"
126+
expect(err.contains(expectedWarning))
127+
expect(err.linesIterator.count(_.contains(expectedWarning)) == 2)
126128
}
127129
}
128130
}

project/deps.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ object Deps {
253253
val typelevelToolkitVersion = "0.1.29"
254254
def typelevelToolkit = ivy"org.typelevel:toolkit:$typelevelToolkitVersion"
255255
def typelevelToolkitTest = ivy"org.typelevel:toolkit-test:$typelevelToolkitVersion"
256-
def usingDirectives = ivy"org.virtuslab:using_directives:1.1.2"
256+
def usingDirectives = ivy"org.virtuslab:using_directives:1.1.3"
257257
// Lives at https://github.com/VirtusLab/no-crc32-zip-input-stream, see #865
258258
// This provides a ZipInputStream that doesn't verify CRC32 checksums, that users
259259
// can enable by setting SCALA_CLI_VENDORED_ZIS=true in the environment, to workaround

0 commit comments

Comments
 (0)