Merge branch 'main' into alejandrohdezma-patch-1

Author: eed3si9n

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.8.5
+a4e980b0ca9ce4224e84650dff1bf9d44fba3815

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yml

@@ -7,26 +7,41 @@ on:
   - cron: '0 7 * * 6'
 jobs:
   build:
+    strategy:
+      matrix:
+        include:
+          - java: 8
+            distribution: temurin
+            sbt: 1
+          - java: 17
+            distribution: temurin
+            sbt: 2
     runs-on: ubuntu-latest
     env:
       # define Java options for both official sbt and sbt-extras
       JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
       JVM_OPTS:  -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v5
+      with:
+        fetch-depth: 0
     - name: Setup Scala
-      uses: olafurpg/setup-scala@v10
+      uses: actions/setup-java@v5
       with:
-        java-version: "adopt@1.8"
-    - name: Coursier cache
-      uses: coursier/cache-action@v5
-    - name: Build and test
+        distribution: "${{ matrix.distribution }}"
+        java-version: "${{ matrix.java }}"
+        cache: sbt
+    - uses: sbt/setup-sbt@v1
+    - name: Build and test (sbt 1.x)
+      if: ${{ matrix.sbt == 1 }}
+      shell: bash
+      run: |
+        gpg --import test-key.gpg
+        sbt -v ++2.12.x clean scalafmtSbtCheck scalafmtCheckAll test scripted
+    - name: Build and test (sbt 2.x)
+      if: ${{ matrix.sbt == 2 }}
+      shell: bash
       run: |
         gpg --import test-key.gpg
-        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
-        find $HOME/.cache/coursier/v1                -name "ivydata-*.properties" -delete || true
-        find $HOME/.sbt
+        sbt -v ++3.x clean scalafmtCheckAll test scripted

.github/workflows/publish.yml

@@ -14,19 +14,22 @@ jobs:
       JVM_OPTS:  -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-    - name: Coursier cache
-      uses: coursier/cache-action@v5
-    - name: Test
-      run: |
-        sbt +test +packagedArtifacts
+      uses: actions/checkout@v5
+      with:
+        fetch-depth: 0
+    - name: Setup JDK
+      uses: actions/setup-java@v5
+      with:
+        distribution: temurin
+        java-version: 17
+        cache: sbt
+    - uses: sbt/setup-sbt@v1
     - name: Release
       env:
         SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
         SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
         PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         PGP_SECRET: ${{ secrets.PGP_SECRET }}
         CI_CLEAN: clean
-        CI_RELEASE: +publishSigned
       run: |
         sbt ci-release

.gitignore

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

.java-version

@@ -1,4 +1,5 @@
 updates.pin  = [
   # JGit 6 requires Java 11, see #213
-  { groupId = "org.eclipse.jgit", artifactId = "org.eclipse.jgit", version = "5." }
+  { groupId = "org.eclipse.jgit", artifactId = "org.eclipse.jgit", version = "5." },
+  { groupId = "org.scala-lang", artifactId = "scala-library", version = "2.12." }
 ]

.scala-steward.conf

@@ -0,0 +1,10 @@
+version = "3.10.7"
+maxColumn = 150
+align.tokens = []
+docstrings.wrap = keep
+docstrings.oneline = keep
+docstrings.style = keep
+docstrings.forceBlankLineBefore = false
+runner.dialect = Scala212Source3
+rewrite.scala3.convertToNewSyntax = true
+rewrite.scala3.newSyntax.control = false

.scalafmt.conf

@@ -72,7 +72,7 @@ You can begin to use git to control your project versions.
 The git plugin will now autogenerate your version using the following rules, in order:
 
 1. Looks at version-property setting (default to `project.version`), and checks the `sys.props` to see if this has a value.  If so, use it.
-2. Otherwise, looks at the project tags. The first to match the `gitTagToVersionNumberSetting` is used to assign the version.  The default is to look for tags that begin with `v` and a number, and use the number as the version. If there are multiple version tags, it will pick the highest.
+2. Otherwise, looks at the project tags. The first to match the `gitTagToVersionNumber` setting is used to assign the version.  The default is to look for tags that begin with `v` and a number, and use the number as the version. If there are multiple version tags, it will pick the highest.
 3. If no tags are found either, look at the head commit. We attach this to the `git.baseVersion` setting: "<base-version>.<git commit sha>"
 4. If no head commit is present either (which means this is a brand-new repository with no commits yet), we append the current timestamp to the base version: "<base-version>.<timestamp>".
 

README.md

@@ -1,5 +1,4 @@
 organization := "com.github.sbt"
-sonatypeProfileName := "com.github.sbt"
 name := "sbt-git"
 licenses := Seq(("BSD-2-Clause", url("https://opensource.org/licenses/BSD-2-Clause")))
 description := "An sbt plugin that offers git features directly inside sbt"
@@ -8,15 +7,36 @@ startYear := Some(2011)
 homepage := scmInfo.value map (_.browseUrl)
 scmInfo := Some(ScmInfo(url("https://github.com/sbt/sbt-git"), "scm:git:git@github.com:sbt/sbt-git.git"))
 
-crossSbtVersions := List("1.3.13")
+lazy val scala212 = "2.12.21"
+lazy val scala3 = "3.8.1"
+
+crossScalaVersions := Seq(scala212, scala3)
 
 enablePlugins(GitVersioning, SbtPlugin)
 git.baseVersion := "1.0"
 
 libraryDependencies ++= Seq(
-  "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.1.202206130422-r",
-  "com.michaelpollmeier" % "versionsort" % "1.0.11",
-  "org.scalameta" %% "munit" % "0.7.29" % Test
+  "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.5.202508271544-r",
+  "com.michaelpollmeier" % "versionsort" % "1.0.17",
+  "org.scalameta" %% "munit" % "1.2.2" % Test
 )
 
+(pluginCrossBuild / sbtVersion) := {
+  scalaBinaryVersion.value match {
+    case "2.12" => "1.5.8"
+    case _ => "2.0.0-RC9"
+  }
+}
+
+scalacOptions ++= {
+  scalaBinaryVersion.value match {
+    case "2.12" =>
+      Seq(
+        "-release:8"
+      )
+    case "3" =>
+      Nil
+  }
+}
+
 scriptedLaunchOpts += s"-Dproject.version=${version.value}"