From 4abaec8622a9eabaa06d9122f3bc0c84369b9890 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 10 May 2016 00:34:40 -0400 Subject: [PATCH] Fix dependencies --- build.sbt | 28 ++++++++++++++++++++++------ project/doge.sbt | 1 + 2 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 project/doge.sbt diff --git a/build.sbt b/build.sbt index a37e69249..390f51f9d 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ def baseVersion = "0.1.0" def internalPath = file("internal") def commonSettings: Seq[Setting[_]] = Seq( - scalaVersion := scala210, + scalaVersion := scala211, // publishArtifact in packageDoc := false, resolvers += Resolver.typesafeIvyRepo("releases"), resolvers += Resolver.sonatypeRepo("snapshots"), @@ -52,19 +52,35 @@ lazy val root = (project in file(".")). publishLocal := {}, publishArtifact in Compile := false, publishArtifact in Test := false, - publishArtifact := false + publishArtifact := false, + customCommands ) lazy val lm = (project in file("librarymanagement")). settings( commonSettings, libraryDependencies ++= Seq( - utilLogging, (utilLogging % Test).classifier("tests"), - sbtIO, (sbtIO % Test).classifier("tests"), + utilLogging.artifacts( + Artifact("util-logging", "jar", "jar", classifier = None, configurations = List(Compile), url = None), + Artifact("util-logging", "jar", "jar", classifier = Some("tests"), configurations = List(Test), url = None) + ), + sbtIO.artifacts( + Artifact("io", "jar", "jar", classifier = None, configurations = List(Compile), url = None), + Artifact("io", "jar", "jar", classifier = Some("tests"), configurations = List(Test), url = None) + ), utilTesting % Test, utilCollection, utilCompletion, ivy, jsch, sbtSerialization, scalaReflect.value, launcherInterface), resourceGenerators in Compile <+= (version, resourceManaged, streams, compile in Compile) map Util.generateVersionFile, name := "librarymanagement", - binaryIssueFilters ++= Seq( - ) + binaryIssueFilters ++= Seq() ) + +def customCommands: Seq[Setting[_]] = Seq( + commands += Command.command("release") { state => + // "clean" :: + "so compile" :: + "so publishSigned" :: + "reload" :: + state + } +) diff --git a/project/doge.sbt b/project/doge.sbt new file mode 100644 index 000000000..fedea9490 --- /dev/null +++ b/project/doge.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.3")