Skip to content

Commit aa8f932

Browse files
authored
Merge pull request #168 from xuwei-k/sbt-old-deprecated-in-slash
Fix deprecated sbt syntax
2 parents 9c4b6fa + a584246 commit aa8f932

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

  • sbt-crossproject-test/src/sbt-test/new-api/composite-project
  • sbt-crossproject/src/main/scala/sbtcrossproject

sbt-crossproject-test/src/sbt-test/new-api/composite-project/test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
> fooJS/run
55
> fooJVM/run
66
> fooNative/run
7-
> foobarJVM/test:compile
8-
> foobarNative/test:compile
9-
-> foobarJS/test:compile
7+
> foobarJVM/Test/compile
8+
> foobarNative/Test/compile
9+
-> foobarJS/Test/compile

sbt-crossproject/src/main/scala/sbtcrossproject/CrossProject.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,9 @@ object CrossProject {
271271
}
272272

273273
val compileSettings =
274-
makeSharedSettings(unmanagedSourceDirectories in Compile, "main")
274+
makeSharedSettings(Compile / unmanagedSourceDirectories, "main")
275275
val testSettings =
276-
makeSharedSettings(unmanagedSourceDirectories in Test, "test")
276+
makeSharedSettings(Test / unmanagedSourceDirectories, "test")
277277

278278
(compileSettings ++ testSettings) // group-reduce the settings per-platform
279279
.groupBy(_._1)
@@ -306,9 +306,9 @@ object CrossProject {
306306
}
307307

308308
val compileSettings =
309-
makeSharedSettings(unmanagedResourceDirectories in Compile, "main")
309+
makeSharedSettings(Compile / unmanagedResourceDirectories, "main")
310310
val testSettings =
311-
makeSharedSettings(unmanagedResourceDirectories in Test, "test")
311+
makeSharedSettings(Test / unmanagedResourceDirectories, "test")
312312

313313
(compileSettings ++ testSettings) // group-reduce the settings per-platform
314314
.groupBy(_._1)

0 commit comments

Comments
 (0)