Skip to content
This repository was archived by the owner on Oct 4, 2019. It is now read-only.

Commit ae65a32

Browse files
author
Simeon H.K. Fitch
committed
Updating plugins and cleaning up build configuration in preparation for next release.
1 parent 6bc099b commit ae65a32

11 files changed

+35
-30
lines changed

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
[![Join the chat at https://gitter.im/sbt/sbt-site](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/sbt/sbt-site?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
55

6+
[ ![Download](https://api.bintray.com/packages/sbt/sbt-plugin-releases/sbt-site-imported/images/download.svg) ](https://bintray.com/sbt/sbt-plugin-releases/sbt-site-imported/_latestVersion)
7+
68
This is an sbt plugin that can generate project websites.
79

810
It is designed to work hand-in-hand with publishing plugins like [sbt-ghpages].
@@ -11,7 +13,7 @@ It is designed to work hand-in-hand with publishing plugins like [sbt-ghpages].
1113
Add this to your `project/plugins.sbt`:
1214

1315
```
14-
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1")
16+
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.2")
1517
```
1618

1719
_Note: this requires sbt 0.13 - for sbt 0.12 see the [0.7.2 version][old] of this plugin._

build.sbt

+4-24
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,17 @@
1-
import com.typesafe.sbt.SbtGit._
2-
import bintray.Keys._
3-
4-
bintrayPublishSettings
5-
6-
publishMavenStyle := false
7-
8-
bintrayOrganization in bintray := Some("sbt")
9-
10-
name in bintray := "sbt-site"
11-
12-
repository in bintray := "sbt-plugin-releases"
13-
14-
licenses += ("BSD 3-Clause", url("http://opensource.org/licenses/BSD-3-Clause"))
151

162
sbtPlugin := true
173

184
name := "sbt-site"
195

206
organization := "com.typesafe.sbt"
217

22-
scalaVersion := "2.10.4"
8+
licenses += ("BSD 3-Clause", url("http://opensource.org/licenses/BSD-3-Clause"))
239

24-
versionWithGit
10+
scalaVersion := "2.10.6"
2511

26-
git.baseVersion := "1.0"
12+
scalaVersion in Global := "2.10.6"
2713

28-
scalaVersion in Global := "2.10.4"
14+
scalacOptions ++= Seq("-deprecation", "-unchecked")
2915

3016
resolvers += "sonatype-releases" at "https://oss.sonatype.org/service/local/repositories/releases/content/"
3117

@@ -36,12 +22,6 @@ libraryDependencies ++= Seq(
3622
"org.asciidoctor" % "asciidoctorj" % "1.5.2"
3723
)
3824

39-
site.settings
40-
41-
site.sphinxSupport()
42-
4325
scriptedSettings
4426

4527
scriptedLaunchOpts += "-Dproject.version="+version.value
46-
47-
scalacOptions ++= Seq("-deprecation", "-unchecked")

notes/release-process.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Release Process Outline
2+
1. Run `git clean -fdx`. This makes sure there are no unexpected dependencies or artifacts that could affect the build.
3+
2. Create a branch to do the release work on. Something like `release-<X>.<Y>.<Z>` is good.
4+
3. Write release notes in Markdown with filename `notes/<X>.<Y>.markdown`. Go through the commit logs and collect the major new features, bug fixes, deprecations, and anything else relevant to users. Making note of breaking changes is particularly important.
5+
4. Run `git tag -u <GPG key id> v<X>.<Y>.<Z> && git push`. This creates the tag that the `sbt-git` plugin will use to extract the artifact version number and publishes it. Providing a GPG key is just good form. [Here's some documention](http://www.dewinter.com/gnupg_howto/english/GPGMiniHowto-3.html) on how to get set up to have one.
6+
5. Run `sbt scripted publish`. Executes the tests first and then stages the binary in Bintray. [See SBT documentation](http://www.scala-sbt.org/0.13/docs/Bintray-For-Plugins.html) on how to get set up with Bintray.
7+
6. Confirm the plugin is properly staged for release on Bintray. The Bintray page for `sbt-pom-reader` is [here](https://bintray.com/sbt/sbt-plugin-releases/sbt-site-imported/view).
8+
7. Run `sbt bintrayRelease`. This moves the plugin from the staged release to published release on Bintray.
9+
8. Update `git.baseVersion` to next release.
10+
9. Update `README.md` to reference new binary version.
11+
10. Commit and push.
12+
11. Edit Bintray info to point to release notes on Github.
13+
12. Create a release entry in GitHub

project/bintray.sbt

-1
This file was deleted.

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.8
1+
sbt.version=0.13.9

project/git.sbt

-1
This file was deleted.

project/plugins.sbt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
2+
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")
3+
libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value

project/scripted.sbt

-1
This file was deleted.

project/site.sbt

-1
This file was deleted.

release.sbt

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
publishMavenStyle := false
2+
3+
bintrayOrganization := Some("sbt")
4+
5+
bintrayRepository := "sbt-plugin-releases"
6+
7+
bintrayReleaseOnPublish in ThisBuild := false

version.sbt

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
enablePlugins(GitVersioning)
2+
enablePlugins(GitBranchPrompt)
3+
4+
git.baseVersion := "0.8"

0 commit comments

Comments
 (0)