Repository: incubator-predictionio Updated Branches: refs/heads/develop f25798453 -> 7111b74dc
Fix sbt warnings Closes #381 Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/7111b74d Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/7111b74d Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/7111b74d Branch: refs/heads/develop Commit: 7111b74dc9848dc509e4ea1ddca366f48a296f41 Parents: f257984 Author: Naoki Takezoe <[email protected]> Authored: Mon May 15 17:29:30 2017 +0900 Committer: Naoki Takezoe <[email protected]> Committed: Mon May 15 17:29:30 2017 +0900 ---------------------------------------------------------------------- build.sbt | 2 +- tools/build.sbt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/7111b74d/build.sbt ---------------------------------------------------------------------- diff --git a/build.sbt b/build.sbt index 3e50665..e49613f 100644 --- a/build.sbt +++ b/build.sbt @@ -83,7 +83,7 @@ hadoopVersion in ThisBuild := sys.props.getOrElse( scalaSparkDepsVersion(scalaBinaryVersion.value)(sparkBinaryVersion.value)("hadoop")) val pioBuildInfoSettings = buildInfoSettings ++ Seq( - sourceGenerators in Compile <+= buildInfo, + sourceGenerators in Compile += buildInfo, buildInfoKeys := Seq[BuildInfoKey]( name, version, http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/7111b74d/tools/build.sbt ---------------------------------------------------------------------- diff --git a/tools/build.sbt b/tools/build.sbt index 86c4b6d..2e27f1f 100644 --- a/tools/build.sbt +++ b/tools/build.sbt @@ -35,7 +35,8 @@ assemblyMergeStrategy in assembly := { oldStrategy(x) } -assemblyExcludedJars in assembly <<= (fullClasspath in assembly) map { cp => +assemblyExcludedJars in assembly := { + val cp = (fullClasspath in assembly).value cp filter { _.data.getName match { case "reflectasm-1.10.1.jar" => true case "kryo-3.0.3.jar" => true @@ -55,7 +56,7 @@ test in assembly := {} assemblyOutputPath in assembly := baseDirectory.value.getAbsoluteFile.getParentFile / "assembly" / "src" / "universal" / "lib" / s"pio-assembly-${version.value}.jar" -cleanFiles <+= baseDirectory { base => base.getParentFile / - "assembly" / "src" / "universal" / "lib" } +cleanFiles += baseDirectory.value.getParentFile / + "assembly" / "src" / "universal" / "lib" pomExtra := childrenPomExtra.value
