diff --git a/build.sbt b/build.sbt index 3aeded60..d42b6707 100644 --- a/build.sbt +++ b/build.sbt @@ -1,3 +1,5 @@ +import scala.sys.process._ + // FIXME duplicated code val Version = "(stable:|devel:|)([a-zA-Z0-9-_]+)".r @@ -66,8 +68,8 @@ lazy val warningSettings = Seq( ) lazy val noPublishSettings = Seq( - publish := (), - publishLocal := (), + publish := (()), + publishLocal := (()), publishArtifact := false ) @@ -133,8 +135,6 @@ lazy val docs = project.in(file("modules/docs")) ghpagesNoJekyll := false, git.remoteRepo := "git@github.com:larsrh/libisabelle.git", includeFilter in makeSite := "*.html" | "*.css" | "*.png" | "*.jpg" | "*.yml" | "*.md" | "Gemfile" | "config", - watchSources ++= (siteSourceDirectory.value ** "*").get, - watchSources += ((baseDirectory in ThisBuild).value / "README.md"), siteMappings += ((baseDirectory in ThisBuild).value / "README.md", "_includes/README.md"), tutDirectory := "_tut", // this seems to be required for scalog @@ -399,6 +399,8 @@ import ReleaseTransformations._ releaseVcsSign := true releaseCrossBuild := true +releasePublishArtifactsAction := PgpKeys.publishSigned.value + releaseProcess := Seq[ReleaseStep]( checkSnapshotDependencies, inquireVersions, @@ -406,10 +408,10 @@ releaseProcess := Seq[ReleaseStep]( setReleaseVersion, commitReleaseVersion, tagRelease, - ReleaseStep(action = Command.process("publishSigned", _), enableCrossBuild = true), + publishArtifacts, setNextVersion, commitNextVersion, - ReleaseStep(action = Command.process("sonatypeRelease", _)) + releaseStepCommand("sonatypeRelease") ) diff --git a/project/build.properties b/project/build.properties index 64317fda..12c38d38 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=1.0.0-RC3 diff --git a/project/plugins.sbt b/project/plugins.sbt index 7706837c..8c963e5a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,13 +4,13 @@ resolvers ++= Seq( ) addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0") -addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.0") +addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1") -addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.0") -addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.0.0") -addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.5.2") -addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "1.0.0") +addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2") +addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.0") +addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.0") +addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "2.0.0") addSbtPlugin("info.hupel" % "sbt-libisabelle" % "0.5.1")