Skip to content

Commit b7336b1

Browse files
committed
add sttp (except for "tests" subproject)
1 parent 32ba42b commit b7336b1

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed

configs/community.dbuild

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,14 @@ build += {
542542
extra.projects: ["coreJVM", "scodecJVM", "io"] // no Scala.js, no benchmarks or docs
543543
}
544544

545+
${vars.base} {
546+
name: "fs2-reactive-streams"
547+
uri: ${vars.uris.fs2-reactive-streams-uri}
548+
extra.sbt-version: ${vars.sbt-1-version}
549+
extra.exclude: ["docs"]
550+
check-missing: false // ignore missing scalafmt
551+
}
552+
545553
${vars.base} {
546554
name: "cats"
547555
uri: ${vars.uris.cats-uri}
@@ -1590,8 +1598,6 @@ build += {
15901598
extra.exclude: [
15911599
// outside our purview
15921600
"bench", "docs"
1593-
// Missing dependency: com.github.zainab-ali#fs2-reactive-streams
1594-
"async-http-client"
15951601
// weird errors, probably not appropriate to run anyway
15961602
"load-test"
15971603
]
@@ -1641,6 +1647,19 @@ build += {
16411647
]
16421648
}
16431649

1650+
// in this space because it depends on circe-core.
1651+
// forked (February 2018) to remove Scalafmt -- not sure why the
1652+
// usual workarounds didn't work in this repo.
1653+
// (see https://github.com/scala/community-builds/pull/618)
1654+
${vars.base} {
1655+
name: "sttp"
1656+
uri: ${vars.uris.sttp-uri}
1657+
extra.sbt-version: ${vars.sbt-1-version}
1658+
// once sttp's master branch moves to a newer version of fs2-reactive-streams,
1659+
// we should be able to refresh our fork and then remove this exclusion
1660+
extra.exclude: ["tests"]
1661+
}
1662+
16441663
]}
16451664

16461665
//// space: scalameta_1

configs/project-refs.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ vars.uris: {
3333
elastic4s-uri: "https://github.com/sksamuel/elastic4s.git#release/5.4.x"
3434
fansi-uri: "https://github.com/scalacommunitybuild/fansi.git#community-build-2.12" # was master
3535
fastparse-uri: "https://github.com/lihaoyi/fastparse.git"
36+
fs2-reactive-streams-uri: "https://github.com/zainab-ali/fs2-reactive-streams.git"
3637
fs2-uri: "https://github.com/functional-streams-for-scala/fs2.git#series/0.10"
3738
genjavadoc-uri: "https://github.com/lightbend/genjavadoc.git"
3839
geny-uri: "https://github.com/lihaoyi/geny.git"
@@ -139,6 +140,7 @@ vars.uris: {
139140
specs2-uri: "https://github.com/scalacommunitybuild/specs2.git#community-build-2.12" # was etorreborre, specs2-3.x
140141
spray-json-uri: "https://github.com/spray/spray-json.git"
141142
ssl-config-uri: "https://github.com/lightbend/ssl-config.git"
143+
sttp-uri: "https://github.com/scalacommunitybuild/sttp.git#community-build-2.12" # was softwaremill, master
142144
tut-uri: "https://github.com/tpolecat/tut.git"
143145
twirl-uri: "https://github.com/playframework/twirl.git"
144146
twitter-util-uri: "https://github.com/twitter/util.git#develop"

0 commit comments

Comments
 (0)