Skip to content

Commit b44bd47

Browse files
committed
[ARC-589] Fix problem with scoverage plugin
scoverage/gradle-scoverage#109 branch: feature/ARC-589_sbt_test_step
1 parent b8eb259 commit b44bd47

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name := "sbt-multi-project-example"
22
ThisBuild / organization := "vandebron.nl"
3-
ThisBuild / scalaVersion := "2.12.3"
43

54
lazy val mpyl = project
65
.in(file("."))

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.0")
22
addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.9.0")
33
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
4-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.6")
4+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7")

src/mpyl/steps/build/sbt.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ def _construct_sbt_command(step_input: Input, image_name: str):
5454
'docker'
5555
] if command is not None
5656
]
57-
sbt_config = SbtConfig.from_config(config=step_input.run_properties.config)
58-
command = sbt_config.to_command()
57+
command = SbtConfig.from_config(config=step_input.run_properties.config).to_command()
5958
command.append("; ".join(commands))
6059
return command

src/mpyl/steps/test/sbt.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ def _construct_sbt_command_test(step_input: Input):
6363

6464
@staticmethod
6565
def _construct_sbt_command(step_input: Input, commands_fn: Callable[[Input], list[str]]):
66-
sbt_config = SbtConfig.from_config(config=step_input.run_properties.config)
67-
command = sbt_config.to_command()
66+
command = SbtConfig.from_config(config=step_input.run_properties.config).to_command()
6867
command.append("; ".join(commands_fn(step_input)))
6968
return command
7069

0 commit comments

Comments
 (0)