Skip to content

Commit

Permalink
Merge pull request #1738 from scala-steward/update/sbt-ci-release-1.5.12
Browse files Browse the repository at this point in the history
Update sbt-ci-release to 1.5.12
  • Loading branch information
blast-hardcheese committed Oct 19, 2023
2 parents 30d4bde + 769267b commit 58ba009
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion project/ci-release.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
2 changes: 1 addition & 1 deletion project/microsite.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4")
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3")
5 changes: 3 additions & 2 deletions project/src/main/scala/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down Expand Up @@ -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*"),
Expand Down

0 comments on commit 58ba009

Please sign in to comment.