Skip to content

Commit

Permalink
Merge pull request #123 from sbt/sbt-updates
Browse files Browse the repository at this point in the history
sbt updates
  • Loading branch information
jonas authored Feb 4, 2018
2 parents 9af906b + c79b692 commit 8ee84e3
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ dist: trusty
jdk: oraclejdk8
matrix:
include:
- env: SBT_CROSS_VERSION="0.13.16"
- env: SBT_CROSS_VERSION="1.0.2"
- env: SBT_CROSS_VERSION="0.13.17"
- env: SBT_CROSS_VERSION="1.0.4"

addons:
apt:
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name := "sbt-site"
organization := "com.typesafe.sbt"

version := "1.3.2-SNAPSHOT"
crossSbtVersions := List("0.13.16", "1.0.2")
crossSbtVersions := List("0.13.17", "1.0.4")

licenses += ("BSD 3-Clause", url("https://opensource.org/licenses/BSD-3-Clause"))
//#scm-info
Expand All @@ -31,7 +31,7 @@ libraryDependencies ++= Seq(
"org.asciidoctor" % "asciidoctorj" % "1.5.4"
)

addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.3.1")
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.3.2")

libraryDependencies ++= {
if ((sbtBinaryVersion in pluginCrossBuild).value == "0.13") {
Expand Down
14 changes: 14 additions & 0 deletions notes/1.3.2.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Release 1.3.2

See the [1.3.2 milestone] for the full list of related tickets and PRs.

## Enhancements

1. Bump sbt to 0.13.17 and 1.0.4. [#123] ([@jonas])
2. Bump Paradox to version [0.3.2][paradox-0.3.2]. ([@jonas])

[1.3.2 milestone]: https://github.com/sbt/sbt-site/milestone/6
[#123]: https://github.com/sbt/sbt-site/pull/123
[paradox-0.3.2]: https://github.com/lightbend/paradox/releases/tag/v0.3.2

[@jonas]: https://github.com/jonas
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.0.2
sbt.version=1.1.0
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.1")
//#sbt-ghpages
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")
//#sbt-ghpages
addSbtPlugin("io.github.jonas" % "sbt-paradox-material-theme" % "0.3.0")
addSbtPlugin("io.github.jonas" % "sbt-paradox-material-theme" % "0.4.0")

libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value

0 comments on commit 8ee84e3

Please sign in to comment.