diff --git a/build.sbt b/build.sbt index 923df2598..1c06bbb25 100644 --- a/build.sbt +++ b/build.sbt @@ -98,6 +98,7 @@ lazy val lmCore = (project in file("core")) sjsonnewScalaJson.value % Optional, scalaTest % Test, scalaCheck % Test, + scalaVerify % Test, ), libraryDependencies += scalaXml, resourceGenerators in Compile += Def @@ -217,25 +218,18 @@ lazy val lmCore = (project in file("core")) ) .configure(addSbtIO, addSbtUtilLogging, addSbtUtilPosition, addSbtUtilCache) -lazy val lmCommonTest = (project in file("common-test")) +lazy val lmIvy = (project in file("ivy")) + .enablePlugins(ContrabandPlugin, JsonCodecPlugin) .dependsOn(lmCore) - .settings( - commonSettings, - skip in publish := true, - name := "common-test", - libraryDependencies ++= Seq(scalaTest, scalaCheck, scalaVerify), - scalacOptions in (Compile, console) --= - Vector("-Ywarn-unused-import", "-Ywarn-unused", "-Xlint"), - mimaSettings, - ) - -lazy val lmIvy = (project in file("ivy")) - .enablePlugins(ContrabandPlugin, JsonCodecPlugin) - .dependsOn(lmCore, lmCommonTest % Test) .settings( commonSettings, name := "librarymanagement-ivy", - libraryDependencies ++= Seq(ivy), + libraryDependencies ++= Seq( + ivy, + scalaTest % Test, + scalaCheck % Test, + scalaVerify % Test, + ), managedSourceDirectories in Compile += baseDirectory.value / "src" / "main" / "contraband-scala", sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala", diff --git a/common-test/src/main/scala/sbt/internal/librarymanagement/AbstractEngineSpec.scala b/ivy/src/test/scala/sbt/internal/librarymanagement/AbstractEngineSpec.scala similarity index 100% rename from common-test/src/main/scala/sbt/internal/librarymanagement/AbstractEngineSpec.scala rename to ivy/src/test/scala/sbt/internal/librarymanagement/AbstractEngineSpec.scala diff --git a/common-test/src/main/scala/sbt/internal/librarymanagement/ResolutionSpec.scala b/ivy/src/test/scala/sbt/internal/librarymanagement/ResolutionSpec.scala similarity index 100% rename from common-test/src/main/scala/sbt/internal/librarymanagement/ResolutionSpec.scala rename to ivy/src/test/scala/sbt/internal/librarymanagement/ResolutionSpec.scala