From bb88d6d6c4e4ca59320e5631be36860511fdc222 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 5 May 2023 17:59:44 +0000 Subject: [PATCH 1/3] Update sbt-ci-release to 1.5.12 --- project/ci-release.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/ci-release.sbt b/project/ci-release.sbt index ae3b90882b..82cb2620f6 100644 --- a/project/ci-release.sbt +++ b/project/ci-release.sbt @@ -1 +1 @@ -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") From 84cbd791bfbd1aed26cfb313f96c1b2d848e1417 Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Wed, 18 Oct 2023 23:41:48 -0700 Subject: [PATCH 2/3] Bumping sbt-microsites to resolve sbt-git version conflicts --- project/microsite.sbt | 2 +- project/src/main/scala/Build.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/microsite.sbt b/project/microsite.sbt index 11163f68ed..87e6e2a367 100644 --- a/project/microsite.sbt +++ b/project/microsite.sbt @@ -1 +1 @@ -addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4") +addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3") diff --git a/project/src/main/scala/Build.scala b/project/src/main/scala/Build.scala index 2cb27fd8b8..bc70b5a7c0 100644 --- a/project/src/main/scala/Build.scala +++ b/project/src/main/scala/Build.scala @@ -3,9 +3,9 @@ package dev.guardrail.sbt import sbt._ import sbt.Keys._ import scoverage.ScoverageKeys -import com.typesafe.sbt.SbtGit.GitKeys.gitReader import complete.DefaultParsers._ -import com.typesafe.sbt.SbtGit._ +import com.github.sbt.git.SbtGit._ +import com.github.sbt.git.SbtGit.GitKeys.gitReader import wartremover.WartRemover.autoImport._ import scalafix.sbt.ScalafixPlugin.autoImport._ import xerial.sbt.Sonatype.autoImport._ From 769267b2bd7d0dc5eceb6cb0340b2d952fd652ba Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Wed, 18 Oct 2023 23:42:03 -0700 Subject: [PATCH 3/3] Explicitly use console git --- project/src/main/scala/Build.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/project/src/main/scala/Build.scala b/project/src/main/scala/Build.scala index bc70b5a7c0..8aa3c610d2 100644 --- a/project/src/main/scala/Build.scala +++ b/project/src/main/scala/Build.scala @@ -120,6 +120,7 @@ object Build { def baseModule(moduleName: String, moduleSegment: String, path: File): Project = Project(id=moduleName, base=path) .settings(versionWithGit) + .settings(useReadableConsoleGit) .settings( // None of this stuff can be used because of scoping issues. Everything needs to be inlined to avoid just bubbling up to a singleton, since the keys (scopes?) are only valid at the root, not scoped per project. // git.gitDescribePatterns := Seq(s"${moduleSegment}-v*"),