Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sbt 2 #676

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

sbt 2 #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
5 changes: 3 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion cli/src_managed/scalaxb/scalaxb.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
Expand Down
3 changes: 1 addition & 2 deletions project/dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
0 ...a-sbt-1.0/sbtscalaxb/ScalaxbCompile.scala → ...ain/scala/sbtscalaxb/ScalaxbCompile.scala
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion sbt-scalaxb/src/main/scala/sbtscalaxb/ScalaxbPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading