nova/scalafx-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to several SBT plugins

Browse Source
This commit is contained in:
Sarah Gerweck 2016-05-04 20:59:15 -07:00
parent 941d0c7cb7
commit f216c5da9f
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
project/Build.scala
View File

@ -1,7 +1,7 @@
import sbt._ import sbt._
import Keys._ import Keys._
import com.typesafe.sbt.SbtSite.site import com.typesafe.sbt.site._
import sbtrelease.ReleasePlugin.autoImport._ import sbtrelease.ReleasePlugin.autoImport._
import com.typesafe.sbt.SbtPgp.autoImport._ import com.typesafe.sbt.SbtPgp.autoImport._
@ -82,11 +82,13 @@ object BuildSettings extends Basics {
if (deprecation) Seq("-Xlint:deprecation") else Seq.empty if (deprecation) Seq("-Xlint:deprecation") else Seq.empty
) )
/* Site setup */ /** A wrapper so we can call `commonSettings()` on a project. */
lazy val siteSettings = site.settings ++ site.includeScaladoc() implicit class ProjectSettingsHelper(p: Project) {
def commonSettings() = siteSettings(p).settings(buildSettings: _*)
val buildSettings = buildMetadata ++ private[this] def siteSettings(p: Project) = p.enablePlugins(SiteScaladocPlugin)
siteSettings ++
private[this] val buildSettings = buildMetadata ++
projectMainClass.toSeq.map(mainClass := Some(_)) ++ projectMainClass.toSeq.map(mainClass := Some(_)) ++
Seq ( Seq (
organization := buildOrganization, organization := buildOrganization,
@ -106,6 +108,7 @@ object BuildSettings extends Basics {
evictionWarningOptions in update := evictionWarningOptions in update :=
EvictionWarningOptions.default.withWarnTransitiveEvictions(false).withWarnDirectEvictions(false).withWarnScalaVersionEviction(false) EvictionWarningOptions.default.withWarnTransitiveEvictions(false).withWarnDirectEvictions(false).withWarnScalaVersionEviction(false)
) )
}
} }
object Helpers { object Helpers {
@ -308,7 +311,7 @@ object UtilsBuild extends Build {
import Helpers._ import Helpers._
lazy val root = (project in file (".")) lazy val root = (project in file ("."))
.settings(buildSettings: _*) .commonSettings()
.settings(Eclipse.settings: _*) .settings(Eclipse.settings: _*)
.settings(Publish.settings: _*) .settings(Publish.settings: _*)
.settings(Release.settings: _*) .settings(Release.settings: _*)

6
project/plugins.sbt
View File

@ -1,10 +1,10 @@
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0") addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1") addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.0.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.3.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.0") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")