From 0d8f0816bc2e8010d7c088f23828c6abb3146ddb Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Wed, 8 May 2019 18:26:15 -0700 Subject: [PATCH 1/2] Add launcher interface dependency Previously the zincLmIntegrationProj would compile if the meta build classpath leaked into the compilation classpath. I found that the project would not compile a clean build running an sbt built off of origin/develop. --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 10938a5ac..88126037c 100644 --- a/build.sbt +++ b/build.sbt @@ -589,6 +589,7 @@ lazy val zincLmIntegrationProj = (project in file("zinc-lm-integration")) buildInfoObject in Test := "ZincLmIntegrationBuildInfo", buildInfoKeys in Test := List[BuildInfoKey]("zincVersion" -> zincVersion), mimaSettingsSince(sbt13Plus), + libraryDependencies += launcherInterface, ) .configure(addSbtZincCompileCore, addSbtLmCore, addSbtLmIvyTest) From 02e78bd31d2aab7ecf55318f11c1e6dce4c13759 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Wed, 8 May 2019 18:51:03 -0700 Subject: [PATCH 2/2] Add scalaXml to testingProj dependencies This also seemed to be missing once the sbt metabuild classpath stopped leaking into the compiler clAdd scalaXml to testingProj dependencies This also seemed to be missing once the sbt metabuild classpath stopped leaking into the compiler clAdd scalaXml to testingProj dependencies This also seemed to be missing once the sbt metabuild classpath stopped leaking into the compiler clAdd scalaXml to testingProj dependencies This also seemed to be missing once the sbt metabuild classpath stopped leaking into the compiler classpath. --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 88126037c..9498f50fd 100644 --- a/build.sbt +++ b/build.sbt @@ -251,7 +251,7 @@ lazy val testingProj = (project in file("testing")) .settings( baseSettings, name := "Testing", - libraryDependencies ++= Seq(testInterface, launcherInterface, sjsonNewScalaJson.value), + libraryDependencies ++= scalaXml.value ++ Seq(testInterface, launcherInterface, sjsonNewScalaJson.value), Compile / scalacOptions += "-Ywarn-unused:-locals,-explicits,-privates", managedSourceDirectories in Compile += baseDirectory.value / "src" / "main" / "contraband-scala",