Skip to content

Commit

Permalink
Simplify build.sbt
Browse files Browse the repository at this point in the history
  • Loading branch information
adamw committed Feb 26, 2021
1 parent 47b97c4 commit 6a9a8d1
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions build.sbt
Expand Up @@ -14,14 +14,10 @@ val scala3 = List("3.0.0-RC1")
lazy val testServerPort = settingKey[Int]("Port to run the http test server on")
lazy val startTestServer = taskKey[Unit]("Start a http server used by tests")

parallelExecution in Global := false

excludeLintKeys in Global ++= Set(ideSkipProject, reStartArgs)

val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
organization := "com.softwaremill.sttp.client3",
// needed on sbt 1.3, but (for some unknown reason) only on 2.11.x
closeClassLoaders := !scalaVersion.value.startsWith("2.11."),
updateDocs := Def.taskDyn {
val files1 = UpdateVersionInDocs(sLog.value, organization.value, version.value, List(file("README.md")))
Def.task {
Expand All @@ -40,7 +36,7 @@ val commonJvmSettings = commonSettings ++ Seq(

val commonJsSettings = commonSettings ++ Seq(
// slow down for CI
parallelExecution in Test := false, // TODOR
parallelExecution in Test := false,
scalacOptions in Compile ++= {
if (isSnapshot.value) Seq.empty
else
Expand Down Expand Up @@ -151,7 +147,6 @@ lazy val allAggregates = projectsWithOptionalNative ++
monix.projectRefs ++
scalaz.projectRefs ++
zio.projectRefs ++
// might fail due to // https://github.com/akka/akka-http/issues/1930
akkaHttpBackend.projectRefs ++
asyncHttpClientBackend.projectRefs ++
asyncHttpClientFutureBackend.projectRefs ++
Expand Down

0 comments on commit 6a9a8d1

Please sign in to comment.