From 2480fd838c8f3571a0483b38e5c0653cd73ab4f7 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 3 Jan 2019 18:31:46 -0500 Subject: [PATCH] fix project/flatten --- sbt/src/sbt-test/project/flatten/build.sbt | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/sbt/src/sbt-test/project/flatten/build.sbt b/sbt/src/sbt-test/project/flatten/build.sbt index bbe93fbcc..bab2c5efd 100644 --- a/sbt/src/sbt-test/project/flatten/build.sbt +++ b/sbt/src/sbt-test/project/flatten/build.sbt @@ -1,26 +1,23 @@ -lazy val root = (project in file(".")). - settings( +val unpackage = TaskKey[Unit]("unpackage") + +ThisBuild / scalaVersion := "2.12.8" + +lazy val root = (project in file(".")) + .settings( forConfig(Compile, "src"), forConfig(Test, "test-src"), - baseSettings + libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.14.0" % Test, + unmanagedSources / includeFilter := "*.java" | "*.scala" ) -def baseSettings = Seq( - scalaVersion := "2.11.8", - libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.11.4" % Test, - includeFilter in unmanagedSources := "*.java" | "*.scala" -) - def forConfig(conf: Configuration, name: String) = Project.inConfig(conf)( unpackageSettings(name) ) def unpackageSettings(name: String) = Seq( unmanagedSourceDirectories := (baseDirectory.value / name) :: Nil, - excludeFilter in unmanagedResources := (includeFilter in unmanagedSources).value, + unmanagedResources / excludeFilter := (unmanagedSources / includeFilter).value, unmanagedResourceDirectories := unmanagedSourceDirectories.value, unpackage := { - IO.unzip(artifactPath in packageSrc value, baseDirectory.value / name) + IO.unzip((packageSrc / artifactPath).value, baseDirectory.value / name) IO.delete(baseDirectory.value / name / "META-INF") } ) - -val unpackage = TaskKey[Unit]("unpackage")