diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..994e17a23 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,3 @@ +``` +$ sbt release +``` diff --git a/build.sbt b/build.sbt index bfef5d621..20b5153f6 100644 --- a/build.sbt +++ b/build.sbt @@ -34,7 +34,6 @@ def commonSettings: Seq[Setting[_]] = Seq( ) lazy val utilRoot: Project = (project in file(".")). - // configs(Sxr.sxrConf). aggregate( utilInterface, utilControl, utilCollection, utilApplyMacro, utilComplete, utilLogging, utilRelation, utilLogic, utilCache, utilTracking, utilTesting @@ -62,7 +61,10 @@ lazy val utilRoot: Project = (project in file(".")). name := "Util Root", publish := {}, publishLocal := {}, - publishArtifact := false + publishArtifact in Compile := false, + publishArtifact in Test := false, + publishArtifact := false, + customCommands ) // defines Java structures used across Scala versions, such as the API structures and relationships extracted by @@ -104,8 +106,7 @@ lazy val utilComplete = (project in internalPath / "util-complete"). settings( commonSettings, name := "Util Completion", - libraryDependencies ++= Seq(jline, sbtIO), - crossScalaVersions := Seq(scala210, scala211) + libraryDependencies ++= Seq(jline, sbtIO) ) // logging @@ -159,3 +160,13 @@ lazy val utilTesting = (project in internalPath / "util-testing"). name := "Util Testing", libraryDependencies ++= Seq(scalaCheck, scalatest) ) + +def customCommands: Seq[Setting[_]] = Seq( + commands += Command.command("release") { state => + // "clean" :: + "so compile" :: + "so publishSigned" :: + "reload" :: + state + } +) diff --git a/project/Util.scala b/project/Util.scala index abaa4849e..cfe97dd1c 100644 --- a/project/Util.scala +++ b/project/Util.scala @@ -7,8 +7,10 @@ object Util { lazy val generateKeywords = TaskKey[File]("generateKeywords") lazy val javaOnlySettings = Seq[Setting[_]]( + crossPaths := false, compileOrder := CompileOrder.JavaThenScala, - unmanagedSourceDirectories in Compile <<= Seq(javaSource in Compile).join + unmanagedSourceDirectories in Compile <<= Seq(javaSource in Compile).join, + crossScalaVersions := Seq(Dependencies.scala211) ) def getScalaKeywords: Set[String] = 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")