Upgrade sbt 2 to m3

limansky · Jan 19, 2025 · ce701d3 · ce701d3
1 parent 756ae02
commit ce701d3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -3,7 +3,7 @@ import ReleaseTransformations._
 Global / excludeLintKeys += crossSbtVersions
 
 val scala2 = "2.12.20"
-val scala3 = "3.3.4"
+val scala3 = "3.6.2"
 
 lazy val sbtGitFlowVersion = (project in file("."))
   .enablePlugins(SbtPlugin)
@@ -30,7 +30,7 @@ lazy val sbtGitFlowVersion = (project in file("."))
     pluginCrossBuild / sbtVersion := {
       scalaBinaryVersion.value match {
         case "2.12" => "1.2.8"
-        case _      => "2.0.0-M2"
+        case _      => "2.0.0-M3"
       }
     },
     buildSettings,

diff --git a/src/main/scala/sbtgitflowversion/BranchMatcher.scala b/src/main/scala/sbtgitflowversion/BranchMatcher.scala
@@ -22,7 +22,7 @@ object BranchMatcher {
   def prefix(p: String): BranchMatcher =
     new BranchMatcher {
       override def apply(branch: String): Option[Matching] = {
-        if (branch startsWith p) {
+        if (branch `startsWith` p) {
           Some(Matching(branch, Some(branch.substring(p.length))))
         } else None
       }

diff --git a/src/main/scala/sbtgitflowversion/GitFlowVersionPlugin.scala b/src/main/scala/sbtgitflowversion/GitFlowVersionPlugin.scala
@@ -24,7 +24,7 @@ object GitFlowVersionPlugin extends AutoPlugin {
     type VersionCalculator = sbtgitflowversion.VersionCalculator
   }
 
-  override def projectSettings: Seq[Def.Setting[_]] = {
+  override def projectSettings: Seq[Def.Setting[?]] = {
     import GitFlowVersionKeys._
 
     Seq(