Skip to content

Commit 199b1d5

Browse files
Merge pull request #1275 from bjaglin/revert-breaking-change
revert unnecessary breaking change in testkit
2 parents f6bff33 + 29b2dc7 commit 199b1d5

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

build.sbt

+2-6
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,8 @@ lazy val unit = project
219219

220220
put(
221221
"inputClasspath",
222-
fullClasspath.in(testsInput, Compile).value.map(_.data)
223-
)
224-
225-
put(
226-
"semanticdbRootDirectory",
227-
Seq(semanticdbTargetRoot.in(testsInput, Compile).value)
222+
fullClasspath.in(testsInput, Compile).value.map(_.data) :+
223+
semanticdbTargetRoot.in(testsInput, Compile).value
228224
)
229225
put(
230226
"inputSourceDirectories",

scalafix-testkit/src/main/scala/scalafix/testkit/TestkitProperties.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,7 @@ object TestkitProperties {
9696
case None => Nil
9797
}
9898
new TestkitProperties(
99-
Classpath(sprops("semanticdbRootDirectory")) ++ Classpath(
100-
sprops("inputClasspath")
101-
),
99+
Classpath(sprops("inputClasspath")),
102100
Classpath(sprops("inputSourceDirectories")).entries,
103101
Classpath(sprops("outputSourceDirectories")).entries,
104102
sourceroot,

scalafix-tests/unit/src/test/scala/scalafix/tests/cli/CliSemanticSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class CliSemanticSuite extends BaseCliSuite {
170170
checkSemantic(
171171
name = "-P:semanticdb:targetroot",
172172
args = {
173-
val (targetroot :: classDir :: Nil, jars) =
173+
val (_ :: targetroot :: Nil, jars) =
174174
props.inputClasspath.entries.partition(_.isDirectory)
175175
Array(
176176
s"--scalacOptions",

0 commit comments

Comments
 (0)