Skip to content

Commit

Permalink
bump sbt and plugin versions
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidLawes committed Apr 1, 2022
1 parent 28e0b79 commit c1d82d8
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 15 deletions.
18 changes: 8 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name := "targeting-client"

organization := "com.gu"

scalaVersion := "2.13.1"
scalaVersion := "2.13.8"

scalacOptions ++= Seq("-feature", "-deprecation")

Expand All @@ -17,15 +17,13 @@ libraryDependencies ++= Seq(
playJson
)

releaseCrossBuild := true
crossScalaVersions := Seq(scalaVersion.value, "2.12.15")

crossScalaVersions := Seq(scalaVersion.value, "2.12.11")

publishArtifact in Test := false
Test / publishArtifact := false

publishMavenStyle := true

publishTo := sonatypePublishTo.value
publishTo := sonatypePublishToBundle.value

licenses := Seq("Apache V2" -> url("http://www.apache.org/licenses/LICENSE-2.0.html"))

Expand All @@ -43,8 +41,7 @@ developers := List(Developer(
url = url("https://github.com/guardian")
))

releasePublishArtifactsAction := PgpKeys.publishSigned.value

releaseCrossBuild := true // true if you cross-build the project for multiple Scala versions
releaseProcess := Seq[ReleaseStep](
checkSnapshotDependencies,
inquireVersions,
Expand All @@ -53,9 +50,10 @@ releaseProcess := Seq[ReleaseStep](
setReleaseVersion,
commitReleaseVersion,
tagRelease,
publishArtifacts,
// For non cross-build projects, use releaseStepCommand("publishSigned")
releaseStepCommandAndRemaining("+publishSigned"),
releaseStepCommand("sonatypeBundleRelease"),
setNextVersion,
commitNextVersion,
releaseStepCommand("sonatypeReleaseAll"),
pushChanges
)
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.9
sbt.version=1.6.2
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.12")

addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "1.1.1-SNAPSHOT"
ThisBuild / version := "1.1.1-SNAPSHOT"

0 comments on commit c1d82d8

Please sign in to comment.