Merge pull request #396 from sbt/wip/bump

Bump to sbt-git 2.1.0

Author: eed3si9n

build.sbt

@@ -1,5 +1,5 @@
 lazy val scala212 = "2.12.20"
-lazy val scala3 = "3.3.6"
+lazy val scala3 = "3.7.2"
 
 inThisBuild(
   List(
@@ -37,11 +37,11 @@ lazy val plugin = project
     (pluginCrossBuild / sbtVersion) := {
       scalaBinaryVersion.value match {
         case "2.12" => "1.5.8"
-        case _      => "2.0.0-M2"
+        case _      => "2.0.0-RC3"
       }
     },
     libraryDependencies += "org.scalameta" %% "munit" % "1.0.3" % Test,
-    addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0"),
+    addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.1"),
     addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0"),
     addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
   )

plugin/src/main/scala-2.12/com/geirsson/PluginCompat.scala

@@ -0,0 +1,9 @@
+package com.geirsson
+
+import sbt.*
+
+object PluginCompat {
+  implicit class DefOp(singleton: Def.type) {
+    def uncached[A1](a: A1): A1 = a
+  }
+}

plugin/src/main/scala-3/com/geirsson/PluginCompat.scala

@@ -0,0 +1,3 @@
+package com.geirsson
+
+object PluginCompat

plugin/src/main/scala/com/geirsson/CiReleasePlugin.scala

@@ -1,6 +1,7 @@
 package com.geirsson
 
 import com.geirsson.PipeFail.PipeFailOps
+import PluginCompat.*
 import com.github.sbt.git.GitPlugin
 import com.github.sbt.git.SbtGit.GitKeys
 import com.jsuereth.sbtpgp.SbtPgp
@@ -217,9 +218,9 @@ object CiReleasePlugin extends AutoPlugin {
   override lazy val projectSettings: Seq[Def.Setting[_]] = List(
     version := (ThisBuild / version).value,
     publishConfiguration :=
-      publishConfiguration.value.withOverwrite(true),
+      Def.uncached(publishConfiguration.value.withOverwrite(true)),
     publishLocalConfiguration :=
-      publishLocalConfiguration.value.withOverwrite(true),
+      Def.uncached(publishLocalConfiguration.value.withOverwrite(true)),
     publishTo := {
       val orig = (ThisBuild / publishTo).value
       (orig, localStaging.?.value) match {