diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4dfc001b..af754701 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
         case ${{ matrix.java }} in
           "8")
             sbt -v ++2.12.x "scalaxbPlugin/scripted"
-            sbt -v ++3.x "app/Test/compile"
+            sbt -v ++3.x "app/Test/compile" "scalaxbPlugin/scripted"
             sbt -v +integration/test
             ;;
           "21")
diff --git a/build.sbt b/build.sbt
index c538e64f..603f160f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -74,7 +74,7 @@ lazy val integration = (project in file("integration"))
   .dependsOn(app)
   .settings(commonSettings)
   .settings(nocomma {
-    crossScalaVersions := Seq(scala212, scala213)
+    crossScalaVersions := Seq(scala3, scala212, scala213)
     scalaVersion := scala212
     publishArtifact := false
     libraryDependencies ++= integrationDependencies(scalaVersion.value)
@@ -95,9 +95,10 @@ lazy val scalaxbPlugin = (project in file("sbt-scalaxb"))
     pluginCrossBuild / sbtVersion := {
       scalaBinaryVersion.value match {
         case "2.12" => "1.5.8" // set minimum sbt version
+        case _ => "2.0.0-M3"
       }
     }
-    scriptedSbt := sbtVersion.value
+    crossScalaVersions := Seq(scala212, "3.6.2")
     scriptedLaunchOpts := { scriptedLaunchOpts.value ++
       Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
     }
diff --git a/cli/src_managed/scalaxb/scalaxb.scala b/cli/src_managed/scalaxb/scalaxb.scala
index 7604bed6..1f05f3e5 100644
--- a/cli/src_managed/scalaxb/scalaxb.scala
+++ b/cli/src_managed/scalaxb/scalaxb.scala
@@ -628,7 +628,7 @@ trait AnyElemNameParser extends scala.util.parsing.combinator.Parsers {
     accept("any", { case x: ElemName if x.name != "" && f(x) => x })
 
   def optTextRecord(implicit format: XMLFormat[String]): Parser[Option[DataRecord[Any]]] =
-    opt(text ^^ (x => DataRecord(x.node.text)(format)))
+    opt(text ^^ (x => DataRecord(x.node.text)(using format)))
 
   def text: Parser[ElemName] =
     accept("text", { case x: ElemName if x.name == "" => x })
diff --git a/project/dependencies.scala b/project/dependencies.scala
index 847be1da..581a6651 100644
--- a/project/dependencies.scala
+++ b/project/dependencies.scala
@@ -57,8 +57,7 @@ object Dependencies {
 
   def specs2(sv: String) = CrossVersion partialVersion sv match {
     case Some((2, 12)) => "org.specs2" %% "specs2" % "2.4.17"
-    case Some((2, 13)) => "org.specs2" %% "specs2-matcher-extra" % "4.6.0"
-    case x             => sys error s"Unexpected Scala version [$sv], with partial version $x"
+    case _             => "org.specs2" %% "specs2-matcher-extra" % "4.6.0"
   }
 
   def appDependencies(sv: String) = Seq(
diff --git a/sbt-scalaxb/src/main/scala-sbt-1.0/sbtscalaxb/ScalaxbCompile.scala b/sbt-scalaxb/src/main/scala/sbtscalaxb/ScalaxbCompile.scala
similarity index 100%
rename from sbt-scalaxb/src/main/scala-sbt-1.0/sbtscalaxb/ScalaxbCompile.scala
rename to sbt-scalaxb/src/main/scala/sbtscalaxb/ScalaxbCompile.scala
diff --git a/sbt-scalaxb/src/main/scala/sbtscalaxb/ScalaxbPlugin.scala b/sbt-scalaxb/src/main/scala/sbtscalaxb/ScalaxbPlugin.scala
index e41b3ced..a745c0ca 100644
--- a/sbt-scalaxb/src/main/scala/sbtscalaxb/ScalaxbPlugin.scala
+++ b/sbt-scalaxb/src/main/scala/sbtscalaxb/ScalaxbPlugin.scala
@@ -75,7 +75,7 @@ object ScalaxbPlugin extends sbt.AutoPlugin {
       else src / "main" / "wsdl"
     },
     scalaxb / logLevel := (logLevel?? Level.Info).value
-  ) ++ inTask(scalaxb)(Seq(
+  ) ++ Project.inTask(scalaxb)(Seq(
     scalaxbGenerate := {
       val s = streams.value
       val ll = logLevel.value