enable sbt 2.x build

sbt · Oct 6, 2024 · 4697205 · 4697205
1 parent c39f455
commit 4697205
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
       run: sbt -v "++2.12.x" test scripted
     - if: ${{ matrix.jobtype == 3 }}
       shell: bash
-      run: sbt -v "++3.x" library/test
+      run: sbt -v "++3.x" test # TODO scripted
     - if: ${{ matrix.jobtype == 4 }}
       shell: bash
       run: sbt -v "++2.12.x" scalafmtSbtCheck scalafmtCheckAll
diff --git a/build.sbt b/build.sbt
@@ -64,12 +64,12 @@ lazy val plugin = (project in file("plugin"))
       scriptedLaunchOpts.value ++
         Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
     },
-    crossScalaVersions := Seq(scala212),
+    crossScalaVersions := Seq(scala212, scala3),
     pluginCrossBuild / sbtVersion := {
       scalaBinaryVersion.value match {
         case "2.13" => "1.2.8"
         case "2.12" => "1.2.8" // set minimum sbt version
-        case _      => "1.2.8"
+        case _      => "2.0.0-M2"
       }
     },
     publishLocal := (publishLocal dependsOn (library / publishLocal)).value,

diff --git a/plugin/src/main/scala/ContrabandPlugin.scala b/plugin/src/main/scala/ContrabandPlugin.scala
@@ -1,7 +1,7 @@
 package sbt.contraband
 
 import sbt.Keys._
-import sbt._
+import sbt.{ given, _ }
 import sbt.contraband.ast._
 import sbt.contraband.parser.{ JsonParser, SchemaParser }
 

diff --git a/plugin/src/main/scala/JsonCodecPlugin.scala b/plugin/src/main/scala/JsonCodecPlugin.scala
@@ -1,6 +1,6 @@
 package sbt.contraband
 
-import sbt._
+import sbt.{ given, _ }
 import Keys._
 
 object JsonCodecPlugin extends AutoPlugin {