From e3f1ad0335b763056e598d97c64cc7f0186c68f8 Mon Sep 17 00:00:00 2001 From: Christian Freitas Date: Tue, 20 Sep 2022 08:19:10 -0400 Subject: [PATCH] BT-745 Batch 2 of scala steward updates (#6906) * Update SBT to 2.0.0 * Fix sbt-git import * Update mouse to 1.0.11 * Update rhino 1.7.14 --- project/Dependencies.scala | 6 ++++-- project/Version.scala | 3 ++- project/plugins.sbt | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index fadd662d2f3..21c50b77e10 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -77,7 +77,8 @@ object Dependencies { private val mockFtpServerV = "3.0.0" private val mockitoV = "3.12.4" private val mockserverNettyV = "5.14.0" - private val mouseV = "1.0.10" + private val mouseV = "1.0.11" + /* Newer version 8.0.29 fails `Control characters should work with metadata` Centaur tests, has charset changes mentioned in release notes https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-29.html#mysqld-8-0-29-charset @@ -89,7 +90,8 @@ object Dependencies { private val pprintV = "0.7.1" private val rdf4jV = "3.7.1" private val refinedV = "0.9.29" - private val rhinoV = "1.7.13" + private val rhinoV = "1.7.14" + private val scalaCollectionCompatV = "2.5.0" private val scalaGraphV = "1.13.1" private val scalaLoggingV = "3.9.4" diff --git a/project/Version.scala b/project/Version.scala index c0bdb0b3453..dbe795e6f0c 100644 --- a/project/Version.scala +++ b/project/Version.scala @@ -1,7 +1,8 @@ import Dependencies._ -import com.typesafe.sbt.SbtGit._ +import com.github.sbt.git.SbtGit._ import sbt.Keys._ import sbt._ +import com.github.sbt.git.SbtGit object Version { // Upcoming release, or current if we're on a master / hotfix branch diff --git a/project/plugins.sbt b/project/plugins.sbt index 51289a45e53..cef75cd05b3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.9.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0") -addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2") +addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.0") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3") addDependencyTreePlugin