Add support for Scala 3 crossbuilds, raise min version to 1.5.8

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Build and test
       run: |
         gpg --import test-key.gpg
-        sbt -v clean ^test ^scripted
+        sbt -v clean test scripted
         rm -rf "$HOME/.ivy2/local" || true
         find $HOME/Library/Caches/Coursier/v1        -name "ivydata-*.properties" -delete || true
         find $HOME/.ivy2/cache                       -name "ivydata-*.properties" -delete || true

.gitignore

@@ -1,8 +1,10 @@
 *~
 target/
 .idea/
+.bsp/
 /bin/
 /.settings/
 /.cache
 /.classpath
 /.project
+metals.sbt

build.sbt

@@ -8,7 +8,10 @@ startYear := Some(2011)
 homepage := scmInfo.value map (_.browseUrl)
 scmInfo := Some(ScmInfo(url("https://github.com/sbt/sbt-git"), "scm:git:[email protected]:sbt/sbt-git.git"))
 
-crossSbtVersions := List("1.3.13")
+lazy val scala212 = "2.12.20"
+lazy val scala3 = "3.3.4"
+
+crossScalaVersions := Seq(scala212, scala3)
 
 enablePlugins(GitVersioning, SbtPlugin)
 git.baseVersion := "1.0"
@@ -19,4 +22,11 @@ libraryDependencies ++= Seq(
   "org.scalameta" %% "munit" % "1.0.2" % Test
 )
 
+(pluginCrossBuild / sbtVersion) := {
+  scalaBinaryVersion.value match {
+    case "2.12" => "1.5.8"
+    case _      => "2.0.0-M2"
+  }
+}
+
 scriptedLaunchOpts += s"-Dproject.version=${version.value}"

src/main/scala/com/github/sbt/git/ConsoleGitRunner.scala

@@ -1,8 +1,9 @@
 package com.github.sbt.git
 
-import sbt._
-import Keys._
-import sys.process.{ Process, ProcessLogger }
+import sbt.*
+import sbt.internal.util.Terminal
+
+import sys.process.{Process, ProcessLogger}
 
 /** A mechanism of running git that simply shells out to the console. */
 object ConsoleGitRunner extends GitRunner {
@@ -17,14 +18,14 @@ object ConsoleGitRunner extends GitRunner {
 
   // in order to enable colors we trick git into thinking we're a pager, because it already knows we're not a tty
   val colorSupport: Seq[(String, String)] =
-    if(ConsoleLogger.formatEnabled) Seq("GIT_PAGER_IN_USE" -> "1")
+    if(Terminal.console.isAnsiSupported) Seq("GIT_PAGER_IN_USE" -> "1")
     else Seq.empty
 
   override def apply(args: String*)(cwd: File, log: Logger = ConsoleLogger()): String = {
     val gitLogger = new GitLogger(log)
     IO.createDirectory(cwd)
     val full = cmd ++ args
-    log.debug(cwd + "$ " + full.mkString(" "))
+    log.debug(cwd.toString + "$ " + full.mkString(" "))
     val code = Process(full, cwd, colorSupport :_*) ! gitLogger
     val result = gitLogger.flush(code)
     if(code != 0)

src/main/scala/com/github/sbt/git/GitPlugin.scala

@@ -2,7 +2,6 @@ package com.github.sbt.git
 
 import sbt._
 import Keys._
-import sys.process.Process
 
 /** This plugin has all the basic 'git' functionality for other plugins. */
 object SbtGit {
@@ -170,7 +169,7 @@ object SbtGit {
   def useJGit: Setting[_] = ThisBuild / gitRunner := JGitRunner
 
   /** Setting to use console git for readable ops, to allow working with git worktrees */
-  def useReadableConsoleGit: Setting[_] = useConsoleForROGit in ThisBuild := true
+  def useReadableConsoleGit: Setting[_] = ThisBuild / useConsoleForROGit := true
 
   /** Adapts the project prompt to show the current project name *and* the current git branch. */
   def showCurrentGitBranch: Setting[_] =

src/main/scala/com/github/sbt/git/JGit.scala

@@ -29,13 +29,13 @@ final class JGit(val repo: Repository) extends GitReadonlyInterface {
   def branch: String = repo.getBranch
 
   private def branchesRef: Seq[Ref] = {
-    import collection.JavaConverters._
-    porcelain.branchList.call.asScala
+    import scala.jdk.CollectionConverters._
+    porcelain.branchList.call.asScala.toSeq
   }
 
   def tags: Seq[Ref] = {
-    import collection.JavaConverters._
-    porcelain.tagList.call().asScala
+    import scala.jdk.CollectionConverters._
+    porcelain.tagList.call().asScala.toSeq
   }
 
   def checkoutBranch(branch: String): Unit = {
@@ -59,7 +59,7 @@ final class JGit(val repo: Repository) extends GitReadonlyInterface {
     headCommit map (_.name)
 
   def currentTags: Seq[String] = {
-    import collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     for {
       hash <- headCommit.map(_.name).toSeq
       unpeeledTag <- tags
@@ -96,14 +96,14 @@ final class JGit(val repo: Repository) extends GitReadonlyInterface {
   override def branches: Seq[String] = branchesRef.filter(_.getName.startsWith("refs/heads")).map(_.getName.drop(11))
 
   override def remoteBranches: Seq[String] = {
-    import collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     import org.eclipse.jgit.api.ListBranchCommand.ListMode
-    porcelain.branchList.setListMode(ListMode.REMOTE).call.asScala.filter(_.getName.startsWith("refs/remotes")).map(_.getName.drop(13))
+    porcelain.branchList.setListMode(ListMode.REMOTE).call.asScala.filter(_.getName.startsWith("refs/remotes")).map(_.getName.drop(13)).toSeq
   }
 
   override def remoteOrigin: String = {
     // same functionality as Process("git ls-remote --get-url origin").lines_!.head
-    import collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     porcelain.remoteList().call.asScala
       .filter(_.getName == "origin")
       .flatMap(_.getURIs.asScala)

src/main/scala/com/github/sbt/git/NullLogger.scala

@@ -5,9 +5,9 @@ import sbt.Level
 import sbt.ControlEvent
 
 object NullLogger extends sbt.BasicLogger {
-  override def control(event: ControlEvent.Value, message: ⇒ String): Unit = ()
-  override def log(level: Level.Value, message: ⇒ String): Unit = ()
+  override def control(event: ControlEvent.Value, message: => String): Unit = ()
+  override def log(level: Level.Value, message: => String): Unit = ()
   override def logAll(events: Seq[LogEvent]): Unit = ()
-  override def success(message: ⇒ String): Unit = ()
-  override def trace(t: ⇒ Throwable): Unit = ()
-}
+  override def success(message: => String): Unit = ()
+  override def trace(t: => Throwable): Unit = ()
+}