diff --git a/build.sbt b/build.sbt index 3b2b739..61dd995 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ name := "targeting-client" organization := "com.gu" -scalaVersion := "2.13.1" +scalaVersion := "2.13.8" scalacOptions ++= Seq("-feature", "-deprecation") @@ -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")) @@ -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, @@ -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 ) \ No newline at end of file diff --git a/project/build.properties b/project/build.properties index 06703e3..c8fcab5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.9 +sbt.version=1.6.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 56a0c76..05d32d6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") \ No newline at end of file +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") \ No newline at end of file diff --git a/version.sbt b/version.sbt index ab92045..7378fbf 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "1.1.1-SNAPSHOT" +ThisBuild / version := "1.1.1-SNAPSHOT"