Skip to content

Commit dba8307

Browse files
committed
Update to sbt v1.0.0
1 parent 75d635f commit dba8307

File tree

4 files changed

+36
-24
lines changed

4 files changed

+36
-24
lines changed

build.sbt

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import ReleaseTransformations._
22

33
lazy val baseSettings = Seq(
4-
scalaVersion := "2.11.7",
5-
crossScalaVersions := Seq("2.10.5", scalaVersion.value),
4+
scalaVersion := "2.11.11",
5+
crossScalaVersions := Seq(scalaVersion.value, "2.10.6"),
66
organization := "com.madgag.scala-git",
77
scmInfo := Some(ScmInfo(
88
url("https://github.com/rtyley/scala-git"),
@@ -16,23 +16,28 @@ lazy val `scala-git` = project.settings(baseSettings: _*).dependsOn(`scala-git-t
1616

1717
lazy val `scala-git-test` = project.in(file("scala-git-test")).settings(baseSettings: _*)
1818

19+
releasePublishArtifactsAction in ThisBuild := PgpKeys.publishSigned.value // Use publishSigned in publishArtifacts step
20+
1921
lazy val root = (project in file(".")).aggregate(`scala-git`, `scala-git-test`).
2022
settings(baseSettings: _*).settings(
21-
publishArtifact := false,
22-
publish := {},
23-
publishLocal := {},
24-
releaseProcess := Seq[ReleaseStep](
25-
checkSnapshotDependencies,
26-
inquireVersions,
27-
runClean,
28-
runTest,
29-
setReleaseVersion,
30-
commitReleaseVersion,
31-
tagRelease,
32-
ReleaseStep(action = Command.process("publishSigned", _)),
33-
setNextVersion,
34-
commitNextVersion,
35-
ReleaseStep(action = Command.process("sonatypeReleaseAll", _)),
36-
pushChanges
37-
)
23+
publishArtifact := false,
24+
publish := {},
25+
publishLocal := {},
26+
releaseCrossBuild := true, // true if you cross-build the project for multiple Scala versions
27+
releaseProcess := Seq[ReleaseStep](
28+
checkSnapshotDependencies,
29+
inquireVersions,
30+
runClean,
31+
runTest,
32+
setReleaseVersion,
33+
commitReleaseVersion,
34+
tagRelease,
35+
publishArtifacts,
36+
setNextVersion,
37+
commitNextVersion,
38+
releaseStepCommand("sonatypeReleaseAll"),
39+
pushChanges
3840
)
41+
)
42+
43+

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.13
1+
sbt.version=1.0.0

project/plugins.sbt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.1")
1+
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
22

3-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
4-
5-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.5.1")
3+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
64

5+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")

sonatype.sbt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
sonatypeProfileName := "com.madgag"
22

3+
publishTo in ThisBuild :=
4+
Some(if (isSnapshot.value) Opts.resolver.sonatypeSnapshots else Opts.resolver.sonatypeStaging)
5+
6+
scmInfo in ThisBuild := Some(ScmInfo(
7+
url("https://github.com/rtyley/scala-git"),
8+
"scm:git:[email protected]:rtyley/scala-git.git"
9+
))
10+
311
pomExtra in ThisBuild := (
412
<url>https://github.com/rtyley/scala-git</url>
513
<developers>

0 commit comments

Comments
 (0)