From c0f86d367a6445393d1884fd2f410147fa0cd1d4 Mon Sep 17 00:00:00 2001 From: Ignacio Lucero Date: Tue, 10 Jan 2023 17:28:06 +0100 Subject: [PATCH] Update various library dependencies. Today I closed the old dependency update PRs in this repo, hoping that a manual trigger of the steward would re-open them, and merge them automatically, after our the changes from 066e820. But what happens instead was that no new dependency updates PRs are created, because the steward detects the closed PRs and that blocks is somehow. For that reason, these versions need manual update now. They should henceforth get back to being updated automatically. Signed-off-by: Ignacio Lucero --- .scalafmt.conf | 2 +- build.sbt | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index f9175ba..80e25f0 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.5.9 +version = 3.6.1 runner.dialect = scala213 align.preset = more maxColumn = 140 diff --git a/build.sbt b/build.sbt index b8ce7e9..0d190ea 100644 --- a/build.sbt +++ b/build.sbt @@ -39,7 +39,7 @@ lazy val library = new { val scalaCheck = "1.17.0" val scalaTest = "3.2.15" val scalaTestPlusCheck = "3.2.2.0" - val scapeGoat = "1.4.15" + val scapeGoat = "1.4.17" } val scalaPB = "com.thesamet.scalapb" %% "scalapb-runtime" % Version.scalaPB @@ -66,7 +66,7 @@ lazy val commonSettings = Seq.concat( lazy val compilerSettings = Seq( scalaVersion := crossScalaVersions.value.head, - crossScalaVersions := List("2.13.8", "2.12.16"), + crossScalaVersions := List("2.13.10", "2.12.17"), Compile / packageBin / mappings += (ThisBuild / baseDirectory).value / "LICENSE" -> "LICENSE", scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 12)) => scalacOptions_2_12 diff --git a/project/build.properties b/project/build.properties index 22af262..6a9f038 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.1 +sbt.version=1.7.3 diff --git a/project/plugins.sbt b/project/plugins.sbt index 8d4878d..da6cc52 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ // Formatting in scala // See .scalafmt.conf for configuration details. // Formatting takes place before the project is compiled. -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") // Use git in sbt, show git prompt and use versions from git. // sbt> git @@ -21,7 +21,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0") // Uses protoc to generate code from proto files. This SBT plugin is meant supercede sbt-protobuf and sbt-scalapb. addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6") -libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.11" +libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.12" addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.15")