Skip to content

Commit

Permalink
Merge pull request #1414 from softwaremill/test-server-artifact
Browse files Browse the repository at this point in the history
Test server artifact
  • Loading branch information
adamw authored Apr 20, 2022
2 parents b320afd + 5a7e9fe commit 28311f2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![sttp](https://github.com/softwaremill/sttp/raw/master/banner.png)

[![Join the chat at https://gitter.im/softwaremill/sttp](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/softwaremill/sttp?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![CI](https://github.com/softwaremill/sttp/workflows/CI/badge.svg)](https://github.com/softwaremill/sttp/actions?query=workflow%3A%22CI%22)
[![CI](https://github.com/softwaremill/sttp/workflows/CI/badge.svg)](https://github.com/softwaremill/sttp/actions?query=workflow%3ACI+branch%3Amaster)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.softwaremill.sttp.client3/core_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.softwaremill.sttp.client3/core_2.12)

[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/softwaremill/sttp)
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ lazy val allAggregates = projectsWithOptionalNative ++
slf4jBackend.projectRefs ++
examplesCe2.projectRefs ++
examples.projectRefs ++
docs.projectRefs
docs.projectRefs ++
testServer.projectRefs

// For CI tests, defining scripts that run JVM/JS/Native tests separately
val testJVM = taskKey[Unit]("Test JVM projects")
Expand All @@ -261,10 +262,9 @@ lazy val testServer = (projectMatrix in file("testing/server"))
.settings(commonJvmSettings)
.settings(
name := "testing-server",
publish / skip := true,
libraryDependencies ++= Seq(
akkaHttp,
"ch.megard" %% "akka-http-cors" % "0.4.2",
"ch.megard" %% "akka-http-cors" % "1.1.3",
akkaStreams
),
// the test server needs to be started before running any backend tests
Expand All @@ -274,7 +274,7 @@ lazy val testServer = (projectMatrix in file("testing/server"))
testServerPort := 51823,
startTestServer := reStart.toTask("").value
)
.jvmPlatform(scalaVersions = List(scala2_13))
.jvmPlatform(scalaVersions = List(scala2_12, scala2_13))

lazy val testServer2_13 = testServer.jvm(scala2_13)

Expand Down

0 comments on commit 28311f2

Please sign in to comment.