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

build.sbt cleanup #2276

Merged
merged 3 commits into from
Jun 10, 2024
Merged

build.sbt cleanup #2276

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
393209c
build.sbt cleanup
guymers Jun 1, 2024
80dd792
Merge remote-tracking branch 'upstream/series/2.x' into build-cleanup
guymers Jun 10, 2024
294844a
snapshot resolver commented
guymers Jun 10, 2024
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
26 changes: 2 additions & 24 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ inThisBuild(
organization := "com.github.ghostdogpr",
homepage := Some(url("https://github.com/ghostdogpr/caliban")),
licenses := List(License.Apache2),
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
// resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
Test / parallelExecution := false,
scmInfo := Some(
ScmInfo(
Expand All @@ -61,12 +61,7 @@ inThisBuild(
)
),
versionScheme := Some("pvp"),
ConsoleHelper.welcomeMessage(scala212, scala213, scala3),
// See https://github.com/playframework/playframework/issues/11461#issuecomment-1276028512
// Can be removed when the entire Scala ecosystem has migrated to Scala 2.12.17+, sbt 1.8.x, and moved away from scala-xml v1 in general.
libraryDependencySchemes ++= Seq(
"org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
)
ConsoleHelper.welcomeMessage(scala212, scala213, scala3)
)
)

Expand Down Expand Up @@ -174,7 +169,6 @@ lazy val core = project
.settings(enableMimaSettingsJVM)
.disablePlugins(AssemblyPlugin)
.settings(
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++=
Seq(
"com.lihaoyi" %% "fastparse" % "3.1.0",
Expand Down Expand Up @@ -217,7 +211,6 @@ lazy val tools = project
buildInfoObject := "BuildInfo"
)
.settings(
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= Seq(
"org.scalameta" % "scalafmt-interfaces" % scalafmtVersion,
"io.get-coursier" % "interface" % "1.0.19",
Expand All @@ -241,7 +234,6 @@ lazy val tracing = project
buildInfoObject := "BuildInfo"
)
.settings(
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= Seq(
"dev.zio" %% "zio-opentelemetry" % zioOpenTelemetryVersion,
"dev.zio" %% "zio-test" % zioVersion % Test,
Expand All @@ -267,7 +259,6 @@ lazy val codegenSbt = project
.settings(
sbtPlugin := true,
crossScalaVersions := Seq(scala212),
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= Seq(
"dev.zio" %% "zio-config" % zioConfigVersion,
"dev.zio" %% "zio-config-magnolia" % zioConfigVersion,
Expand Down Expand Up @@ -298,7 +289,6 @@ lazy val catsInterop = project
.settings(enableMimaSettingsJVM)
.disablePlugins(AssemblyPlugin)
.settings(
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= {
if (scalaVersion.value == scala3) Seq()
else Seq(compilerPlugin(("org.typelevel" %% "kind-projector" % "0.13.3").cross(CrossVersion.full)))
Expand Down Expand Up @@ -334,7 +324,6 @@ lazy val tapirInterop = project
.settings(enableMimaSettingsJVM)
.disablePlugins(AssemblyPlugin)
.settings(
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= {
if (scalaVersion.value == scala3) Seq()
else Seq(compilerPlugin(("org.typelevel" %% "kind-projector" % "0.13.3").cross(CrossVersion.full)))
Expand All @@ -358,7 +347,6 @@ lazy val http4s = project
.settings(enableMimaSettingsJVM)
.disablePlugins(AssemblyPlugin)
.settings(
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= {
if (scalaVersion.value == scala3) Seq()
else Seq(compilerPlugin(("org.typelevel" %% "kind-projector" % "0.13.3").cross(CrossVersion.full)))
Expand Down Expand Up @@ -386,8 +374,6 @@ lazy val zioHttp = project
.settings(enableMimaSettingsJVM)
.disablePlugins(AssemblyPlugin)
.settings(
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= Seq(
"dev.zio" %% "zio-http" % zioHttpVersion,
"com.softwaremill.sttp.tapir" %% "tapir-zio-http-server" % tapirVersion,
Expand All @@ -404,7 +390,6 @@ lazy val quickAdapter = project
.settings(enableMimaSettingsJVM)
.disablePlugins(AssemblyPlugin)
.settings(
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= Seq(
"dev.zio" %% "zio-http" % zioHttpVersion,
"com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-core" % jsoniterVersion,
Expand All @@ -424,7 +409,6 @@ lazy val akkaHttp = project
skip := (scalaVersion.value == scala3),
ideSkipProject := (scalaVersion.value == scala3),
crossScalaVersions -= scala3,
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-http" % "10.2.10",
"com.typesafe.akka" %% "akka-serialization-jackson" % akkaVersion,
Expand All @@ -442,7 +426,6 @@ lazy val pekkoHttp = project
.settings(enableMimaSettingsJVM)
.disablePlugins(AssemblyPlugin)
.settings(
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= {
if (scalaVersion.value == scala3) Seq()
else Seq(compilerPlugin(("org.typelevel" %% "kind-projector" % "0.13.3").cross(CrossVersion.full)))
Expand All @@ -464,7 +447,6 @@ lazy val play = project
skip := (scalaVersion.value == scala212),
ideSkipProject := (scalaVersion.value == scala212),
crossScalaVersions -= scala212,
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= {
if (scalaVersion.value == scala3) Seq()
else Seq(compilerPlugin(("org.typelevel" %% "kind-projector" % "0.13.3").cross(CrossVersion.full)))
Expand All @@ -488,7 +470,6 @@ lazy val client = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.settings(commonSettings)
.disablePlugins(AssemblyPlugin)
.settings(
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= Seq(
"com.softwaremill.sttp.client3" %%% "core" % sttpVersion,
"com.softwaremill.sttp.client3" %%% "jsoniter" % sttpVersion,
Expand Down Expand Up @@ -533,7 +514,6 @@ lazy val clientLaminext = crossProject(JSPlatform)
.dependsOn(clientJS)
.disablePlugins(AssemblyPlugin)
.settings(
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
Test / scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.ESModule) },
Test / scalaJSLinkerConfig ~= { _.withModuleSplitStyle(ModuleSplitStyle.FewestModules) },
Test / scalaJSLinkerConfig ~= { _.withSourceMap(false) },
Expand Down Expand Up @@ -633,7 +613,6 @@ lazy val reporting = project
.dependsOn(clientJVM, core)
.disablePlugins(AssemblyPlugin)
.settings(
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= Seq(
"dev.zio" %% "zio" % zioVersion,
"com.softwaremill.sttp.client3" %% "core" % sttpVersion,
Expand Down Expand Up @@ -680,7 +659,6 @@ lazy val federation = project
.dependsOn(core % "compile->compile;test->test")
.disablePlugins(AssemblyPlugin)
.settings(
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= Seq(
"dev.zio" %% "zio" % zioVersion,
"dev.zio" %% "zio-test" % zioVersion % Test,
Expand Down