Cross build to sbt 2.0.0-M4

.github/workflows/ci.yml

@@ -10,10 +10,20 @@ jobs:
         include:
           - os: ubuntu-latest
             java: 8
-            distribution: 'temurin'
+            distribution: zulu
+            jobtype: 1
           - os: ubuntu-latest
             java: 21
-            distribution: 'corretto'
+            distribution: corretto
+            jobtype: 2
+          - os: ubuntu-latest
+            java: 8
+            distribution: zulu
+            jobtype: 3
+          - os: ubuntu-latest
+            java: 8
+            distribution: zulu
+            jobtype: 4
     runs-on: ${{ matrix.os }}
     env:
       # define Java options for both official sbt and sbt-extras
@@ -29,23 +39,24 @@ jobs:
         java-version: ${{ matrix.java }}
         cache: 'sbt'
     - uses: sbt/setup-sbt@v1
-    - name: Build and test
+    - name: Build and test (1)
+      if: ${{ matrix.jobtype == 1 }}
+      run: |
+        sbt -v ++2.12.x "scalaxbPlugin/scripted"
+        sbt -v +integration/test
+    - name: Build and test (2)
+      if: ${{ matrix.jobtype == 2 }}
+      shell: bash
+      run: |
+        sbt -v ++2.12.x "project scalaxbPlugin" "set pluginCrossBuild / sbtVersion := sbtVersion.value" "scripted"
+    - name: Build and test (3)
+      if: ${{ matrix.jobtype == 3 }}
+      shell: bash
       run: |
-        case ${{ matrix.java }} in
-          "8")
-            sbt -v ++2.12.x "scalaxbPlugin/scripted"
-            sbt -v ++3.x "app/Test/compile"
-            sbt -v +integration/test
-            ;;
-          "21")
-            sbt -v ++2.12.x "project scalaxbPlugin" "set pluginCrossBuild / sbtVersion := sbtVersion.value" "scripted"
-            ;;
-          *)
-            echo "unexpected java version"
-            exit 1
-        esac
-    - name: maven plugin
+        sbt -v ++3.x "app/Test/compile" "scalaxbPlugin/scripted"
+    - name: Build and test (4)
+      if: ${{ matrix.jobtype == 4 }}
+      shell: bash
       run: |
-        pushd mvn-scalaxb
+        cd mvn-scalaxb
         mvn test
-        popd

build.sbt

@@ -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-M4"
       }
     }
-    scriptedSbt := sbtVersion.value
+    crossScalaVersions := Seq(scala212, scala3ForSbt)
     scriptedLaunchOpts := { scriptedLaunchOpts.value ++
       Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
     }

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 })

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.7
+sbt.version=1.10.10

project/dependencies.scala

@@ -2,6 +2,7 @@ import sbt._
 
 object Dependencies {
   val scala3   = "3.3.1"
+  val scala3ForSbt = "3.6.4"
   val scala213 = "2.13.12"
   val scala212 = "2.12.18"
 
@@ -58,8 +59,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(

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