From 899fe41f1ebcab6d695618c29933888202c8225c Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Tue, 2 Sep 2014 11:22:53 +0200 Subject: change to sonatype publishing for now and change organization to "net.virtual-void" for simpler administration --- README.md | 2 +- build.sbt | 18 ++---------------- project/Helpers.scala | 16 ++++++++++++++++ project/gpg.sbt | 1 + project/plugins.sbt | 7 ------- publish.sbt | 18 ++++++++++++++++++ 6 files changed, 38 insertions(+), 24 deletions(-) create mode 100644 project/Helpers.scala create mode 100644 project/gpg.sbt create mode 100644 publish.sbt diff --git a/README.md b/README.md index 2594287..38414a4 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ This now expands correctly to Put - addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.5.1") + addSbtPlugin("net.virtual-void" % "sbt-boilerplate" % "0.5.9") into your `plugins.sbt` and add diff --git a/build.sbt b/build.sbt index 321e24a..4c27de7 100644 --- a/build.sbt +++ b/build.sbt @@ -1,8 +1,8 @@ name := "sbt-boilerplate" -organization := "io.spray" +organization := "net.virtual-void" -version := "0.6.0-SNAPSHOT" +version := "0.5.9" description := "An SBT plugin for simple generation of boilerplate" @@ -10,8 +10,6 @@ startYear := Some(2012) homepage := Some(url("http://github.com/sbt/sbt-boilerplate")) -organizationHomepage := Some(url("http://spray.io")) - licenses in GlobalScope += "BSD" -> url("https://github.com/sbt/sbt-boilerplate/raw/master/LICENSE") sbtPlugin := true @@ -20,18 +18,6 @@ scalacOptions := Seq("-deprecation", "-encoding", "utf8") CrossBuilding.crossSbtVersions := Seq("0.11.2", "0.11.3", "0.12", "0.13") -/////////////// -// publishing -/////////////// - -publishMavenStyle := false - -bintraySettings - -bintray.Keys.repository := "sbt-plugins" - -bintray.Keys.bintrayOrganization in bintray.Keys.bintray := None - /////////////// // ls-sbt /////////////// diff --git a/project/Helpers.scala b/project/Helpers.scala new file mode 100644 index 0000000..4c426be --- /dev/null +++ b/project/Helpers.scala @@ -0,0 +1,16 @@ +import java.net.URL + +object Helpers { + def generatePomExtra(scmUrl: String, scmConnection: String, + developerId: String, developerName: String): xml.NodeSeq = + + { scmUrl } + { scmConnection } + + + + { developerId } + { developerName } + + +} \ No newline at end of file diff --git a/project/gpg.sbt b/project/gpg.sbt new file mode 100644 index 0000000..ff0f7a9 --- /dev/null +++ b/project/gpg.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3") \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 595e94b..53cc650 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,10 +8,3 @@ addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.3") addSbtPlugin("net.virtual-void" % "sbt-cross-building" % "0.8.1") addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.0") - -resolvers += Resolver.url( - "bintray-sbt-plugin-releases", - url("http://dl.bintray.com/content/sbt/sbt-plugin-releases"))( - Resolver.ivyStylePatterns) - -addSbtPlugin("me.lessis" % "bintray-sbt" % "0.1.2") \ No newline at end of file diff --git a/publish.sbt b/publish.sbt new file mode 100644 index 0000000..86c48bd --- /dev/null +++ b/publish.sbt @@ -0,0 +1,18 @@ +publishTo <<= version { v: String => + val nexus = "https://oss.sonatype.org/" + if (v.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots") + else Some("releases" at nexus + "service/local/staging/deploy/maven2") +} + +publishMavenStyle := true + +publishArtifact in Test := false + +pomIncludeRepository := { _ => false } + +pomExtra := + Helpers.generatePomExtra("git@github.com:sbt/sbt-boilerplate.git", + "scm:git:git@github.com:sbt/sbt-boilerplate.git", + "jrudolph", "Johannes Rudolph") + +useGpg := true -- cgit v1.2.3