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.

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

Remove nocomma plugin #649

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 31 additions & 31 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -35,71 +35,71 @@ lazy val commonSettings = Seq(

lazy val root = (project in file("."))
.aggregate(app, integration, scalaxbPlugin)
.settings(nocomma {
name := "scalaxb-root"
scalaVersion := scala212
publish / skip := true
crossScalaVersions := Nil
.settings(
name := "scalaxb-root",
scalaVersion := scala212,
publish / skip := true,
crossScalaVersions := Nil,
commands += Command.command("release") { state =>
"clean" ::
"+app/publishSigned" ::
"++2.12.12!;scalaxbPlugin/publishSigned" ::
state
}
})
)

lazy val app = (project in file("cli"))
.enablePlugins(BuildInfoPlugin)
.settings(commonSettings)
.settings(codegenSettings)
.settings(nocomma {
name := "scalaxb"
crossScalaVersions := Seq(scala3, scala213, scala212)
scalaVersion := scala212
resolvers += sbtResolver.value
libraryDependencies ++= appDependencies(scalaVersion.value)
.settings(
name := "scalaxb",
crossScalaVersions := Seq(scala3, scala213, scala212),
scalaVersion := scala212,
resolvers += sbtResolver.value,
libraryDependencies ++= appDependencies(scalaVersion.value),
scalacOptions := {
val prev = scalacOptions.value
if (scalaVersion.value == scala212) {
prev :+ "-Xfatal-warnings"
}
else prev
}
assembly / mainClass := Some("scalaxb.compiler.Main")
assembly / assemblyOption := (assembly / assemblyOption).value.withPrependShellScript(Some(sbtassembly.AssemblyPlugin.defaultShellScript))
},
assembly / mainClass := Some("scalaxb.compiler.Main"),
assembly / assemblyOption := (assembly / assemblyOption).value.withPrependShellScript(Some(sbtassembly.AssemblyPlugin.defaultShellScript)),
assembly / assemblyOutputPath := file(s"./${name.value}-${version.value}")
})
)

lazy val integration = (project in file("integration"))
.dependsOn(app)
.settings(commonSettings)
.settings(nocomma {
crossScalaVersions := Seq(scala212, scala213)
scalaVersion := scala212
publishArtifact := false
libraryDependencies ++= integrationDependencies(scalaVersion.value)
.settings(
crossScalaVersions := Seq(scala212, scala213),
scalaVersion := scala212,
publishArtifact := false,
libraryDependencies ++= integrationDependencies(scalaVersion.value),
// fork in test := true,
// javaOptions in test ++= Seq("-Xmx2G", "-XX:MaxPermSize=512M")
Test / parallelExecution := false
Test / testOptions += Tests.Argument("sequential")
Test / parallelExecution := false,
Test / testOptions += Tests.Argument("sequential"),
publish / skip := true
})
)

lazy val scalaxbPlugin = (project in file("sbt-scalaxb"))
.enablePlugins(SbtPlugin)
.dependsOn(app)
.settings(commonSettings)
.settings(nocomma {
name := "sbt-scalaxb"
description := """sbt plugin to run scalaxb"""
.settings(
name := "sbt-scalaxb",
description := """sbt plugin to run scalaxb""",
pluginCrossBuild / sbtVersion := {
scalaBinaryVersion.value match {
case "2.12" => "1.5.8" // set minimum sbt version
}
}
},
scriptedLaunchOpts := { scriptedLaunchOpts.value ++
Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
}
scriptedBufferLog := false
},
scriptedBufferLog := false,
scripted := scripted.dependsOn(app / publishLocal).evaluated
})
)
1 change: 0 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
addSbtPlugin("com.eed3si9n" % "sbt-nocomma" % "0.1.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.3")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
Expand Down