sbt 2

wartremover · Oct 24, 2024 · 3eef968 · 3eef968
1 parent 717e81f
commit 3eef968
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,14 @@ jobs:
             sbt -v scalafmtSbtCheck "+ scalafmtCheckAll" "+compile" "+test"
             ;;
           "scripted")
-            sbt -v "+ publishLocal" "+ sbt-plugin/scripted"
+            case ${{ matrix.os }} in
+              "windows-latest")
+                sbt -v "+ publishLocal" "sbt-plugin/scripted"
+                ;;
+              *)
+                sbt -v "+ publishLocal" "+ sbt-plugin/scripted"
+                ;;
+            esac
             ;;
           "test")
             sbt -v test '++ 3.3.4!' coreBinary/test

diff --git a/build.sbt b/build.sbt
@@ -156,6 +156,14 @@ lazy val sbtPlug: Project = Project(
   commonSettings,
   sbtPlugin := true,
   scriptedBatchExecution := false,
+  pluginCrossBuild / sbtVersion := {
+    scalaBinaryVersion.value match {
+      case "2.12" =>
+        sbtVersion.value
+      case _ =>
+        "2.0.0-M2"
+    }
+  },
   name := "sbt-wartremover-contrib",
   scriptedBufferLog := false,
   scriptedLaunchOpts ++= {
@@ -166,7 +174,7 @@ lazy val sbtPlug: Project = Project(
     javaVmArgs.filter(a => Seq("-Xmx", "-Xms", "-XX", "-Dsbt.log.noformat").exists(a.startsWith))
   },
   scriptedLaunchOpts += ("-Dplugin.version=" + version.value),
-  crossScalaVersions := Seq(scala212Latest),
+  crossScalaVersions := Seq(scala212Latest, scala3Latest),
   addSbtPlugin("org.wartremover" %% "sbt-wartremover" % wartremoverVersion),
   (Compile / sourceGenerators) += Def.task {
     val base = (Compile / sourceManaged).value