add sbt 2.x cross build setting

Author: xuwei-k

.github/workflows/ci.yml

@@ -36,9 +36,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - { sbt: 1_0_0, java: 8 }
+          - { sbt: 2_x, java: 8 }
           - { sbt: latest, java: 8 }
-          - { sbt: 1_0_0, java: 11 }
           - { sbt: latest, java: 11 }
           - { sbt: latest, java: 14 }
       fail-fast: false

build.sbt

@@ -19,15 +19,25 @@ sonatypeProfileName := "com.timushev"
 
 ThisBuild / scalacOptions := Seq("-deprecation", "-unchecked", "-feature")
 
+lazy val `sbt-2` = SbtAxis("2.x", "2.0.0-M2")
+
 lazy val `sbt-1.x`    = SbtAxis("1.x", "1.1.5")
 lazy val `sbt-latest` = SbtAxis()
-lazy val `sbt-1.0.0`  = SbtAxis("1.0.0")
 
 lazy val `sbt-updates` = (projectMatrix in file("."))
   .settings(libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.19" % "test")
   .sbtPluginRow(`sbt-1.x`)
-  .sbtScriptedRow(`sbt-1.0.0`, `sbt-1.x`)
   .sbtScriptedRow(`sbt-latest`, `sbt-1.x`)
+  .sbtPluginRow(`sbt-2`)
+
+lazy val `sbt-updates-2_x` = `sbt-updates`
+  .finder(`sbt-2`)(false)
+  .settings(
+    scripted := {
+      // TODO enable scripted test
+      (Test / test).value
+    }
+  )
 
 lazy val root = (project in file("."))
   .withId("sbt-updates")

project/SbtAxis.scala

@@ -8,7 +8,8 @@ case class SbtAxis(fullVersion: Option[String], idSuffix: String, directorySuffi
     extends VirtualAxis.WeakAxis {
   val scalaVersion: String =
     fullVersion.map(VersionNumber(_)) match {
-      case Some(VersionNumber(Seq(1, _*), _, _)) | None => "2.12.10"
+      case Some(VersionNumber(Seq(1, _*), _, _)) | None => "2.12.20"
+      case Some(VersionNumber(Seq(2, _*), _, _))        => "3.3.4"
       case _                                            => sys.error(s"Unsupported sbt version: $fullVersion")
     }
 }

…12/com/timushev/sbt/updates/Compat.scala …la/com/timushev/sbt/updates/Compat.scalasrc/main/scala-2.12/com/timushev/sbt/updates/Compat.scala renamed to src/main/scala/com/timushev/sbt/updates/Compat.scala src/main/scala-2.12/com/timushev/sbt/updates/Compat.scala renamed to src/main/scala/com/timushev/sbt/updates/Compat.scala

@@ -1,7 +1,7 @@
 package com.timushev.sbt.updates
 
 import sbt.Keys._
-import sbt._
+import sbt.{given, _}
 
 import scala.util.control.NonFatal
 
@@ -12,7 +12,7 @@ object DependencyPositions {
       try {
         val projRef   = thisProjectRef.value
         val st        = state.value
-        val sk        = libraryDependencies.in(GlobalScope.in(projRef)).scopedKey
+        val sk        = (GlobalScope / (projRef / libraryDependencies)).scopedKey
         val extracted = Project.extract(st)
         val empty     = extracted.structure.data.set(sk.scope, sk.key, Nil)
         val settings = extracted.structure.settings.filter { s =>

src/main/scala/com/timushev/sbt/updates/DependencyPositions.scala

@@ -31,7 +31,7 @@ object UpdatesFinder {
       case (_, _)                                               => false
     }
 
-  private def isUpdate(current: Version) = current < _
+  private def isUpdate(current: Version): Version => Boolean = current < _
 
   private val withEmpty: PartialFunction[Throwable, Seq[Version]] = { case _ =>
     Seq.empty

src/main/scala/com/timushev/sbt/updates/UpdatesFinder.scala

@@ -34,7 +34,7 @@ object UpdatesPlugin extends AutoPlugin {
         dependencyUpdatesExclusions.value,
         dependencyUpdatesFilter.value,
         dependencyAllowPreRelease.value,
-        (baseDirectory in ThisBuild).value,
+        (ThisBuild / baseDirectory).value,
         streams.value
       )
     },

src/main/scala/com/timushev/sbt/updates/UpdatesPlugin.scala

@@ -14,5 +14,5 @@ class HtmlVersionExtractor extends VersionExtractor {
     Pattern.findAllIn(data).nonEmpty
 
   override def apply(data: String): Seq[Version] =
-    Pattern.findAllMatchIn(data).map(_.group(1)).map(Version.apply).to[Vector]
+    Pattern.findAllMatchIn(data).map(_.group(1)).map(Version.apply).toVector
 }