Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scala-library to 2.13.14 #131

Closed
wants to merge 2 commits into from
Closed

Update scala-library to 2.13.14 #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3da507c
Applied Scalafix rule(s) dependency:[email protected]…
scala-steward May 9, 2024
99f1d5e
Update scala-library to 2.13.14
scala-steward May 9, 2024
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 .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: playframework/.github/.github/workflows/cmd.yml@v3
with:
java: 17, 11, 8
scala: 2.12.19
scala: 2.13.14
cmd: |
sbt ++$MATRIX_SCALA test ^scripted

Expand Down
6 changes: 3 additions & 3 deletions src/main/scala/com/typesafe/sbt/jse/SbtJsTask.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ object SbtJsTask extends AutoPlugin {

val result = engine.executeJs(
shellSource,
args.to[immutable.Seq],
args.to(immutable.Seq),
Map.empty,
line => {
// Extract structured JSON data out before forwarding to the logger
Expand Down Expand Up @@ -263,7 +263,7 @@ object SbtJsTask extends AutoPlugin {
val engine = SbtJsEngine.engineTypeToEngine(
(task / engineType).value,
(task / command).value,
LocalEngine.nodePathEnv(nodeModulePaths.to[immutable.Seq])
LocalEngine.nodePathEnv(nodeModulePaths.to(immutable.Seq))
)

val sources = ((config / task / Keys.sources).value ** ((config / task / includeFilter).value -- (config / task / excludeFilter).value)).get.map(f => new File(f.getCanonicalPath))
Expand Down Expand Up @@ -390,7 +390,7 @@ object SbtJsTask extends AutoPlugin {
val engine = SbtJsEngine.engineTypeToEngine(
engineType,
command,
LocalEngine.nodePathEnv(nodeModules.to[immutable.Seq])
LocalEngine.nodePathEnv(nodeModules.to(immutable.Seq))
)

executeJsOnEngine(engine, shellSource, args, stderrSink.getOrElse(m => state.log.error(m)), stdoutSink.getOrElse(m => state.log.info(m)))
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/com/typesafe/sbt/jse/npm/Npm.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class Npm(engine: Engine, npmFile: Option[File] = None, preferSystemNpm: Boolean
}

def executeJsNpm(): JsExecutionResult =
engine.executeJs(npmFile.getOrElse(throw new RuntimeException("No NPM JavaScript file passed to the Npm instance via the npmFile param")), args.to[immutable.Seq], Map.empty, outSink, errSink)
engine.executeJs(npmFile.getOrElse(throw new RuntimeException("No NPM JavaScript file passed to the Npm instance via the npmFile param")), args.to(immutable.Seq), Map.empty, outSink, errSink)

engine match {
case localEngine: LocalEngine if preferSystemNpm =>
Expand Down
Loading