Merge pull request #631 from scala-steward/update/sbt-1.5.8

Bump versions, scala-xml conditional depending on Scala version, sbt-ci-release

.travis.yml

@@ -3,6 +3,9 @@ import: scala/scala-dev:travis/default.yml
 
 language: scala
 
+before_install:
+  - git fetch --tags
+
 git:
   depth: false # Avoid sbt-dynver not seeing the tag
 
@@ -25,12 +28,12 @@ jobs:
       jdk: openjdk11
     - stage: publish
       name: "Publish artifacts to Sonatype"
-      script: sbt +publish
+      script: sbt ci-release
 
 stages:
   - name: test
   - name: publish
-    if: (tag IS present) AND NOT fork
+    if: ((branch = main AND type = push) OR (tag IS present)) AND NOT fork
 
 branches:
   only:

build.sbt

@@ -18,11 +18,7 @@ ThisBuild / dynverVTagPrefix := false
 // Sanity-check: assert that version comes from a tag (e.g. not a too-shallow clone)
 // https://github.com/dwijnand/sbt-dynver/#sanity-checking-the-version
 Global / onLoad := (Global / onLoad).value.andThen { s =>
-  val v = version.value
-  if (dynverGitDescribeOutput.value.hasNoTags)
-    throw new MessageOnlyException(
-      s"Failed to derive version from git tags. Maybe run `git fetch --unshallow`? Version: $v"
-    )
+  dynverAssertTagVersion.value
   s
 }
 
@@ -79,7 +75,6 @@ lazy val mimaSettings = Seq(
 )
 
 lazy val commonSettings = Def.settings(
-  // sonatypeProfileName := "com.typesafe",  // TODO uncomment when we add sbt-ci-release
   organization := "com.typesafe.play",
   organizationName := "Lightbend Inc.",
   organizationHomepage := Some(url("https://www.lightbend.com/")),
@@ -364,7 +359,7 @@ lazy val `play-ws-standalone-xml` = project
   .settings(
     Test / fork := true,
     Test / testOptions := Seq(Tests.Argument(TestFrameworks.JUnit, "-a", "-v")),
-    libraryDependencies ++= standaloneAhcWSXMLDependencies
+    libraryDependencies ++= standaloneAhcWSXMLDependencies(scalaVersion.value)
   )
   .settings(AutomaticModuleName.settings("play.ws.standalone.xml"))
   .dependsOn(
@@ -422,9 +417,6 @@ lazy val root = project
   .disablePlugins(MimaPlugin, sbtassembly.AssemblyPlugin)
   .settings(
     name := "play-ws-standalone-root",
-    // otherwise same as orgname, and "sonatypeList"
-    // says "No staging profile is found for com.typesafe.play"
-//    sonatypeProfileName := "com.typesafe"
   )
   .settings(commonSettings)
   .settings(publish / skip := true)

project/Dependencies.scala

@@ -27,19 +27,24 @@ object Dependencies {
 
   val scalaJava8Compat = Seq("org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2")
 
-  val playJson = Seq("com.typesafe.play" %% "play-json" % "2.9.2")
+  val playJson = Seq("com.typesafe.play" %% "play-json" % "2.10.0-RC5")
 
   val slf4jApi = Seq("org.slf4j" % "slf4j-api" % "1.7.32")
 
   val javaxInject = Seq("javax.inject" % "javax.inject" % "1")
 
   val sslConfigCore = Seq("com.typesafe" %% "ssl-config-core" % "0.6.0")
 
-  val scalaXml = Seq("org.scala-lang.modules" %% "scala-xml" % "2.0.1")
+  def scalaXml(scalaVersion: String) = Seq("org.scala-lang.modules" %% "scala-xml" % {
+    CrossVersion.partialVersion(scalaVersion) match {
+      case Some((2, _)) => "1.3.0"
+      case _            => "2.0.1"
+    }
+  })
 
   val oauth = Seq("oauth.signpost" % "signpost-core" % "2.1.1")
 
-  val cachecontrol = Seq("com.typesafe.play" %% "cachecontrol" % "2.1.0")
+  val cachecontrol = Seq("com.typesafe.play" %% "cachecontrol" % "2.2.0")
 
   val asyncHttpClient = Seq("org.asynchttpclient" % "async-http-client" % "2.12.3")
 
@@ -56,6 +61,6 @@ object Dependencies {
 
   val standaloneAhcWSJsonDependencies = playJson ++ testDependencies
 
-  val standaloneAhcWSXMLDependencies = scalaXml ++ testDependencies
+  def standaloneAhcWSXMLDependencies(scalaVersion: String) = scalaXml(scalaVersion) ++ testDependencies
 
 }

project/build.properties

@@ -1,4 +1,4 @@
 #
 # Copyright (C) Lightbend Inc. <https://www.lightbend.com>
 #
-sbt.version=1.5.8
+sbt.version=1.6.1

project/plugins.sbt

@@ -3,4 +3,4 @@ addSbtPlugin("org.scalameta"      % "sbt-scalafmt"    % "2.4.6")
 addSbtPlugin("com.typesafe"       % "sbt-mima-plugin" % "1.0.1")
 addSbtPlugin("de.heikoseeberger"  % "sbt-header"      % "5.6.0")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh"         % "0.4.3")
-addSbtPlugin("com.dwijnand"       % "sbt-dynver"      % "4.1.1")
+addSbtPlugin("com.github.sbt"     % "sbt-ci-release"  % "1.5.10")