Support links in using file directive (implements #1328) #3681
Conversation
Co-authored-by: Michał Pawlik <[email protected]> Co-authored-by: tgodzik <[email protected]>
|
|
|
@majk-p @tgodzik It works! Indeed, dependencies are resolved recursively already.
|
|
Note: need to fix formatting & regenerate reference docs for the CI to pass. |
| // TODO: reuse existing one? e.g. scala.cli.commands.shared.SharedOptions.coursierCache | ||
| lazy val fileCache: FileCache[coursier.util.Task] = FileCache() |
There was a problem hiding this comment.
Yup, I think it's accurate that SharedOptions.coursierCache should be used.
There was a problem hiding this comment.
@Gedochao but scala.cli.commands.shared.SharedOptions.coursierCache is in cli module, while we're in build here - so that definition is inaccessible (build doesn't depend on cli)
There was a problem hiding this comment.
That's why we haven't picked it up and left a todo
There was a problem hiding this comment.
...well, yes, but cli depends on build.
so what I mean here is that the way to go would be to pass it all the way from cli to CrossSources.
There was a problem hiding this comment.
if you just leave a TODO, it's very likely to get forgotten.
There was a problem hiding this comment.
if you don't have time to fix it, please at least create a ticket for the follow-up and link it back in the code.
| private def downloadFile(pUri: Positioned[java.net.URI]) = | ||
| import scala.build.options.ScalaVersionUtil.fileWithTtl0 | ||
| val artifact = Artifact(pUri.value.toString).withChanging(true) | ||
| fileCache.fileWithTtl0(artifact) | ||
| .left | ||
| .map(err => | ||
| new MalformedDirectiveError(err.describe, pUri.positions) | ||
| ) // TODO: better error type | ||
| .map(f => os.read.bytes(os.Path(f, Os.pwd))).map(content => | ||
| Seq(Virtual(pUri.value.toString, content)) | ||
| ) |
There was a problem hiding this comment.
This is very similar to SharedOptions.downloadInputs... I wonder if the function itself could be passed all the way here, rather than the cache
| @@ -126,6 +126,8 @@ Manually add sources to the project. Does not support chaining, sources are adde | |||
| #### Examples | |||
| `//> using file utils.scala` | |||
|
|
|||
| `//> using file https://raw.githubusercontent.com/softwaremill/sttp/refs/heads/master/examples/src/main/scala/sttp/client4/examples/json/GetAndParseJsonCatsEffectCirce.scala` | |||
There was a problem hiding this comment.
@Gedochao I think it would be nice to reference a file within scala-cli repo itself
There was a problem hiding this comment.
I mean... dunno if it matters, as long as the example is useful, to be honest. 🤷
Scala Tooling Spree 15.05
see #1328