From e209499544d01edb8fb3fa8da43dc6bf09ad8fbb Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 14 Dec 2016 10:30:26 +0000 Subject: [PATCH 1/2] Avoid source file path clash with generated sources --- .../sbt/librarymanagement/{Artifact.scala => ArtifactExtra.scala} | 0 .../{Configuration.scala => ConfigurationExtra.scala} | 0 .../{CrossVersion.scala => CrossVersionExtra.scala} | 0 .../sbt/librarymanagement/{IvyScala.scala => IvyScalaExtra.scala} | 0 .../sbt/librarymanagement/{ModuleID.scala => ModuleIDExtra.scala} | 0 .../sbt/librarymanagement/{Resolver.scala => ResolverExtra.scala} | 0 .../{UpdateReport.scala => UpdateReportExtra.scala} | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename librarymanagement/src/main/scala/sbt/librarymanagement/{Artifact.scala => ArtifactExtra.scala} (100%) rename librarymanagement/src/main/scala/sbt/librarymanagement/{Configuration.scala => ConfigurationExtra.scala} (100%) rename librarymanagement/src/main/scala/sbt/librarymanagement/{CrossVersion.scala => CrossVersionExtra.scala} (100%) rename librarymanagement/src/main/scala/sbt/librarymanagement/{IvyScala.scala => IvyScalaExtra.scala} (100%) rename librarymanagement/src/main/scala/sbt/librarymanagement/{ModuleID.scala => ModuleIDExtra.scala} (100%) rename librarymanagement/src/main/scala/sbt/librarymanagement/{Resolver.scala => ResolverExtra.scala} (100%) rename librarymanagement/src/main/scala/sbt/librarymanagement/{UpdateReport.scala => UpdateReportExtra.scala} (100%) diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/Artifact.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/ArtifactExtra.scala similarity index 100% rename from librarymanagement/src/main/scala/sbt/librarymanagement/Artifact.scala rename to librarymanagement/src/main/scala/sbt/librarymanagement/ArtifactExtra.scala diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/Configuration.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala similarity index 100% rename from librarymanagement/src/main/scala/sbt/librarymanagement/Configuration.scala rename to librarymanagement/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/CrossVersion.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/CrossVersionExtra.scala similarity index 100% rename from librarymanagement/src/main/scala/sbt/librarymanagement/CrossVersion.scala rename to librarymanagement/src/main/scala/sbt/librarymanagement/CrossVersionExtra.scala diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/IvyScala.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/IvyScalaExtra.scala similarity index 100% rename from librarymanagement/src/main/scala/sbt/librarymanagement/IvyScala.scala rename to librarymanagement/src/main/scala/sbt/librarymanagement/IvyScalaExtra.scala diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/ModuleID.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala similarity index 100% rename from librarymanagement/src/main/scala/sbt/librarymanagement/ModuleID.scala rename to librarymanagement/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/Resolver.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/ResolverExtra.scala similarity index 100% rename from librarymanagement/src/main/scala/sbt/librarymanagement/Resolver.scala rename to librarymanagement/src/main/scala/sbt/librarymanagement/ResolverExtra.scala diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/UpdateReport.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala similarity index 100% rename from librarymanagement/src/main/scala/sbt/librarymanagement/UpdateReport.scala rename to librarymanagement/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala From 7c221ef97f5d37a0d9862a5b7c0902dfe24ae88b Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 14 Dec 2016 10:26:53 +0000 Subject: [PATCH 2/2] Include managed sources in packageSrc --- build.sbt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 7f64b8cf6..04511e60a 100644 --- a/build.sbt +++ b/build.sbt @@ -49,7 +49,14 @@ lazy val lm = (project in file("librarymanagement")). libraryDependencies ++= scalaXml.value, resourceGenerators in Compile += Def.task(Util.generateVersionFile(version.value, resourceManaged.value, streams.value, (compile in Compile).value)).taskValue, binaryIssueFilters ++= Seq(), - datatypeFormatsForType in generateDatatypes in Compile := DatatypeConfig.getFormats + datatypeFormatsForType in generateDatatypes in Compile := DatatypeConfig.getFormats, + // WORKAROUND sbt/sbt#2205 include managed sources in packageSrc + mappings in (Compile, packageSrc) ++= { + val srcs = (managedSources in Compile).value + val sdirs = (managedSourceDirectories in Compile).value + val base = baseDirectory.value + (((srcs --- sdirs --- base) pair (relativeTo(sdirs) | relativeTo(base) | flat)) toSeq) + } ). configure(addSbtIO, addSbtUtilLogging, addSbtUtilTesting, addSbtUtilCollection, addSbtUtilCompletion, addSbtUtilCache). enablePlugins(DatatypePlugin, JsonCodecPlugin)