Merge pull request #3120 from scalacenter/fix-intellij

Fix sbt 1.0 in Intellij
This commit is contained in:
Dale Wijnand 2017-04-19 06:39:56 -05:00 committed by GitHub
commit 4bcc2999e2
1 changed files with 6 additions and 0 deletions

View File

@ -107,6 +107,8 @@ lazy val testingProj = (project in file("testing")).
baseSettings,
name := "Testing",
libraryDependencies ++= Seq(testInterface,launcherInterface, sjsonNewScalaJson),
managedSourceDirectories in Compile +=
baseDirectory.value / "src" / "main" / "contraband-scala",
sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
contrabandFormatsForType in generateContrabands in Compile := ContrabandConfig.getFormats
).
@ -184,6 +186,8 @@ lazy val protocolProj = (project in file("protocol")).
testedBaseSettings,
name := "Protocol",
libraryDependencies ++= Seq(sjsonNewScalaJson),
managedSourceDirectories in Compile +=
baseDirectory.value / "src" / "main" / "contraband-scala",
sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
contrabandFormatsForType in generateContrabands in Compile := ContrabandConfig.getFormats
).
@ -197,6 +201,8 @@ lazy val commandProj = (project in file("main-command")).
testedBaseSettings,
name := "Command",
libraryDependencies ++= Seq(launcherInterface, sjsonNewScalaJson, templateResolverApi),
managedSourceDirectories in Compile +=
baseDirectory.value / "src" / "main" / "contraband-scala",
sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
contrabandFormatsForType in generateContrabands in Compile := ContrabandConfig.getFormats
).