From d2b4774c156f48c4506e14ced44397236f0adfc1 Mon Sep 17 00:00:00 2001 From: Yisrael Union Date: Mon, 22 Jul 2024 16:25:21 -0400 Subject: [PATCH] Sbt git upgrade (#896) * fix entaglement of dependencies on old version of sbt-git * add colored prompt * upgraded sbt-tpolecat * revert tpolecat upgrade -defer for later * remove unnecessary sbt build change --- build.sbt | 17 ++++++++--------- project/MimaVersionPlugin.scala | 5 +++-- project/plugins.sbt | 5 ++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/build.sbt b/build.sbt index c6145eb3..b4c7b764 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,3 @@ -import com.scalapenos.sbt.prompt.SbtPrompt.autoImport._ -import com.scalapenos.sbt.prompt._ import Dependencies._ import microsites.ExtraMdFileConfig @@ -9,6 +7,14 @@ ThisBuild / evictionErrorLevel := Level.Info ThisBuild / mimaBaseVersion := "1.7.0" Test / parallelExecution := false +val blue = "\u001b[34m" +val reset = "\u001b[0m" + +def coloredPrompt(state: String, color: String): String = + s"$color$state$reset" + +ThisBuild / shellPrompt := { state => s"${coloredPrompt("[sbt]", blue)} redis4cats λ " } + // publishing ThisBuild / organization := "dev.profunktor" ThisBuild / homepage := Some(url("https://redis4cats.profunktor.dev/")) @@ -24,13 +30,6 @@ ThisBuild / developers := List( Global / onChangedBuildSource := ReloadOnSourceChanges -promptTheme := PromptTheme( - List( - text("[sbt] ", fg(105)), - text(_ => "redis4cats", fg(15)).padRight(" λ ") - ) -) - def pred[A](p: Boolean, t: => Seq[A], f: => Seq[A]): Seq[A] = if (p) t else f diff --git a/project/MimaVersionPlugin.scala b/project/MimaVersionPlugin.scala index d0bfa33e..3edb469c 100644 --- a/project/MimaVersionPlugin.scala +++ b/project/MimaVersionPlugin.scala @@ -1,5 +1,6 @@ -import com.typesafe.sbt.GitPlugin -import com.typesafe.sbt.SbtGit.git +import com.github.sbt.git.SbtGit.{ git, GitKeys } +import com.github.sbt.git.GitPlugin +import com.github.sbt.git.GitRunner import com.typesafe.tools.mima.plugin.MimaPlugin import com.typesafe.tools.mima.plugin.MimaPlugin.autoImport.* import sbt.* diff --git a/project/plugins.sbt b/project/plugins.sbt index 3d6790ec..3dc11d20 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,12 +1,11 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4") +addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4") -addSbtPlugin("com.scalapenos" % "sbt-prompt" % "1.0.2") addSbtPlugin("com.github.sbt" % "sbt-site" % "1.7.0") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")